Merged PR 38998: [internal/release/6.0.4xx] Update dependencies from 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.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.3.2 to 17.3.4 (parent: Microsoft.NET.Sdk)
  - **NuGet.Build.Tasks**: from 6.3.4-rc.2 to 6.3.4-rc.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.29 to 6.0.30 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240416.41
- **Date Produced**: April 16, 2024 11:22:37 PM UTC
- **Commit**: 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1]
  - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.30][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.29 to 6.0.30][2]
  - **Microsoft.Build**: [from 17.3.2 to 17.3.4][3]
  - **NuGet.Build.Tasks**: [from 6.3.4-rc.2 to 6.3.4-rc.2][4]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.29 to 6.0.30][5]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe35ea4...
This commit is contained in:
DotNet Bot 2024-04-17 18:38:34 +00:00 committed by Sean Reeser
parent 16c903fd57
commit 9514c83bfb
3 changed files with 36 additions and 53 deletions

View file

@ -7,28 +7,19 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c83354d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c83354d4/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c83354d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c83354d4-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c83354d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c83354d4-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-5a6205a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a6205aa/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-5a6205a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a6205aa-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-5a6205a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a6205aa-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-3b28b2c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3b28b2c8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-9ebb8d1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9ebb8d1d/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-9ebb8d1-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9ebb8d1d-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-9ebb8d1-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9ebb8d1d-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-75c9b26" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-75c9b26-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-75c9b26-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -49,21 +40,13 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c83354d-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-c83354d-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-c83354d" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-9ebb8d1-1" value="true" />
<add key="darc-int-dotnet-templating-9ebb8d1-2" value="true" />
<add key="darc-int-dotnet-templating-9ebb8d1" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-75c9b26-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-75c9b26-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-75c9b26" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->

View file

@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.29-servicing.24171.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.30" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.29-servicing.24171.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.30" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.30" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.30" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>9ebb8d1d13e5672c54d1682cdc82eb5f474b9586</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.421-servicing.24172.16">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.422-servicing.24216.41">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>e35ea426ec2ee54f57501b661ec7d656caf480d6</Sha>
<Sha>2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.421-servicing.24172.16">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.422-servicing.24216.41">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>e35ea426ec2ee54f57501b661ec7d656caf480d6</Sha>
<Sha>2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.29-servicing.24171.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -146,14 +146,14 @@
<Sha>41a5af9d2c459a06c0795bf21a1c046200f375bf</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.3.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
<Sha>561848881bab01749e6d8b03be2869a18ca944f7</Sha>
<Dependency Name="Microsoft.Build" Version="17.3.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>a400405ba8c43976eda92a70d4adf72f9d292a22</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.3.4-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
<Sha>5e444458a8c4a2dac9806fc1d387b7f157669540</Sha>
<Sha>5ec7c4dd0086f968a8bc5a20d5cc77b1454469f3</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@ -166,9 +166,9 @@
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.29" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.30" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
<Sha>3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/source-build</Uri>

View file

@ -55,8 +55,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.421-servicing.24172.16</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.421-servicing.24172.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.422-servicing.24216.41</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.422-servicing.24216.41</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -67,12 +67,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.29-servicing.24171.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.29-servicing.24171.5</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.29</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.29</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.29</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.29</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.30-servicing.24215.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.30-servicing.24215.25</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.30</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.30</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.30</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.30</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
@ -97,7 +97,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/msbuild -->
<MicrosoftBuildPackageVersion>17.3.2</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.3.4</MicrosoftBuildPackageVersion>
</PropertyGroup>
<PropertyGroup>
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
@ -155,7 +155,7 @@
<XamarinMacOSWorkloadManifestVersion>12.3.303</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>15.4.303</XamarinTvOSWorkloadManifestVersion>
<MonoWorkloadManifestVersion>6.0.5</MonoWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.29</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.30</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60400Version)</EmscriptenWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup>