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.3xx' => 'release/8.0.4xx' #20297

Merged
merged 16 commits into from
Jan 17, 2025

Conversation

github-actions[bot]
Copy link

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

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

  • marcpopMSFT
  • 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/8.0.3xx
git pull --ff-only
git checkout release/8.0.4xx
git pull --ff-only
git merge --no-ff release/8.0.3xx

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

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

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 16 commits December 4, 2024 18:25
…otnet-sdk build 20241203.15

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

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.Net.Compilers.Toolset,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.11-servicing.24517.7 -> To Version 8.0.12-servicing.24603.5 (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.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.10.0-3.24515.13 to 4.10.0-3.24574.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.11 to 8.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.emsdk**: from 8.0.11-servicing.24511.5 to 8.0.12-servicing.24569.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e
- **Build**: 20241203.15
- **Date Produced**: December 4, 2024 1:16:27 AM UTC
- **Commit**: c180688f2f7bb740d96700bc10be6300af68d6ce
- **Branch**: refs/heads/internal/release/8.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.307 to 8.0.308][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.307-servicing.24521.40 to 8.0.308-servicing.24603.15][1]
  - **Microsoft.NET.Sdk**: [from 8.0.307-servicing.24521.40 to 8.0.308-servicing.24603.15][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.307-servicing.24521.40 to 8.0.308-servicing.24603.15][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][2]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][2]
  - **VS.Redist.Common.NetCore.TargetingP...
…otnet-sdk build 20241204.16

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

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.11 -> To Version 8.0.12 (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.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.11-servicing.24521.5 to 8.0.12-servicing.24604.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.11-servicing.24521.5 to 8.0.12-servicing.24604.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.11-servicing.24521.3 to 8.0.12-servicing.24603.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.11-servicing.24521.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e
- **Build**: 20241204.16
- **Date Produced**: December 4, 2024 6:33:39 PM UTC
- **Commit**: 55a73a0e7f0c08bb832c2dceeb49287223efef1f
- **Branch**: refs/heads/internal/release/8.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.308 to 8.0.308][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.308-servicing.24603.15 to 8.0.308-servicing.24604.16][1]
  - **Microsoft.NET.Sdk**: [from 8.0.308-servicing.24...
Co-authored-by: maestro-prod-Primary <maestro-prod-Primary>
Co-authored-by: Mirroring <dnceng-mirroring@microsoft.com>
…into merge/release/8.0.1xx-to-release/8.0.3xx
…114.11

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11
…into merge/release/8.0.1xx-to-release/8.0.3xx
@v-wuzhai v-wuzhai force-pushed the merge/release/8.0.3xx-to-release/8.0.4xx branch from e12f1c2 to 7289027 Compare January 16, 2025 08:18
@v-wuzhai v-wuzhai merged commit b580b56 into release/8.0.4xx Jan 17, 2025
15 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/8.0.3xx-to-release/8.0.4xx branch January 17, 2025 02:14
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.

6 participants