Skip to content

[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx'#46597

Merged
marcpopMSFT merged 50 commits intorelease/9.0.3xxfrom
merge/release/9.0.2xx-to-release/9.0.3xx
Feb 7, 2025
Merged

[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx'#46597
marcpopMSFT merged 50 commits intorelease/9.0.3xxfrom
merge/release/9.0.2xx-to-release/9.0.3xx

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Feb 6, 2025

I detected changes in the release/9.0.2xx branch which have not been merged yet to release/9.0.3xx. I'm a robot and am configured to help you automatically keep release/9.0.3xx up to date, so I've opened this PR.

This PR merges commits made on release/9.0.2xx by the following committers:

  • v-wuzhai
  • dotnet-maestro[bot]
  • marcpopMSFT
  • baronfel
  • ellahathaway

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.2xx
git pull --ff-only
git checkout release/9.0.3xx
git pull --ff-only
git merge --no-ff release/9.0.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/sdk HEAD:merge/release/9.0.2xx-to-release/9.0.3xx
or if you are using SSH 
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.2xx-to-release/9.0.3xx

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.2xx-to-release/9.0.3xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

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

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.

dotnet-maestro bot and others added 30 commits January 16, 2025 05:02
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2025…
07b72ce 
…0116.4

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.12.21-preview-24618-01 -> To Version 17.12.24-preview-25066-04
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20250…
eca6672 
…115.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25058.5 -> To Version 9.0.0-beta.25065.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/templating build 2…
07bd8ea 
…0250115.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.103-servicing.25062.8 -> To Version 9.0.103-servicing.25065.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/templating build 2…
1fcdd95 
…0250116.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.103-servicing.25062.8 -> To Version 9.0.103-servicing.25066.3
@marcpopMSFT
[release/9.0.1xx] Update dependencies from dotnet/templating (#46042)
c2c9fb1
@marcpopMSFT
[release/9.0.1xx] Update dependencies from dotnet/msbuild (#46030)
0f33fcb
@marcpopMSFT
[release/9.0.1xx] Update dependencies from dotnet/arcade (#46032)
e531d20
@ellahathaway
[release/9.0] Remove alpine n-1 leg (#46068)
b7153eb
@baronfel
Fix typo in condition check for container publishing that led to inad…
e5c80d9 
…vertend multi-arch publishing
@baronfel
Add two new failing tests detailing scenarios that should work:
d139aa0 
* using Container-specific properties to target a single RID
* using normal RID properties to target a single RID
@baronfel
Green up one of the two tests by making the _IsMultiRIDBuild conditio…
8e67d79 
…n more correct
@baronfel
Fix second test problem by more carefully considering the order of si…
7276bcc 
…ngle/multi rid checking
@baronfel
fix ordering to make sure that we only ever _write_ a default value a…
88436e7 
…fter we've checked all possible user-provided values
@marcpopMSFT
Backport 46067 to 9.0.1xx (#46169)
a0384c7
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
43fa5fa 
…merge/release/9.0.1xx-to-release/9.0.2xx
@dotnet-maestro
Update dependencies from https://github.com/microsoft/vstest build 20…
c927466 
…250123.5

Microsoft.SourceBuild.Intermediate.vstest , Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI
 From Version 17.12.0-release-24508-01 -> To Version 17.13.0-release-25073-05
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
a82cbcc 
…uild 20250124.3

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers
 From Version 3.11.0-beta1.24527.2 -> To Version 3.11.0-beta1.25074.3
@dotnet-maestro
Update dependencies from https://github.com/nuget/nuget.client build …
19329ed 
…6.13.1.1

Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning
 From Version 6.13.0-rc.113 -> To Version 6.13.1-rc.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
4ccfaef 
…124.9

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.13.0-3.25072.11 -> To Version 4.13.0-3.25074.9
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
221583a 
…124.10

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.13.0-3.25072.11 -> To Version 4.13.0-3.25074.10
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
d5dcc88 
…uild 20250126.2

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers
 From Version 3.11.0-beta1.24527.2 -> To Version 3.11.0-beta1.25076.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/razor build 202501…
ef62a50 
…26.3

Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.25058.6 -> To Version 9.0.0-preview.25076.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
fac2efa 
…126.8

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.13.0-3.25072.11 -> To Version 4.13.0-3.25076.8
@dotnet-maestro
Update dependencies from https://github.com/dotnet/razor build 202501…
bd3944b 
…28.1

Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.25058.6 -> To Version 9.0.0-preview.25078.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20250…
af662ac 
…127.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25065.2 -> To Version 9.0.0-beta.25077.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/scenario-tests bui…
f80195c 
…ld 20250129.1

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.25070.3 -> To Version 9.0.0-preview.25079.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/scenario-tests bui…
32aaa09 
…ld 20250202.1

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.25070.3 -> To Version 9.0.0-preview.25102.1
[release/9.0.2xx] Update dependencies from dotnet/scenario-tests (#46396
8eb08d8 
)
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
570c1de 
…darc-release/9.0.2xx-45b38d51-d988-42f2-951c-47db5e6ebc0f
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
d0b100c 
…darc-release/9.0.2xx-97d188a7-86fb-4d9e-9eac-be04c69037d3
Jason Zhai and others added 16 commits February 4, 2025 21:58
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
b5a8b70 
…darc-release/9.0.2xx-2e8b40ec-6a84-4127-82aa-9adf03820670
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
2b2ff81 
…darc-release/9.0.2xx-cbc025dc-be7f-44e3-b778-35550b2d836d
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
8c2b431 
…darc-release/9.0.2xx-957ca2fa-9edb-4c0b-a130-d0f29ff1a09d
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
9177cbe 
…darc-release/9.0.2xx-c5b09abf-fc8d-4fd6-bc7e-8adacbb101d2
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#46166)
c8f5b1e
@dotnet-maestro
Update dependencies from https://github.com/dotnet/templating build 2…
390ede8 
…0250205.5

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.200-rtm.25066.4 -> To Version 9.0.201-servicing.25105.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
1f363d1 
…205.4

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.13.0-3.25072.11 -> To Version 4.13.0-3.25105.4
@marcpopMSFT
[release/9.0.2xx] Update dependencies from microsoft/vstest (#46265)
20b3236
@marcpopMSFT
[release/9.0.2xx] Update dependencies from dotnet/roslyn-analyzers (#…
fc6bef3 
…46286)
@marcpopMSFT
[release/9.0.2xx] Update dependencies from dotnet/roslyn (#46297)
aec1131
@marcpopMSFT
[release/9.0.2xx] Update dependencies from dotnet/razor (#46310)
537bee9
@marcpopMSFT
[release/9.0.2xx] Update dependencies from dotnet/arcade (#46379)
756fff8
@marcpopMSFT
[release/9.0.2xx] Update dependencies from dotnet/templating (#46556)
d36815d
@dotnet-maestro
Update dependencies from https://github.com/dotnet/templating build 2…
eec0b6b 
…0250205.7

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.201-servicing.25105.5 -> To Version 9.0.201-servicing.25105.7
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
0d86b73 
…darc-release/9.0.2xx-d6f41588-7ef9-4057-9c8b-6429be2b5dfe
[release/9.0.2xx] Update dependencies from dotnet/templating (#46581)
43d6194
@github-actions github-actions bot requested review from a team as code owners February 6, 2025 07:55
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Feb 6, 2025
This was referenced Feb 6, 2025
Open
Open
@marcpopMSFT marcpopMSFT merged commit 3d92c95 into release/9.0.3xx Feb 7, 2025
@marcpopMSFT marcpopMSFT deleted the merge/release/9.0.2xx-to-release/9.0.3xx branch February 7, 2025 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcpopMSFT marcpopMSFT marcpopMSFT approved these changes

Assignees

No one assigned

Labels

Area-Infrastructure untriaged Request triage from a team member

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@marcpopMSFT @ellahathaway @baronfel