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

Merging internal commits for release/6.0.4xx #20236

Conversation

vseanreesermsft
Copy link

No description provided.

Mirroring and others added 9 commits October 3, 2024 16:36
…otnet-sdk build 20241017.40

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.427-servicing.24468.28 -> To Version 6.0.428-servicing.24517.40

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.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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.35 -> To Version 6.0.36 (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.36 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.35-servicing.24463.5 to 6.0.36-servicing.24517.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.35-servicing.24463.5 to 6.0.36-servicing.24517.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.35-servicing.24459.18 to 6.0.36-servicing.24514.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.427 to 6.0.427 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.427-rtm.24466.3 to 6.0.427-rtm.24515.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.427 to 6.0.427 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.35-servicing.24462.9 to 6.0.36-servicing.24515.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.36 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Micr...
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Update to the 6.0.36 emsdk build

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update

#### PR Summary
This pull request updates the Emscripten SDK to version 6.0.36 and modifies related package configurations.
- `NuGet.config`: Updated package sources for `dotnet-emsdk` and added new sources for `dotnet-windowsdesktop`.
- `eng/Version.Details.xml`: Updated the version and SHA for `Microsoft.NET.Workload.Emscripten.Manifest-6.0.400`.
- `eng/Versions.props`: Updated the `MicrosoftNETWorkloadEmscriptenManifest60400Version` to 6.0.36.
@marcpopMSFT marcpopMSFT merged commit bcd05d3 into dotnet:release/6.0.4xx Nov 12, 2024
28 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.

4 participants