Skip to content

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'#20399

Merged
v-wuzhai merged 17 commits into
release/8.0.3xxfrom
merge/release/8.0.1xx-to-release/8.0.3xx
Apr 9, 2025
Merged

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'#20399
v-wuzhai merged 17 commits into
release/8.0.3xxfrom
merge/release/8.0.1xx-to-release/8.0.3xx

Conversation

@github-actions

@github-actions github-actions Bot commented Apr 8, 2025

Copy link
Copy Markdown

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:

  • dotnet-sb-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/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/installer HEAD:merge/release/8.0.1xx-to-release/8.0.3xx
or if you are using SSH
git push git@github.com:dotnet/installer 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.
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/8.0.1xx-to-release/8.0.3xx origin/release/8.0.3xx
git pull https://github.com/dotnet/installer 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/installer HEAD:merge/release/8.0.1xx-to-release/8.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/8.0.1xx-to-release/8.0.3xx origin/release/8.0.3xx
git pull git@github.com:dotnet/installer merge/release/8.0.1xx-to-release/8.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/installer HEAD:merge/release/8.0.1xx-to-release/8.0.3xx

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.

dotnet-bot and others added 17 commits March 13, 2025 06:47
…otnet-sdk build 20250312.40

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.114 -> To Version 8.0.115

Dependency coherency updates

Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild
 From Version 17.8.19 -> To Version 17.8.22 (parent: Microsoft.NET.Sdk
…otnet-sdk build 20250313.5

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.114 -> To Version 8.0.115
…otnet-sdk build 20250313.21

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.114 -> To Version 8.0.115

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 8.0.14-servicing.25111.18 -> To Version 8.0.15-servicing.25162.16 (parent: Microsoft.NET.Sdk
…otnet-sdk build 20250313.46

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.114 -> To Version 8.0.115
…otnet-sdk build 20250315.5

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.114 -> To Version 8.0.115

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.14 -> To Version 8.0.15 (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**:
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.14 to 8.0.15 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.emsdk**: from 8.0.14-servicing.25105.1 to 8.0.15-servicing.25157.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[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**: [20250313.21](https://dev.azure.com/dnceng/internal/_build/results?buildId=2662498)
- **Date Produced**: March 13, 2025 5:19:27 PM UTC
- **Commit**: [67b9ecb00c3061cd99a8344b80ffae1f7b94a67a](https://dev.azure.com/dnceng/internal/_git/dotnet-sdk?_a=history&version=GC67b9ecb00c3061cd99a8344b80ffae1f7b94a67a)
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.114 to 8.0.115][4]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.114-servicing.25113.20 to 8.0.115-servicing.25163.21][4]
  - **Microsoft.NET.Sdk**: [from 8.0.114-servicing.25113.20 to 8.0.115-servicing.25163.21][4]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.114-servicing.25113.20 to 8.0.115-servicing.25163.21][4]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16][5]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.14 to 8.0.15][5]
 ...
…otnet-sdk build 20250315.14

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.115 -> To Version 8.0.115

Dependency coherency updates

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.115 -> To Version 8.0.115

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,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 8.0.15 -> To Version 8.0.15 (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 8.0.15 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.15-servicing.25164.1 to 8.0.15-servicing.25166.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.15-servicing.25164.1 to 8.0.15-servicing.25166.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.14-servicing.25112.21 to 8.0.15-servicing.25165.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.14 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.14-servicing.25112.21 to 8.0.15-servicing.25165.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.14-servicing.25112.21 to 8.0.15-servicing.25165.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.14-servicing.25112.21 to 8.0.15-servicing.25165.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.14-servicing.25112.21 to 8.0.15-servicing.25165.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.15 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.15 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: [20250317.9](https://dev.azure.com/dnceng/internal/_build/results?buildId=2665611)
- **Date Produced**: March 17, 2025 5:34:37 PM UTC
- **Commit**: [a71ec1cc679289737d87a326dbd3c953a995a42e](https://dev.azure.com/dnceng/internal/_git/dotnet-sdk?_a=history&version=GCa71ec1cc679289737d87a326dbd3c953a995a42e)
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.115 to 8.0.115][3]
  - **Microsoft.DotNet.MS...
…otnet-sdk build 20250318.23

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.115 -> To Version 8.0.115

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 8.0.15 -> To Version 8.0.15 (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 8.0.15 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.15-servicing.25166.1 to 8.0.15-servicing.25168.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.15-servicing.25166.1 to 8.0.15-servicing.25168.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.15 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.15 to 8.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.15-servicing.25165.2 to 8.0.15-servicing.25167.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: [20250318.23](https://dev.azure.com/dnceng/internal/_build/results?buildId=2666623)
- **Date Produced**: March 18, 2025 8:33:14 PM UTC
- **Commit**: [c041d5133475867fa838d4160e09d2d17221bba4](https://dev.azure.com/dnceng/internal/_git/dotnet-sdk?_a=history&version=GCc041d5133475867fa838d4160e09d2d17221bba4)
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.115 to 8.0.115][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.115-servicing.25167.9 to 8.0.115-servicing.25168.23][1]
  - **Microsoft.NET.Sdk**: [from 8.0.115-servicing.25167.9 to 8.0.115-servicing.25168.23][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.115-servicing.25167.9 to 8.0.115-servicing.25168.23][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.15 to 8.0.15][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.15-servicing.25166.1 to 8.0.15-servicing.25168.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.15-servicing.25166.1 to 8.0.15-servicing.25168.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.15 to 8.0.15][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.15 to 8.0.15][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 8.0.15-servicing.25165.2 to 8.0.15-servicing.25167.9][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa71ec1cc67928973...
[release/8.0.1xx] Update dependencies from dotnet/arcade
@v-wuzhai v-wuzhai merged commit 3c23493 into release/8.0.3xx Apr 9, 2025
@v-wuzhai v-wuzhai deleted the merge/release/8.0.1xx-to-release/8.0.3xx branch April 9, 2025 08:22
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.

5 participants