Skip to content

Conversation

@github-actions
Copy link
Contributor

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

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

  • dsplaisted
  • DonnaChen888
  • dotnet-maestro[bot]
  • marcpopMSFT
  • nagilson
  • vseanreesermsft
  • SimonZhao888
  • dotnet-sb-bot
  • joeloff
  • NikolaMilosavljevic
  • ellahathaway
  • baronfel
  • github-actions[bot]
  • dotnet-bot
  • mmitche
  • JanProvaznik
  • jjonescz
  • MiYanni
  • jkoritzinsky

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.3xx
git pull --ff-only
git checkout release/10.0.1xx
git pull --ff-only
git merge --no-ff release/9.0.3xx

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

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.3xx-to-release/10.0.1xx'. 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.3xx-to-release/10.0.1xx origin/release/10.0.1xx
git pull https://github.com/dotnet/sdk merge/release/9.0.3xx-to-release/10.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.3xx-to-release/10.0.1xx
or if you are using SSH
git fetch
git checkout -b merge/release/9.0.3xx-to-release/10.0.1xx origin/release/10.0.1xx
git pull git@github.com:dotnet/sdk merge/release/9.0.3xx-to-release/10.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.3xx-to-release/10.0.1xx

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.

baronfel and others added 30 commits September 15, 2025 12:43
…0250914.12

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.415-servicing.25457.4 -> To Version 8.0.415-servicing.25464.12
Microsoft.TemplateEngine.Abstractions From Version 8.0.415 -> To Version 8.0.415
…915.1

On relative base path root
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25465.1
…915.8

On relative base path root
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.14.0-3.25429.5 -> To Version 4.14.0-3.25465.8
Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.12.0-beta1.25429.5 -> To Version 3.12.0-beta1.25465.8
…merge/release/8.0.4xx-to-release/9.0.1xx
…0250915.7

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 9.0.111-servicing.25457.5 -> To Version 9.0.111-servicing.25465.7
Microsoft.TemplateEngine.Abstractions From Version 9.0.111 -> To Version 9.0.111
…0250915.10

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.305 -> To Version 9.0.306
Microsoft.TemplateEngine.Mocks From Version 9.0.305-servicing.25458.1 -> To Version 9.0.306-servicing.25465.10
…darc-release/9.0.3xx-8b79a26f-acdd-4609-8cfa-5483924a4a06
…otnet-aspnetcore build 20250916.3

On relative base path root
dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.9-servicing.25420.3 -> To Version 9.0.10-servicing.25466.3
Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.9 -> To Version 9.0.10
…otnet-aspnetcore build 20250916.3

On relative base path root
dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.9-servicing.25420.3 -> To Version 9.0.10-servicing.25466.3
Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.9 -> To Version 9.0.10
Simon Zhao (BEYONDSOFT CONSULTING INC) and others added 17 commits October 21, 2025 14:00
…merge/release/9.0.1xx-to-release/9.0.3xx
…0251020.6

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.307 -> To Version 9.0.307
Microsoft.TemplateEngine.Mocks From Version 9.0.307-servicing.25515.4 -> To Version 9.0.307-servicing.25520.6
Merging with force because the known issue is not relevant to the branding change.
- VS uses the local appdata, VS versioned folder, sdk.txt file to determine whether or not to accept preview sdks

- VS Release rejects preview SDKs by default which causes the msbuild sdk resolver to not find sdks, as msbuild respects the vs settings

- This changes the vs settings to enable our internal SDKs to be found by msbuild when it's going under test.

- Possible improvements: this PR assumes sdk.txt content ordering does not matter - based on VS code this appears to be true but could change in the future

Also tried:
- modifying global.json to enable preview sdks, which was not enough. some tests have a  custom global.json and it seems to not take precedence

setting env vars such as msbuildsdks which did not take precedence over the vs setting

This commit is a condensed version of the work done in #51591 and #51598
…0251109.4

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.307 -> To Version 9.0.308
Microsoft.TemplateEngine.Mocks From Version 9.0.307-servicing.25520.6 -> To Version 9.0.308-servicing.25559.4
…110.12

On relative base path root
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.14.0-3.25465.8 -> To Version 4.14.0-3.25560.12
Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.12.0-beta1.25465.8 -> To Version 3.12.0-beta1.25560.12
@github-actions github-actions bot force-pushed the merge/release/9.0.3xx-to-release/10.0.1xx branch from 088cfd7 to 9bf7f65 Compare November 11, 2025 23:55
@github-actions github-actions bot requested a review from a team as a code owner November 11, 2025 23:55
@DonnaChen888 DonnaChen888 merged commit b0d2882 into release/10.0.1xx Nov 13, 2025
26 checks passed
@DonnaChen888 DonnaChen888 deleted the merge/release/9.0.3xx-to-release/10.0.1xx branch November 13, 2025 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.