Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Open
wants to merge 31 commits into
base: release/8.0.3xx
Choose a base branch
from

Conversation

github-actions[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:

  • 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.

Mirroring and others added 30 commits October 2, 2024 22:06
…otnet-sdk build 20241017.19

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

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.Platforms,Microsoft.Net.Compilers.Toolset
 From Version 8.0.10-servicing.24466.10 -> To Version 8.0.10-servicing.24474.4 (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.10-servicing.24466.10 to 8.0.10-servicing.24474.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.8.0-7.24468.9 to 4.8.0-7.24514.16 (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**: 20241017.19
- **Date Produced**: October 17, 2024 6:42:47 PM UTC
- **Commit**: d3aaf791c99e383d77b011cfb94089c3de0fb782
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.110 to 8.0.111][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.110-servicing.24469.18 to 8.0.111-servicing.24517.19][1]
  - **Microsoft.NET.Sdk**: [from 8.0.110-servicing.24469.18 to 8.0.111-servicing.24517.19][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.110-servicing.24469.18 to 8.0.111-servicing.24517.19][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.4][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.4][2]
  - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.4][2]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.8.0-7.24468.9 to 4.8.0-7.24514.16][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd90806d013db39755cda355f42015d6a248456f5&targetVersion=GCd3aaf791c99e383d77b011cfb94089c3de0fb782&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files
[3]: dotnet/roslyn@def8864...4ff6449

[DependencyUpdate]: <> (End)

[marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
…otnet-sdk build 20241021.9

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

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.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.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,Microsoft.NET.ILLink.Tasks
 From Version 8.0.10 -> To Version 8.0.11 (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.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.10-servicing.24468.5 to 8.0.11-servicing.24518.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.10-servicing.24468.5 to 8.0.11-servicing.24518.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24521.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24521.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24521.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24521.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24521.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.10-servicing.24468.3 to 8.0.11-servicing.24518.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.10 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.10-servicing.24468.10 to 8.0.11-servicing.24518.4 (parent: Micr...
…otnet-sdk build 20241021.41

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

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.11 (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.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.11-servicing.24518.5 to 8.0.11-servicing.24521.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.11-servicing.24518.5 to 8.0.11-servicing.24521.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.11 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.11 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.11-servicing.24518.1 to 8.0.11-servicing.24521.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.11 to 8.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.11-servicing.24518.4 to 8.0.11-servicing.24521.7 (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**: 20241021.41
- **Date Produced**: October 22, 2024 4:39:54 PM UTC
- **Commit**: f3835a7fb45497f53fc92ca7dd4a06793884b1cd
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.111 to 8.0.111][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.111-servicing.24521.9 to 8.0.111-servicing.24521.41][1]
  - **Microsoft.NET.Sdk**: [from 8.0.111-servicing.24521.9 ...
Update emsdk to 8.0.11

This fixes the source-build issue - most tests failing, meaning the product is broken without this fix.

Internal validation of this change was successful: https://dev.azure.com/dnceng/internal/_build/results?buildId=2566927&view=results

----
#### AI description  (iteration 1)
#### PR Classification
Version update.

#### PR Summary
This pull request updates the Emscripten SDK to version 8.0.11.

- `eng/Version.Details.xml`: Updated Emscripten SDK version and corresponding SHA values.
- `eng/Versions.props`: Updated Emscripten SDK version reference.
@v-wuzhai v-wuzhai requested a review from a team November 13, 2024 08:22
@v-wuzhai
Copy link
Member

@dotnet/source-build Could you take a look at the failures here?

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants