Skip to content

Merging internal commits for release/8.0.3xx#20358

Merged
edvilme merged 17 commits into
dotnet:release/8.0.3xxfrom
vseanreesermsft:internal-merge-8.0.3xx-2025-03-11-1242
Mar 11, 2025
Merged

Merging internal commits for release/8.0.3xx#20358
edvilme merged 17 commits into
dotnet:release/8.0.3xxfrom
vseanreesermsft:internal-merge-8.0.3xx-2025-03-11-1242

Conversation

@vseanreesermsft

Copy link
Copy Markdown

No description provided.

vseanreesermsft and others added 17 commits February 4, 2025 19:47
…ml - revert coherent parent dependency for emsdk

Updated Version.Details.xml - revert coherent parent dependency for emsdk

Reverts cpd change from !46979

----
#### AI description  (iteration 1)
#### PR Classification
Revert coherent parent dependency for emsdk.

#### PR Summary
This pull request reverts the coherent parent dependency for emsdk in the `Version.Details.xml` file.
- `eng/Version.Details.xml`: Removed `CoherentParentDependency` attribute for `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100` and `Microsoft.SourceBuild.Intermediate.emsdk`.
…otnet-sdk build 20250210.23

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

Dependency coherency updates

Microsoft.Build,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 17.10.14 -> To Version 17.10.19 (parent: Microsoft.NET.Sdk
…otnet-sdk build 20250213.24

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

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.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,Microsoft.Build,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.13 -> To Version 8.0.14 (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.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.13-servicing.25067.2 to 8.0.14-servicing.25113.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.13-servicing.25067.2 to 8.0.14-servicing.25113.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 8.0.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.13-servicing.25066.10 to 8.0.14-servicing.25112.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.13-servicing.25066.10 to 8.0.14-servicing.25112.21 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.13-servicing.25066.10 to 8.0.14-servicing.25112.21 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.13-servicing.25066.10 to 8.0.14-servicing.25112.21 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.13-servicing.25066.10 to 8.0.14-servicing.25112.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.13-servicing.25066.3 to 8.0.14-servicing.25112.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.13 to 8.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.13-servicing.25066.5 to 8.0.14-servicing.25113.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.NET.ILLink.Tasks**: from 8.0.13 to 8.0.14 (parent: Microsof...
Microsoft.Build.17.10.21
Microsoft.Build.Framework.17.10.21
Microsoft.Build.Utilities.Core.17.10.21
Microsoft.NET.StringTools.17.10.21
Updated SourceBuildPrebuiltBaseline.xml -
Microsoft.Build.17.10.21
Microsoft.Build.Framework.17.10.21
Microsoft.Build.Utilities.Core.17.10.21
Microsoft.NET.StringTools.17.10.21

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

#### PR Summary
Updated the `SourceBuildPrebuiltBaseline.xml` to include new versions of specific packages.
- `SourceBuildPrebuiltBaseline.xml`: Added `Microsoft.Build*/17.10.21` and `Microsoft.NET.StringTools/17.10.21` to the allowed usage patterns.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
@edvilme edvilme merged commit ee95304 into dotnet:release/8.0.3xx Mar 11, 2025
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.

3 participants