Skip to content

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx'#54388

Merged
DonnaChen888 merged 51 commits into
release/10.0.3xxfrom
merge/release/10.0.1xx-to-release/10.0.3xx
May 22, 2026
Merged

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx'#54388
DonnaChen888 merged 51 commits into
release/10.0.3xxfrom
merge/release/10.0.1xx-to-release/10.0.3xx

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

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

  • akoeplinger
  • DonnaChen888
  • github-actions[bot]
  • dotnet-maestro[bot]
  • dkurepa
  • marcpopMSFT
  • nagilson
  • vseanreesermsft
  • NikolaMilosavljevic
  • MiYanni

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/10.0.1xx
git pull --ff-only
git checkout release/10.0.3xx
git pull --ff-only
git merge --no-ff release/10.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/10.0.1xx-to-release/10.0.3xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.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/10.0.1xx-to-release/10.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/10.0.1xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull https://github.com/dotnet/sdk merge/release/10.0.1xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.1xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull git@github.com:dotnet/sdk merge/release/10.0.1xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.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 April 15, 2026 09:34
…0260415.2

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.127-servicing.26207.9 -> To Version 8.0.127-servicing.26215.2
Microsoft.TemplateEngine.Abstractions From Version 8.0.127 -> To Version 8.0.127
…nals build 20260416.1

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.26207.1 -> To Version 8.0.0-alpha.1.26216.1
…0260416.2

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.127-servicing.26215.2 -> To Version 8.0.127-servicing.26216.2
Microsoft.TemplateEngine.Abstractions From Version 8.0.127 -> To Version 8.0.127
…421.2

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.26168.3 -> To Version 8.0.0-beta.26221.2
…build 20260423.1

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-assets From Version 8.0.0-alpha.1.26208.5 -> To Version 8.0.0-alpha.1.26223.1
…424.3

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.26168.3 -> To Version 8.0.0-beta.26224.3
…uild 20260505.1

On relative base path root
Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.26173.1 -> To Version 3.11.0-beta1.26255.1
Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.26173.1 -> To Version 8.0.0-preview.26255.1
…0260505.2

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.127-servicing.26216.2 -> To Version 8.0.128-servicing.26255.2
Microsoft.TemplateEngine.Abstractions From Version 8.0.127 -> To Version 8.0.128
Remove 'condition: succeededOrFailed()' from all 'Run Tests in Helix'
steps in eng/build.yml and eng/build-pr.yml. Without an explicit
condition, Azure Pipelines defaults to 'succeeded()', which skips the
test step when the preceding build step fails. This avoids wasting
Helix resources on tests that cannot succeed.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The dotnet workload update subprocess fails with 401 Unauthorized on
internal feeds because DOTNET_CLI_HOME redirection causes NuGet to look
for the credential provider plugin in artifacts/tmp/ instead of the
user profile where it's actually installed.

Fix: Pass NUGET_PLUGIN_PATHS env var pointing to the Azure Artifacts
Credential Provider at its actual location under USERPROFILE, and pass
--configfile pointing to the repo NuGet.config.

Also remove diagnostic logging from previous investigation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Use HOME on Linux/Mac and USERPROFILE on Windows to locate the
Azure Artifacts Credential Provider. Also use forward slashes for
cross-platform path compatibility.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…build 20260512.3

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-assets From Version 8.0.0-alpha.1.26223.1 -> To Version 8.0.0-alpha.1.26262.3
…build 20260512.4

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-assets From Version 9.0.0-alpha.1.26261.1 -> To Version 9.0.0-alpha.1.26262.4
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
…0260512.5

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 9.0.118-servicing.26256.4 -> To Version 9.0.118-servicing.26262.5
Microsoft.TemplateEngine.Abstractions From Version 9.0.118 -> To Version 9.0.118
dotnet-maestro Bot and others added 20 commits May 13, 2026 08:40
…ld 20260513.1

On relative base path root
Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.26256.3 -> To Version 9.0.0-preview.26263.1
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
…merge/release/8.0.4xx-to-release/9.0.1xx
…ld 20260513.1

On relative base path root
Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.26256.3 -> To Version 9.0.0-preview.26263.1
…53437)

Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
…0260518.1

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.315 -> To Version 9.0.315
Microsoft.TemplateEngine.Mocks From Version 9.0.315-servicing.26263.1 -> To Version 9.0.315-servicing.26268.1
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
… merge/release/9.0.3xx-to-release/10.0.1xx
…#54372)

When NetAnalyzers was integrated into the SDK build, the new GetPackAsAnalyzerFiles target started placing the language-agnostic Microsoft.CodeAnalysis.NetAnalyzers.dll flat under analyzers/dotnet/ while the C#/VB-specific assemblies live in analyzers/dotnet/cs/ and analyzers/dotnet/vb/. Roslyn requires an analyzer and its dependencies to live in the same directory, so the language-specific analyzers fail to load when consumed via the NuGet package.

The pre-10.0.100 layout produced by the old GenerateAnalyzerNuspec tool duplicated the agnostic assembly into both cs/ and vb/ folders. Restore that behavior so each language-specific analyzer sits next to its agnostic dependency.

Fixes #54350.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
@DonnaChen888 DonnaChen888 merged commit 1ef423c into release/10.0.3xx May 22, 2026
29 checks passed
@DonnaChen888 DonnaChen888 deleted the merge/release/10.0.1xx-to-release/10.0.3xx branch May 22, 2026 06:09
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.

8 participants