Skip to content

[automated] Merge branch 'release/9.0.2xx' => 'main' #43673

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

Merged
merged 382 commits into from
Oct 8, 2024

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/9.0.2xx 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.2xx by the following committers:

  • marcpopMSFT
  • joeloff
  • dotnet-maestro[bot]
  • dotnet-sb-bot
  • v-wuzhai
  • lewing
  • Winniexu01
  • mthalman
  • tmat
  • nagilson
  • DL444
  • ellahathaway
  • jeromelaban
  • dsplaisted
  • baronfel
  • vseanreesermsft
  • invalid-email-address
  • KevinRansom
  • github-actions[bot]
  • JanKrivanek
  • jjonescz
  • MiYanni
  • Forgind
  • v-codyguan
  • manodasanW
  • dotnet-bot

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 main
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-main
or if you are using SSH
git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.2xx-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.2xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

marcpopMSFT and others added 30 commits September 11, 2024 15:30
…11.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.24460.1 -> To Version 9.0.0-preview.24461.1
…0240911.23

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-rc.2.24460.5 -> To Version 9.0.0-rc.2.24461.23
…0240911.26

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-rc.2.24461.23 -> To Version 9.0.0-rc.2.24461.26
…0240912.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.100-rc.2.24460.7 -> To Version 9.0.100-rc.2.24462.2
…ld 20240912.1

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rc.24459.2 -> To Version 1.1.0-rc.24462.1
…911.7

Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler
 From Version 9.0.100-beta.24461.5 -> To Version 9.0.100-beta.24461.7
…911.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1
…0240911.9

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.403-servicing.24460.6 -> To Version 8.0.403-servicing.24461.9
…0912.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.11.4-preview-24406-09 -> To Version 17.11.9-servicing-24462-02
…911.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1
…912.2

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.12.0-3.24461.1 -> To Version 4.12.0-3.24462.2
…0911.13

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.12.0-preview-24461-07 -> To Version 17.12.0-preview-24461-13
v-wuzhai and others added 8 commits September 24, 2024 17:53
…ld 20240924.3

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-rtm.24473.2 -> To Version 9.0.0-rtm.24474.3

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-rtm.24472.2 -> To Version 9.0.0-rtm.24474.2 (parent: Microsoft.WindowsDesktop.App.Ref
…ld 20240924.6

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-rtm.24474.3 -> To Version 9.0.0-rtm.24474.6
@github-actions github-actions bot requested review from a team, BillHiebert, tmat and arunchndr as code owners September 24, 2024 23:15
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Sep 24, 2024
@v-wuzhai
Copy link
Member

@tmat @dsplaisted @Forgind @dotnet/source-build-internal @marcpopMSFT would you be able to review these changes please? Thanks!

@mthalman
Copy link
Member

sdk-source-build error:

/vmr/src/roslyn-analyzers/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj(0,0): error NU1605: (NETCORE_ENGINEERING_TELEMETRY=Restore) Warning As Error: Detected package downgrade: System.Composition from 9.0.0-rc.1.24431.7 to 9.0.0-rc.1.24414.5. Reference the package directly from the project to select a different version. 
 GenerateDocumentationAndConfigFilesForBrokenRuntime -> Microsoft.CodeAnalysis 4.12.0-2.24422.8 -> System.Composition (>= 9.0.0-rc.1.24431.7) 
 GenerateDocumentationAndConfigFilesForBrokenRuntime -> System.Composition (>= 9.0.0-rc.1.24414.5)

This is the same as #43363 (comment) which is blocked on #43061.

@v-wuzhai v-wuzhai merged commit 2a21ea7 into main Oct 8, 2024
36 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/9.0.2xx-to-main branch October 8, 2024 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.