Merge release/dev17.11 to release/dev17.12 #18105
Conversation
…17801) * Treat System.Private.CoreLib as a system lib for extension method search * usessdkrefs is not a valid option for desktop compiler
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24475.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ore and CompileAfter values (#17838) * Fix 17786 (#17791) * CompilerOrder: set metadata for CompileFirst items (#17820) Co-authored-by: Kevin Ransom (msft) <[email protected]> * version --------- Co-authored-by: Eugene Auduchinok <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20241004.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2 * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1 * Update dependencies from https://github.com/dotnet/arcade build 20241016.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…025.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24516.1 -> To Version 8.0.0-beta.24525.2
…72e7-44da-b83e-0bda8ad2634d [release/dev17.11] Update dependencies from dotnet/arcade
|
❗ Release notes requiredCaution No release notes found for the changed paths (see table below). Please make sure to add an entry with an informative description of the change as well as link to this pull request, issue and language suggestion if applicable. Release notes for this repository are based on Keep A Changelog format. The following format is recommended for this repository:
If you believe that release notes are not necessary for this PR, please add NO_RELEASE_NOTES label to the pull request. You can open this PR in browser to add release notes: open in github.dev
|
1 similar comment
❗ Release notes requiredCaution No release notes found for the changed paths (see table below). Please make sure to add an entry with an informative description of the change as well as link to this pull request, issue and language suggestion if applicable. Release notes for this repository are based on Keep A Changelog format. The following format is recommended for this repository:
If you believe that release notes are not necessary for this PR, please add NO_RELEASE_NOTES label to the pull request. You can open this PR in browser to add release notes: open in github.dev
|
vzarytovskii
force-pushed
the
merges/release/dev17.11-to-release/dev17.12
branch
from
b562a9d to
42efe9a
Compare
vzarytovskii
added
the
NO_RELEASE_NOTES
This is an automatically generated pull request from release/dev17.11 into release/dev17.12.
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/release/dev17.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force