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

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #44344

Merged
merged 70 commits into from
Oct 25, 2024

Conversation

github-actions[bot]
Copy link
Contributor

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:

  • marcpopMSFT
  • v-wuzhai
  • dotnet-maestro[bot]
  • dotnet-bot
  • baronfel
  • javiercn
  • mthalman

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.

merge button instructions

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/9.0.1xx
git pull --ff-only
git checkout release/9.0.2xx
git pull --ff-only
git merge --no-ff release/9.0.1xx

# 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/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.2xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.2xx

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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.

git checkout -b merge/release/9.0.1xx-to-release/9.0.2xx release/9.0.2xx
git pull https://github.com/dotnet/sdk merge/release/9.0.1xx-to-release/9.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.2xx
or if you are using SSH
git checkout -b merge/release/9.0.1xx-to-release/9.0.2xx release/9.0.2xx
git pull git@github.com:dotnet/sdk merge/release/9.0.1xx-to-release/9.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.2xx

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.

marcpopMSFT and others added 30 commits August 30, 2024 14:07
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
…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
…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
dotnet-maestro bot and others added 4 commits October 21, 2024 19:29
…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
@github-actions github-actions bot requested review from a team and vijayrkn as code owners October 21, 2024 19:51
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Oct 21, 2024
github-actions bot and others added 6 commits October 21, 2024 14:56
@v-wuzhai
Copy link
Member

@marcpopMSFT A bunch of test failure messages seem to be prompting me to update the SDK version.

error : Version 9.0.200-ci of the .NET SDK requires at least version 17.11.4 of MSBuild. The current available version of MSBuild is 17.11.0.27902. Change the .NET SDK specified in global.json to an older version that requires the MSBuild version currently available.

@marcpopMSFT
Copy link
Member

@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.

@v-wuzhai v-wuzhai merged commit 00ba081 into release/9.0.2xx Oct 25, 2024
31 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/9.0.1xx-to-release/9.0.2xx branch October 25, 2024 05:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants