-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[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
base: main
Are you sure you want to change the base?
Conversation
…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
…-merge-8.0.4xx-2025-05-13-1456
…-merge-8.0.3xx-2025-05-13-1500
…-merge-8.0.1xx-2025-05-13-1500
…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
…merge/release/8.0.4xx-to-release/9.0.1xx
…merge/release/9.0.1xx-to-release/9.0.3xx
…merge/release/9.0.1xx-to-release/9.0.3xx
… Build ID 2729690
… Build ID 2729774 (#49393)
# 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
…se/9.0.3xx-to-main
# 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
@dotnet/kitten Looks like a test failure in
The test project is |
…se/9.0.3xx-to-main
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 In the same file though the |
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. |
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:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.
or if you are using SSH
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.