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/6.0.4xx' => 'release/8.0.1xx' #20184

Merged
merged 33 commits into from
Oct 11, 2024

Conversation

github-actions[bot]
Copy link

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

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

  • mmitche
  • vseanreesermsft
  • 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/6.0.4xx
git pull --ff-only
git checkout release/8.0.1xx
git pull --ff-only
git merge --no-ff release/6.0.4xx

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

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/6.0.4xx-to-release/8.0.1xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull https://github.com/dotnet/installer merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/installer HEAD:merge/release/6.0.4xx-to-release/8.0.1xx
or if you are using SSH
git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull git@github.com:dotnet/installer merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/installer HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

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.

Mirroring and others added 30 commits August 7, 2024 02:40
…dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240816.4
- **Date Produced**: August 16, 2024 4:11:44 PM UTC
- **Commit**: 85d7e1ee6931838809c8c32856b69a131552793a
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.426-servicing.24415.29 to 6.0.426-servicing.24416.4][17]
  - **Microsoft.NET.Sdk**: [from 6.0.426-servicing.24415.29 to 6.0.426-servicing.24416.4][17]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][18]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][18]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][18]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][18]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.33-servicing.24366.4 to 6.0.34-servicing.24415.3][19]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][18]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][20]

[17]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC691dfd4e7210727bb4c4385606495ec22d1ec727&targetVersion=GC85d7e1ee6931838809c8c32856b69a131552793a&_a=files
[18]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files
[19]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6a984c48f3489b60f25deb72ede6e5051bb130d4&targetVersion=GC43d5519b7b6f2093342515c04b054e88df71729e&_a=files
[20]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)

[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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7 (parent: Microsoft.NET.Sdk...
…dnceng/internal/dotnet-sdk

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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240819.21
- **Date Produced**: August 19, 2024 6:47:13 PM UTC
- **Commit**: b426ce913f1dadfb36ef0340fac54c062e773ab8
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.426-servicing.24417.8 to 6.0.426-servicing.24419.21][6]
  - **Microsoft.NET.Sdk**: [from 6.0.426-servicing.24417.8 to 6.0.426-servicing.24419.21][6]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][7]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1][8]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][9]

[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC082c978531eff9587a55d1132f86e122f18a3415&targetVersion=GC...
…otnet-sdk build 20240910.7

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.426-servicing.24419.21 -> To Version 6.0.427-servicing.24460.7

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.24366.1 -> To Version 6.0.200-1.24429.1 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

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.ILLink.Tasks**: from 6.0.200-1.24366.1 to 6.0.200-1.24429.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240910.7
- **Date Produced**: September 10, 2024 5:31:38 PM UTC
- **Commit**: 21112780fde3871bb97039661760c8290473704c
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.426-servicing.24419.21 to 6.0.427-servicing.24460.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.426-servicing.24419.21 to 6.0.427-servicing.24460.7][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.24366.1 to 6.0.200-1.24429.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb426ce913f1dadfb36ef0340fac54c062e773ab8&targetVersion=GC21112780fde3871bb97039661760c8290473704c&_a=files
[2]: dotnet/linker@55d70c3...0991fcd

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
…otnet-sdk build 20240911.12

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.427-servicing.24460.7 -> To Version 6.0.427-servicing.24461.12

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

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.NETCore.App.Ref**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.34 to 6.0.35 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240911.12
- **Date Produced**: September 11, 2024 9:34:00 PM UTC
- **Commit**: 0cdd72c79635078b4c89451ced59c95d71a365f4
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24460.7 to 6.0.427-servicing.24461.12][1]
  - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24460.7 to 6.0.427-servicing.24461.12][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.35][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.35][2]
  - **Microsoft.NETC...
…otnet-sdk build 20240912.20

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.427-servicing.24461.12 -> To Version 6.0.427-servicing.24462.20

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets
 From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
…otnet-sdk build 20240912.29

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.427-servicing.24462.20 -> To Version 6.0.427-servicing.24462.29

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24461.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.34-servicing.24417.2 to 6.0.35-servicing.24462.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240912.29
- **Date Produced**: September 12, 2024 9:55:36 PM UTC
- **Commit**: 29da8759f075a17329e174c53e59e85180928aa9
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24462.20 to 6.0.427-servicing.24462.29][3]
  - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24462.20 to 6.0.427-servicing.24462.29][3]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.35][4]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8][4]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8][4]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.35][4]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24461.4][5]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.35][4]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.34-servicing.24417.2 to 6.0.35-servicing.24462.2][6]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC853c4ee667f78b855aaf1ae621fc4980e327a49f&targetVersion...
…otnet-sdk build 20240913.13

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.427-servicing.24462.29 -> To Version 6.0.427-servicing.24463.13

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets
 From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

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.AspNetCore.App.Ref**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240913.13
- **Date Produced**: September 13, 2024 7:20:18 PM UTC
- **Commit**: c3caa83afc23db553d477d695fb257e0f97ff857
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24462.29 to 6.0.427-servicing.24463.13][1]
  - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24462.29 to 6.0.427-servicing.24463.13][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2]
  - **dotnet-dev-certs**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2]
  - **dotnet-user-secrets**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC29da8759f075a17329e174c53e59e85180928aa9&targetVersion=GCc3caa83afc23db553d477d695fb257e0f97ff857&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1ad4097713d52a22315021099f2a185ae68abbe1&targetVersion=GC827b96040e62e5aa47d829bfa61c000d315d4f2e&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
…otnet-sdk build 20240913.31

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.427-servicing.24463.13 -> To Version 6.0.427-servicing.24463.31

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

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.WindowsDesktop.App.Ref**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.35-servicing.24462.2 to 6.0.35-servicing.24462.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240913.31
- **Date Produced**: September 13, 2024 11:55:19 PM UTC
- **Commit**: 9e198e0619cedfde17a7e493e4d1f8a9d089269d
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24463.13 to 6.0.427-servicing.24463.31][1]
  - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24463.13 to 6.0.427-servicing.24463.31][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.35 to 6.0.35][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.35-servicing.24462.2 to 6.0.35-servicing.24462.14][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc3caa83afc23db553d477d695fb257e0f97ff857&targetVersio...
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and script updates.

#### PR Summary
This pull request merges changes from the public repository, focusing on cleaning up and updating post-build scripts.
- Added `nuget-verification.ps1` to verify Microsoft NuGet packages.
- Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1`.
- Updated `publish-build-assets.yml` to use `AzureCLI@2` instead of `PowerShell@2`.
- Updated `setup-maestro-vars.yml` to use `AzureCLI@2` instead of `PowerShell@2`.
- Updated dependencies in `Version.Details.xml`.
…otnet-sdk build 20240916.22

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.427-servicing.24463.31 -> To Version 6.0.427-servicing.24466.22

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.425 -> To Version 6.0.427 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

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.DotNet.Common.ItemTemplates**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.425-rtm.24417.1 to 6.0.427-rtm.24466.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240916.22
- **Date Produced**: September 16, 2024 10:43:04 PM UTC
- **Commit**: 0f7bfed6fab981db8d6b859311a1a98e2b5cd684
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24463.31 to 6.0.427-servicing.24466.22][1]
  - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24463.31 to 6.0.427-servicing.24466.22][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.425 to 6.0.427][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.425-rtm.24417.1 to 6.0.427-rtm.24466.3][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.425 to 6.0.427][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9e198e0619cedfde17a7e493e4d1f8a9d089269d&targetVersion=GC0f7bfed6fab981db8d6b859311a1a98e2b5cd684&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC1a1d03fbcbcf9d373c1f0c87c20506b5de300388&targetVersion=GC7de8a2867cf734967eef78d8e82902f3e84650b7&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
…dnceng/internal/dotnet-sdk

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.WindowsDesktop.App.Ref**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.425-rtm.24417.1 to 6.0.427-rtm.24466.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.35-servicing.24462.2 to 6.0.35-servicing.24462.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240913.28
- **Date Produced**: September 13, 2024 11:01:11 PM UTC
- **Commit**: 1ce03150206eb3a054fd686a1c43da9b34f3314a
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24466.22 to 6.0.427-servicing.24463.28][1]
  - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24466.22 to 6.0.427-servicing.24463.28][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.35 to 6.0.35][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.35-servicing.24462.8][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.35-servicing.24462.8][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.427 to 6.0.425][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.427-rtm.24466.3 to 6.0.425-rtm.24417.1][3]
  - **Microsoft.DotNet.Common.Projec...
…dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240918.28
- **Date Produced**: September 19, 2024 6:33:29 AM UTC
- **Commit**: d404f562916f5be62c6661e4f7033f26859ce939
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24467.29 to 6.0.427-servicing.24468.28][1]
  - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24467.29 to 6.0.427-servicing.24468.28][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCaa8718535dd4d26e91e431cbd3a9034b07de9a5d&targetVersion=GCd404f562916f5be62c6661e4f7033f26859ce939&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
…008.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24463.1 -> To Version 6.0.0-beta.24508.2
@v-wuzhai v-wuzhai merged commit 8796214 into release/8.0.1xx Oct 11, 2024
18 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/6.0.4xx-to-release/8.0.1xx branch October 11, 2024 10:21
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.

4 participants