Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #44195

Merged
merged 25 commits into from
Oct 16, 2024

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • marcpopMSFT
  • manodasanW
  • v-wuzhai
  • Evangelink
  • dotnet-maestro[bot]
  • github-actions[bot]
  • jonathanpeppers
  • dotnet-sb-bot
  • nagilson
  • MichaelSimons
  • mmitche
  • anvillan
  • ellahathaway
  • invalid-email-address
  • vseanreesermsft
  • baronfel
  • tmat
  • surayya-MS
  • NikolaMilosavljevic
  • nohwnd
  • joeloff
  • dsplaisted
  • am11
  • dotnet-bot
  • Cosifne
  • javiercn
  • DL444

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.1xx
git pull --ff-only
git checkout release/9.0.2xx
git pull --ff-only
git merge --no-ff release/9.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/9.0.1xx-to-release/9.0.2xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.2xx

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

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.

manodasanW and others added 8 commits October 3, 2024 19:01
…ld 20241014.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.24511.2 -> To Version 9.0.0-rtm.24514.3

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-rtm.24511.2 -> To Version 9.0.0-rtm.24514.2 (parent: Microsoft.WindowsDesktop.App.Ref
…15.4

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.24509.1 -> To Version 9.0.0-preview.24515.4
@github-actions github-actions bot force-pushed the merge/release/9.0.1xx-to-release/9.0.2xx branch from 9702042 to e928e71 Compare October 15, 2024 17:22
@github-actions github-actions bot requested review from a team, tmat, arunchndr and vijayrkn as code owners October 15, 2024 17:22
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-CodeFlow untriaged Request triage from a team member labels Oct 15, 2024
dotnet-maestro bot and others added 10 commits October 15, 2024 19:49
…ld 20241015.1

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.24514.3 -> To Version 9.0.0
…15.8

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.24515.4 -> To Version 9.0.0-preview.24515.8
…0241014.3

Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab
 From Version 9.0.0-beta.24512.1 -> To Version 9.0.0-beta.24514.3
…1014.4

Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 9.0.0-rtm.24511.16 -> To Version 9.0.0-rtm.24514.4
…15.11

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.24515.8 -> To Version 9.0.0-preview.24515.11
remove an extra property around workloads that doesn't appear to be used anywhere
…ld 20241015.2

VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.0-rtm.24515.1 -> To Version 9.0.0-rtm.24515.2
…1015.9

Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 9.0.0-rtm.24514.4 -> To Version 9.0.0-rtm.24515.9

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-rtm.24469.1 -> To Version 9.0.0-rtm.24513.1 (parent: Microsoft.NETCore.App.Runtime.win-x64
@github-actions github-actions bot requested a review from a team as a code owner October 16, 2024 05:39
@marcpopMSFT marcpopMSFT merged commit 0f326f8 into release/9.0.2xx Oct 16, 2024
31 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/9.0.1xx-to-release/9.0.2xx branch October 16, 2024 21:25
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants