Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
[automated] Merge branch 'release/3.1.2xx' => 'master' #3989
I detected changes in the release/3.1.2xx branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.
This PR merges commits made on release/3.1.2xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
git fetch git checkout release/3.1.2xx git pull --ff-only git checkout master git pull --ff-only git merge --no-ff release/3.1.2xx # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/3.1.2xx-to-master
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.1.2xx-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
…till forces the GenerateRuntimeConfigurationFiles target to run (can be done by setting the same property explicitely to true), there will be no PlatformLibrary available, but the project will otherwise look just like self-contained app (other than the TFM). Before #3697 the frameworks processing would simply be skipped due to the project not being framework dependent. After that change we still try to process frameworks. The fix is to check for availability of any PlatformLibrary, and if not available treat it as if there are no frameworks (just like before #3697.
…3892) Issue dotnet/core-setup#7794 Scenario When customer annotates files to be excluded from the single-file bundle, the annotation may not be honored correctly. Moreover, certain files may be included in duplicate leading to downstream failure. Fix Fix a copy-paste typo to fix the bug. Risk Very low. This fix targets a very specific scenario, triggered by explicit annotations in the project file. Only affects projects where the property <PublishSingleFile>true</PublishSingleFile> is set, and some content is annotated with `<ExcludeFromSingleFile>true</ExcludeFromSingleFile>` Customer Impact Exclusion from single-files is handled correctly.