Skip to content

[automated] Merge branch 'release/9.0.3xx' => 'main' #49389

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

Open
wants to merge 371 commits into
base: main
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • MiYanni
  • marcpopMSFT
  • v-wuzhai
  • SimonZhao888
  • dotnet-maestro[bot]
  • dtivel
  • ellahathaway
  • vseanreesermsft
  • dotnet-bot
  • surayya-MS
  • baronfel
  • invalid-email-address
  • mthalman
  • ViktorHofer
  • akoeplinger
  • Winniexu01
  • joeloff
  • rainersigwald

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

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

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.

vseanreesermsft and others added 30 commits May 7, 2025 14:48
…07.2

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 7.0.0-preview.25175.5 -> To Version 7.0.0-preview.25257.2
…0250507.6

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.6
…0250507.13

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.116-servicing.25214.4 -> To Version 8.0.117-servicing.25257.13
…darc-release/8.0.1xx-4411553c-e2f4-492e-a41b-4826f3608411
…darc-release/8.0.3xx-adf0bb12-6d0f-4331-a2cb-ad080befdbac
…darc-release/8.0.3xx-149877b8-af60-435b-86af-70fc2a2d23da
…darc-release/8.0.1xx-30e75f85-4fe7-4641-841c-7a9905271d99
…merge/release/8.0.3xx-to-release/8.0.4xx
…0250508.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.312-servicing.25215.1 -> To Version 8.0.313-servicing.25258.1
…merge/release/8.0.1xx-to-release/8.0.3xx
…513.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25230.1 -> To Version 8.0.0-beta.25263.1
@github-actions github-actions bot requested review from a team as code owners June 13, 2025 16:09
dotnet-bot and others added 6 commits June 13, 2025 09:55
# Conflicts:
#	.github/workflows/remove-lockdown-label.yml
#	NuGet.config
#	eng/Version.Details.xml
#	eng/Versions.props
#	eng/install-scancode.sh
#	eng/pipelines/templates/stages/vmr-build.yml
#	eng/pipelines/vmr-build-pr-internal.yml
#	eng/pipelines/vmr-build-pr.yml
#	src/Containers/Microsoft.NET.Build.Containers/Exceptions/UnableToDownloadFromRepositoryException.cs
#	src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
#	src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
#	src/SourceBuild/content/eng/Versions.props
#	src/SourceBuild/content/eng/pipelines/sb-ci.yml
#	src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
#	src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
#	test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
Simon Zhao (BEYONDSOFT CONSULTING INC) and others added 2 commits June 17, 2025 15:08
# Conflicts:
#	src/Layout/pkg/osx/resources/cs.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/de.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/es.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/fr.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/it.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/ja.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/ko.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/pl.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/pt-br.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/ru.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/zh-hans.lproj/conclusion.html
#	src/Layout/pkg/osx/resources/zh-hant.lproj/conclusion.html
@MiYanni
Copy link
Member

MiYanni commented Jun 19, 2025

@dotnet/kitten Looks like a test failure in Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAUnitTestProject:

C:\h\w\A325094E\t\dotnetSdkTests\ypudv5cg.ewm\It_generates_---051AC46A\XUnitTestProject.csproj : error NU1015: The following PackageReference item(s) do not have a version specified: Microsoft.NET.Test.Sdk

The test project is Microsoft.NET.Build.Tests, so I'm assuming those are MSBuild related.

@AR-May
Copy link
Member

AR-May commented Jun 20, 2025

From the first glance, it looks to me as if the change in test/TestAssets/TestProjects/XUnitTestProject/XUnitTestProject.csproj causes the test failure. It says the version is not specified, my guess it might be because the $(MicrosoftNETTestSdkPackageVersion) is empty - as if the versions from Versions file are not applied to the tests` assets (it is the only place where I see it is defined). Could it be?

In the same file though the $(CurrentTargetFramework) seem to be used without issues. And in another test asset there is a comment stating that some tricky replacing happens in the test infra. I am not knowledgeable about the test infra in this repo, so I am not sure where it happens.

@AR-May
Copy link
Member

AR-May commented Jun 20, 2025

I see that in this PR where the change of "Microsoft.NET.Test.Sdk" version was originated, the error for the missing version should be different. Not sure what is with this test - will need some more logs, preferably binlogs to look into it.

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.