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

Merge main to feature/nullness #16980

Merged
merged 6 commits into from
Apr 4, 2024

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from main into feature/nullness.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout -t upstream/merges/main-to-feature/nullness
git reset --hard upstream/feature/nullness
git merge upstream/main
# Fix merge conflicts
git commit
git push upstream merges/main-to-feature/nullness --force

dotnet-maestro bot and others added 6 commits March 28, 2024 15:48
…327.1 (#16964)

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24176.8 -> To Version 8.0.0-beta.24177.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
When building in the VMR, the per-repo package cache is placed under the repo's artifacts directory. Exclude this when doing the assembly scan.

In addition, fix up the file to be compatible with non-windows systems.

Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
- OverridePackageSource has no use (and that feed is ancient)
- Artifacts categories are long gone
- Symbol server publishing and PATs are not required with PublishUsingPipelines

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
…16900)

* Raise an warning when Obsolete attribute is used in constructor property assignment.
@dotnet-bot dotnet-bot requested a review from a team as a code owner April 3, 2024 00:04
@KevinRansom KevinRansom merged commit faba56d into feature/nullness Apr 4, 2024
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants