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/8.0.1xx' => 'release/8.0.3xx' #19749

Conversation

dotnet-maestro-bot
Copy link

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

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

  • marcpopMSFT
  • vseanreesermsft
  • v-wuzhai
  • dotnet-maestro[bot]
  • ellahathaway
  • NikolaMilosavljevic
  • dotnet-bot
  • MiYanni
  • joeloff
  • mthalman
  • oleksandr-didyk
  • dotnet-sb-bot
  • nohwnd
  • Forgind
  • JL03-Yue

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/8.0.1xx
git pull --ff-only
git checkout release/8.0.3xx
git pull --ff-only
git merge --no-ff release/8.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-maestro-bot/core-sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/core-sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx

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

git checkout -b merge/release/8.0.1xx-to-release/8.0.3xx release/8.0.3xx
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/8.0.1xx-to-release/8.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx
or if you are using SSH
git checkout -b merge/release/8.0.1xx-to-release/8.0.3xx release/8.0.3xx
git pull [email protected]:dotnet-maestro-bot/core-sdk merge/release/8.0.1xx-to-release/8.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/core-sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

dotnet-bot and others added 30 commits February 7, 2024 02:53
…otnet-sdk build 20240215.23

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.127-servicing.24070.10 -> To Version 6.0.128-servicing.24115.23
…otnet-sdk build 20240215.60

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24115.23 -> To Version 6.0.128-servicing.24115.60
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.NETCore.Platforms,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,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.27 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk
…otnet-sdk build 20240216.13

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.127-servicing.24070.10 -> To Version 6.0.128-servicing.24116.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.NETCore.Platforms,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,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.27 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240216.13
- **Date Produced**: February 16, 2024 7:24:15 PM UTC
- **Commit**: 3d2fdd69fe83f91252d48f4c4555e93c8a3da2f3
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.127-servicing.24070.10 to 6.0.128-servicing.24116.13][3]
  - **Microsoft.NET.Sdk**: [from 6.0.127-servicing.24070.10 to 6.0.128-servicing.24116.13][3]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.27 to 6.0.28][4]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.27-servicing.24070.4 to 6.0.28-servicing.24114.9][4]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.27-servicing.24070.4 to 6.0.28-servicing.24114.9][4]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.27 to 6.0.28][5]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.27-servicing.24069.12 to 6.0.28-servicing.24114.25][5]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.27 to 6.0.28][5]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.27 to 6.0.28][5]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.27 to 6.0.28][5]
  - **Microsoft.NETCore.Platforms**: [from 6.0.11 to 6.0.12][6]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.27 to 6.0.28][7]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.27-servicing.24070.2 to 6.0.28-servicing.24115.9][7]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.27 to 6.0.28][7]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.27-servicing.24070.2 to 6.0.28-servicing.24115.9][7]
  - **dotnet-dev-certs**: [from 6.0.27-servicing.24070.2 to 6.0.28-servicing.24115.9][7]
  - **dotnet-user-secrets**: [from 6.0.27-servicing.24070.2 to 6.0.28-servicing.24115.9][7]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.127 to 6.0.128][8]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.127-servicing.24070.3 to 6.0.128-servicing.24115.12][8]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.127 to 6.0.128][8]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.27 to 6.0.28][4]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.27 to 6.0.28][4]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.27-servicing.24069.12 to 6.0.28-servicing.24114.25][5]
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.27 to 6.0.28][9]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC77fc6a3fac5d8d43a71b9379320c0b12012966a1&targetVersion=GC3d2fdd69fe83f91252d48f4c4555e93c8a3da2f3&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC752aa75c68aad44ea864a65c034e2...
…otnet-sdk build 20240216.42

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24116.13 -> To Version 6.0.128-servicing.24116.42
…dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240216.42
- **Date Produced**: February 16, 2024 9:57:19 PM UTC
- **Commit**: b586613902b7b48fe61e95b88945dbce6364b2ee
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24116.13 to 6.0.128-servicing.24116.42][1]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24116.13 to 6.0.128-servicing.24116.42][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
…otnet-sdk build 20240216.57

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24116.42 -> To Version 6.0.128-servicing.24116.57

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.128 -> To Version 6.0.128 (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.128 to 6.0.128 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.128-servicing.24115.12 to 6.0.128-servicing.24116.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.128 to 6.0.128 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240216.57
- **Date Produced**: February 16, 2024 10:56:59 PM UTC
- **Commit**: 76eba53559e42ea62eb34774d5e8ab8d8cb80126
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24116.42 to 6.0.128-servicing.24116.57][1]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24116.42 to 6.0.128-servicing.24116.57][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.128 to 6.0.128][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.128-servicing.24115.12 to 6.0.128-servicing.24116.9][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.128 to 6.0.128][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb586613902b7b48fe61e95b88945dbce6364b2ee&targetVersion=GC76eba53559e42ea62eb34774d5e8ab8d8cb80126&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC77647a9d2c090a0cf1cd52198c7e9229aef9577d&targetVersion=GC1915ecefdb10121a923bab067bbd62eb95f74518&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
…otnet-sdk build 20240216.66

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24116.57 -> To Version 6.0.128-servicing.24116.66
…otnet-sdk build 20240216.79

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24116.66 -> To Version 6.0.128-servicing.24116.79
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240216.79
- **Date Produced**: February 17, 2024 12:23:51 AM UTC
- **Commit**: aab9de8cf9fed3b7be4743a1e7e751314b493dda
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24116.66 to 6.0.128-servicing.24116.79][2]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24116.66 to 6.0.128-servicing.24116.79][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC599e8daecb7dd5982544db3af52e9c51b19cdd53&targetVersion=GCaab9de8cf9fed3b7be4743a1e7e751314b493dda&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

[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.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.28-servicing.24114.9 to 6.0.28-servicing.24116.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.28-servicing.24114.9 to 6.0.28-servicing.24116.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.28-servicing.24115.9 to 6.0.28-servicing.24116.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.28-servicing.24115.9 to 6.0.28-servicing.24116.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.28-servicing.24115.9 to 6.0.28-servicing.24116.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.28-servicing.24115.9 to 6.0.28-servicing.24116.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24070.1 to 6.0.28-servicing.24115.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24070.3 to 6.0.28-servic...
…otnet-sdk build 20240216.92

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24116.79 -> To Version 6.0.128-servicing.24116.92

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.28 -> To Version 6.0.28 (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.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.28-servicing.24116.10 to 6.0.28-servicing.24116.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.28-servicing.24116.10 to 6.0.28-servicing.24116.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.28-servicing.24115.14 to 6.0.28-servicing.24116.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.28-servicing.24116.8 to 6.0.28-servicing.24116.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240216.92
- **Date Produced**: February 17, 2024 1:13:23 AM UTC
- **Commit**: 53e79424493ed524a2888422f02798633a5cd0a0
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24116.79 to 6.0.128-servicing.24116.92][1]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24116.79 to 6.0.128-servicing.24116.92][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.28 to 6.0.28][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.28-servicing.24116.10 to 6.0.28-servicing.24116.13][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.28-servicing.24116.10 to 6.0.28-servicing.24116.13][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.28-servicing.24115.14 to 6.0.28-servicing.24116.7][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.28-servicing.24116.8 to 6.0.28-servicing.24116.14][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCaab9de8cf9fed3b7be4743a1e7e751314b493dda&targ...
…otnet-sdk build 20240220.16

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24116.92 -> To Version 6.0.128-servicing.24120.16

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.NETCore.Platforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.28 -> To Version 6.0.28 (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.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.28-servicing.24114.25 to 6.0.28-servicing.24120.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.28-servicing.24114.25 to 6.0.28-servicing.24120.7 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240220.16
- **Date Produced**: February 21, 2024 1:45:26 AM UTC
- **Commit**: 0e9d132598392f91bf9047d4d8b4e37b979fe3b2
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24116.92 to 6.0.128-servicing.24120.16][1]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24116.92 to 6.0.128-servicing.24120.16][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.28 to 6.0.28][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.28-servicing.24114.25 to 6.0.28-servicing.24120.7][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.12 to 6.0.12][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.28-servicing.24114.25 to 6.0.28-servicing.24120.7][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC53e79424493ed524a2888422f02798633a5cd0a0&targetVersion=GC0e9d132598392f91bf9047d4d8b4e37b979fe3b2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2b3cfc799de1c1e629f2194b67e1dbd610ea51c9&targetVersion=GC34a109148c7d8a2c8e6431e83e4bce5712dd8083&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68...
…otnet-sdk build 20240220.25

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24120.16 -> To Version 6.0.128-servicing.24120.25

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,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.28 -> To Version 6.0.28 (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.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.128 to 6.0.128 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.128-servicing.24116.9 to 6.0.128-servicing.24120.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.128 to 6.0.128 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240220.25
- **Date Produced**: February 21, 2024 4:53:45 AM UTC
- **Commit**: ca9da549d26abef31e0f41cb5f1c4598f90571da
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24120.16 to 6.0.128-servicing.24120.25][1]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24120.16 to 6.0.128-servicing.24120.25][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5][2]
  - **dotnet-dev-certs**: [from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5][2]
  - **dotnet-user-secrets**: [from 6.0.28-servicing.24116.17 to 6.0.28-servicing.24120.5][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.128 to 6.0.128][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.128-servicing.24116.9 to 6.0.128-servicing.24120.4][3]
  -...
…otnet-sdk build 20240220.32

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24120.25 -> To Version 6.0.128-servicing.24120.32

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.28 -> To Version 6.0.28 (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.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.28-servicing.24116.7 to 6.0.28-servicing.24120.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.28-servicing.24116.14 to 6.0.28-servicing.24120.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240220.32
- **Date Produced**: February 21, 2024 7:36:05 AM UTC
- **Commit**: 1adb0ada3366f315e32a2b6c80971aafda533569
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24120.25 to 6.0.128-servicing.24120.32][1]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24120.25 to 6.0.128-servicing.24120.32][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.28 to 6.0.28][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.28-servicing.24116.7 to 6.0.28-servicing.24120.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.28-servicing.24116.14 to 6.0.28-servicing.24120.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca9da549d26abef31e0f41cb5f1c4598f90571da&targetVers...
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
ellahathaway and others added 21 commits April 24, 2024 11:25
…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 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be
- **Build**: 20240424.15
- **Date Produced**: April 24, 2024 9:30:46 PM UTC
- **Commit**: ecfb8a05aeaa93057ae0003d406280239b2c4c7b
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.105 to 8.0.105][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.105-servicing.24219.15 to 8.0.105-servicing.24224.15][1]
  - **Microsoft.NET.Sdk**: [from 8.0.105-servicing.24219.15 to 8.0.105-servicing.24224.15][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.105-servicing.24219.15 to 8.0.105-servicing.24224.15][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.5 to 8.0.5][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.5 to 8.0.5][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **dotnet-dev-certs**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **dotnet-user-jwts**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **dotnet-user-secrets**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbf69dc17dad41cb9e4963b397f721913899788ce&targetVersion=GCecfb8a05aeaa93057ae0003d406280...
Remove the 7.0 templates
…nals build 20240506.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24216.1 -> To Version 8.0.0-alpha.1.24256.1
…nce-packages (dotnet#19701)

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
…ence-packages build 20240507.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24257.2
…nals build 20240513.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24263.1
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/8.0.1xx-to-release/8.0.3xx branch from 8b900cf to 54c07c8 Compare May 14, 2024 18:55
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner May 14, 2024 18:55
@v-wuzhai v-wuzhai force-pushed the merge/release/8.0.1xx-to-release/8.0.3xx branch from 9e18a09 to 19ef920 Compare May 15, 2024 06:18
@v-wuzhai v-wuzhai requested a review from marcpopMSFT May 15, 2024 09:49
@marcpopMSFT marcpopMSFT merged commit 759f081 into dotnet:release/8.0.3xx May 15, 2024
15 checks passed
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.

None yet