Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare to update branch to main #33

Merged
merged 1 commit into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ By contributing to IntelliTect, you assert that:
* The contribution is your own original work.
* You have the right to assign the copyright for the work (it is not owned by your employer, or
you have been given copyright assignment in writing).
* You [license](https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE) the contribution under the terms applied to the rest of the IntelliTect project.
* You [license](https://github.com/IntelliTect/IntelliTect/blob/main/LICENSE) the contribution under the terms applied to the rest of the IntelliTect project.

## Code
### Code style
Expand Down Expand Up @@ -64,7 +64,7 @@ Any new code should also have reasonable unit test coverage.
* Test your changes and please help us out by updating and implementing some automated tests.
It is recommended that all contributors spend some time looking over the tests in the source code.
You can't go wrong emulating one of the existing tests and then changing it specific to the behavior you are testing.
* Please do not update your branch from Master unless we ask you to. See the responding to feedback section below.
* Please do not update your branch from main unless we ask you to. See the responding to feedback section below.

### Prepare commits
This section serves to help you understand what makes a good commit.
Expand Down Expand Up @@ -116,10 +116,10 @@ Sometimes we may need you to rebase your commit against the latest code before w
If this happens, you can do the following:

* `git fetch upstream` (upstream would be the mainstream repo or `IntelliTect` in this case)
* `git checkout master`
* `git rebase upstream/master`
* `git checkout main`
* `git rebase upstream/main`
* `git checkout your-branch`
* `git rebase master`
* `git rebase main`
* Fix any merge conflicts
* `git push origin your-branch` (origin would be your GitHub repo or `your-github-username/IntelliTect` in this case).
You may need to `git push origin your-branch --force` to get the commits pushed.
Expand All @@ -132,7 +132,7 @@ The only reasons a pull request should be closed and resubmitted are as follows:
Then the old branch is closed with a note on the newer branch this supersedes #github_number.

## NuGet
Currently AppVeyor is building and releasing NuGets on every merge to the release branch. All PRs should be merged into master and then a PR from master into release when new NuGets are needed. Avoid PRs from feature branches directly to the release branch.
Currently AppVeyor is building and releasing NuGets on every merge to the release branch. All PRs should be merged into main and then a PR from main into release when new NuGets are needed. Avoid PRs from feature branches directly to the release branch.

## Other general information
If you reformat code or hit core functionality without an approval from a person on the IntelliTect Team,
Expand Down
4 changes: 2 additions & 2 deletions IntelliTect.Utilities/IntelliTect.Utilities.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company>IntelliTect-Nuget</Company>
<Authors>IntelliTect</Authors>
<Description>A utility library for IntelliTect</Description>
<PackageLicenseUrl>https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE</PackageLicenseUrl>
<PackageLicenseUrl>https://github.com/IntelliTect/IntelliTect/blob/main/LICENSE</PackageLicenseUrl>
<Copyright>Copyright © IntelliTect 2019</Copyright>
<PackageProjectUrl>https://github.com/IntelliTect/IntelliTect</PackageProjectUrl>
<RepositoryUrl>https://github.com/IntelliTect/IntelliTect</RepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ Libraries
Contributing
============

See the CONTRIBUTING.md file [here](https://raw.githubusercontent.com/IntelliTect/IntelliTect/master/CONTRIBUTING.md).
See the CONTRIBUTING.md file [here](https://raw.githubusercontent.com/IntelliTect/IntelliTect/main/CONTRIBUTING.md).
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pull_requests:
branches:
only:
- release
- master
- main
skip_branch_with_pr: true
image: Visual Studio 2017
assembly_info:
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# https://aka.ms/yaml

trigger:
- master
- main

variables:
IntelliTect.Utilities.Version: 1.0.15
Expand Down