Skip to content
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

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

Merged
merged 78 commits into from
Jan 16, 2025

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:

  • v-wuzhai
  • joeloff
  • github-actions[bot]
  • marcpopMSFT
  • dotnet-maestro[bot]
  • jjonescz

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.
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.1xx-to-release/9.0.2xx origin/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 fetch
git checkout -b merge/release/9.0.1xx-to-release/9.0.2xx origin/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.

nagilson and others added 30 commits November 4, 2024 16:40
Create Subdirectory for Temp Deps.Json File. Please contact me for further information regarding this change.

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup

#### PR Summary
Refactored the creation of temporary dependency JSON files to use a subdirectory for better organization.
- `src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs`: Changed the temporary file creation to use a subdirectory by combining `PathUtilities.CreateTempSubdirectory()` with `Path.GetRandomFileName()`.
…otnet-runtime build 20241203.14

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 -> To Version 9.0.1

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-rtm.24528.2 -> To Version 9.0.1-servicing.24571.2 (parent: Microsoft.NETCore.App.Runtime.win-x64
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](/~https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.0-rtm.24528.2 to 9.0.1-servicing.24571.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100**: from 9.0.0 to 9.0.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - **Microsoft.SourceBuild.Intermediate.emsdk**: from 9.0.0-rtm.24528.2 to 9.0.1-servicing.24571.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 57bb26e6-6f64-40cf-a4ea-5b973f41bc22
- **Build**: 20241203.14
- **Date Produced**: December 4, 2024 2:31:43 AM UTC
- **Commit**: 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.Logging.Console**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.NET.HostModel**: [from 9.0.0-rtm.24528.9 to 9.0.1-servicing.24603.14][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.NETCore.Platforms**: [from 9.0.0-rtm.24528.9 to 9.0.1-servicing.24603.14][1]
  - **Microsoft.Win32.SystemEvents**: [from 9.0.0 to 9.0.1][1]
  - **System.CodeDom**: [from 9.0.0 to 9.0.1][1]
  - **System.Composition.AttributedModel**: [from 9.0.0 to 9.0.1][1]
  - **System.Composition.Convention**: [from 9.0.0 to 9.0.1][1]
  - **System.Composition.Hosting**: [from 9.0.0 to 9.0.1][1]
  - **System.Composition.Runtime**: [from 9.0.0 to 9.0.1][1]
  - **System.Composition.TypedParts**: [from 9.0.0 to 9.0.1][1]
  - **System.Configuration.ConfigurationManager**: [from 9.0.0 to 9.0.1][1]
  - **System.Formats.Asn1**: [from 9.0.0 to 9.0.1][1]
  - **Sy...
…otnet-windowsdesktop build 20241204.4

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 -> To Version 9.0.1

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.0-rtm.24529.2 -> To Version 9.0.1-rtm.24604.3 (parent: Microsoft.WindowsDesktop.App.Ref
…dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](/~https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 9.0.0-rtm.24529.2 to 9.0.1-rtm.24604.3 (parent: Microsoft.WindowsDesktop.App.Ref)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24529.1 to 9.0.1-servicing.24604.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24529.2 to 9.0.1-rtm.24604.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a
- **Build**: 20241204.4
- **Date Produced**: December 4, 2024 9:31:09 PM UTC
- **Commit**: 1db7b9dd6405faab770fe63d6fe0acbce686ffa9
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.1][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24529.2 to 9.0.1-servicing.24604.4][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24529.2 to 9.0.1-servicing.24604.4][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24529.2 to 9.0.1-rtm.24604.3][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24529.1 to 9.0.1-servicing.24604.3][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24529.2 to 9.0.1-rtm.24604.3][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC308dc7955704be60afc72ec00902cc18e028c3c2&targetVersion=GC1db7b9dd6405faab770fe63d6fe0acbce686ffa9&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCa04736acb8edb533756131d3d5fc55f15cd03d6a&targetVersion=GCaaef42794203f462cc23c0ffab4086108938182e&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC62ebdb4b0d5cc7e163b8dc9331dc196e576bf162&targetVersion=GCa0809427d515428bce23e14fe9ca6214d19054c4&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
…otnet-aspnetcore build 20241204.7

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-rtm.24529.3 -> To Version 9.0.1-rtm.24604.7
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 7c429c14-b12b-40f6-ae9e-395f98f369df
- **Build**: 20241204.7
- **Date Produced**: December 5, 2024 12:16:11 AM UTC
- **Commit**: 4e4e1fc383c5abd03312fa95955982df4607c621
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **dotnet-user-jwts**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **dotnet-user-secrets**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.AspNetCore.Authorization**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.AspNetCore.TestHost**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.Extensions.ObjectPool**: [from 9.0.0 to 9.0.1][1]
  - **Microsoft.JSInterop**: [from 9.0.0 to 9.0.1][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]
  - **Microsoft.SourceBuild.Intermediate.aspnetcore**: [from 9.0.0-rtm.24529.3 to 9.0.1-rtm.24604.7][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCaf22effae4069a5dfb9b0735859de48820104f5b&targetVersion=GC4e4e1fc383c5abd03312fa95955982df4607c621&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df)
@github-actions github-actions bot requested a review from a team as a code owner January 15, 2025 09:31
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Jan 15, 2025
@nagilson nagilson enabled auto-merge January 15, 2025 23:21
@nagilson
Copy link
Member

@ellahathaway @mthalman Should the 9.0.102 SB stuff go into 9.0.200 or should we yoink it?
Need to finish this PR by the end of this week

@ellahathaway
Copy link
Member

@ellahathaway @mthalman Should the 9.0.102 SB stuff go into 9.0.200 or should we yoink it? Need to finish this PR by the end of this week

Source-build builds and ships out of 1xx, so I don't think this stuff has to go into 2xx (unless 2xx somehow merges back into 1xx which I don't think is the case). That said, I'm not entirely understanding why you're asking. Is source-build blocking this PR?

@nagilson
Copy link
Member

nagilson commented Jan 15, 2025

@ellahathaway @mthalman Should the 9.0.102 SB stuff go into 9.0.200 or should we yoink it? Need to finish this PR by the end of this week

Source-build builds and ships out of 1xx, so I don't think this stuff has to go into 2xx (unless 2xx somehow merges back into 1xx which I don't think is the case). That said, I'm not entirely understanding why you're asking. Is source-build blocking this PR?

So far no, I want to make sure that we are doing the right thing and not creating more churn for you/committing unnecessary stuff. Thank you for helping :)

…be included in 9.0.2xx:


Move test templates to SDK repo by Evangelink · Pull Request #44417 · dotnet/sdk
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.