-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #44344
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #44344
Conversation
Update the minimum MSBuild version to 17.11.3 Update the supported TFM so net9 doesn't show up when you're in 17.11 Update the min vs for unsupported version to N+4 since we don't know what vs version net10 will ship in
….4 as what shipped in that VS version
… Build ID 2562320
… Build ID 2562399
… Build ID 2562596
…ld 20241017.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24516.3 -> To Version 1.1.0-rtm.24517.1
…ld 20241017.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24517.1 -> To Version 1.1.0-rtm.24517.2
…ld 20241017.3 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24517.2 -> To Version 1.1.0-rtm.24517.3
…016.15 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24510.2 -> To Version 4.12.0-3.24516.15
…0241016.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24515.3 -> To Version 9.0.0-beta.24516.2
…nals build 20241016.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.24515.2 -> To Version 9.0.0-alpha.1.24516.3
…gets net9 and checks for the warning we spit out
… Build ID 2563273
…ing of the installers
…darc-release/9.0.1xx-9be7fcf3-a6b8-41c4-bb19-c227a790cc42
…darc-release/9.0.1xx-810c7077-36c8-436d-a5ea-f69f774689a9
…darc-release/9.0.1xx-3b7e6a16-256c-45e1-ac74-b0b44dbf2c51
…darc-release/9.0.1xx-d1aab1c8-3abc-4e74-93c3-5717c8d6c5b1
…ld 20241021.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24517.3 -> To Version 1.1.0-rtm.24521.1
…ld 20241021.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24521.1 -> To Version 1.1.0-rtm.24521.2
… Build ID 2565267 (#44326)
…ld 20241021.3 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24521.2 -> To Version 1.1.0-rtm.24521.3
…merge/release/9.0.1xx-to-release/9.0.2xx
…t.config file, and update the minimumMSBuildVersion
@marcpopMSFT A bunch of test failure messages seem to be prompting me to update the SDK version.
|
@v-wuzhai this merge seems to not have my full change from 9.0.1xx on the minimum version. I assume that's because you reverted the eng\versions.props change (since that's almost always correct) and then had to fix the minimum build version to get it building. This is one of those rare exceptions where we needed to flow the versions.props change but only for that one line. |
This reverts commit a83ebb0.
…merge/release/9.0.1xx-to-release/9.0.2xx
…merge/release/9.0.1xx-to-release/9.0.2xx
I detected changes in the release/9.0.1xx branch which have not been merged yet to release/9.0.2xx. I'm a robot and am configured to help you automatically keep release/9.0.2xx up to date, so I've opened this PR.
This PR merges commits made on release/9.0.1xx 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.
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/9.0.1xx-to-release/9.0.2xx'. 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 (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.