Merged PR 39857: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240520.83 - **Date Produced**: May 21, 2024 4:01:05 AM UTC - **Commit**: 3ee879352ffa2785a4f7c558ae1752bf31c6a4de - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.424-servicing.24270.56 to 6.0.424-servicing.24270.83][4] - **Microsoft.NET.Sdk**: [from 6.0.424-servicing.24270.56 to 6.0.424-servicing.24270.83][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.32 to 6.0.32][5] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20][5] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][5] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.32 to 6.0.32][5] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.32 to 6.0.32][5] - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22553.1 to 6.0.200-1.24270.5][6] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20][5] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.32 to 6.0.32][7] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb23363eddcd40603106acf6055795f08d71d4adc&targetVersion=GC3ee879352ffa2785a4f7c558ae1752bf31c6a4de&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCabb709d623326fec5088c154377059f646653af0&targetVersion=GCa1d71935158bdc68901bd014feca5fb68c43fb7c&_a=files [6]:4be765525a...e66cbcaa36[7]:14534e389c...5a2faf37a4[DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) [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.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk) - **Microsof...
This commit is contained in:
DotNet Bot
Sean Reeser
commit
b0a068efff
3 changed files with 22 additions and 22 deletions
|
|
@ -10,13 +10,13 @@
|
|||
<add key="darc-int-dotnet-aspnetcore-9947b50" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-9947b508/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-14534e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-14534e38/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-5a2faf3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a2faf37/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-abb709d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-abb709d6/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-a1d7193" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a1d71935/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-9cf8f1e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9cf8f1e9/nuget/v3/index.json" />
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<add key="darc-int-dotnet-aspnetcore-9947b50" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-abb709d" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-a1d7193" value="true" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-9cf8f1e" value="true" />
|
||||
|
|
|
|||
|
|
@ -17,30 +17,30 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>32e0f9e1f2709e665f70c6ab04af0db13fe282b8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24267.29" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24270.20" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>abb709d623326fec5088c154377059f646653af0</Sha>
|
||||
<Sha>a1d71935158bdc68901bd014feca5fb68c43fb7c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.32" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>abb709d623326fec5088c154377059f646653af0</Sha>
|
||||
<Sha>a1d71935158bdc68901bd014feca5fb68c43fb7c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.32-servicing.24267.29" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.32-servicing.24270.20" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>abb709d623326fec5088c154377059f646653af0</Sha>
|
||||
<Sha>a1d71935158bdc68901bd014feca5fb68c43fb7c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.32" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>abb709d623326fec5088c154377059f646653af0</Sha>
|
||||
<Sha>a1d71935158bdc68901bd014feca5fb68c43fb7c</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.32" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>abb709d623326fec5088c154377059f646653af0</Sha>
|
||||
<Sha>a1d71935158bdc68901bd014feca5fb68c43fb7c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.32" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>abb709d623326fec5088c154377059f646653af0</Sha>
|
||||
<Sha>a1d71935158bdc68901bd014feca5fb68c43fb7c</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>9cf8f1e9c0038587fa55099867a453f265cb6273</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24270.56">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24270.83">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>b23363eddcd40603106acf6055795f08d71d4adc</Sha>
|
||||
<Sha>3ee879352ffa2785a4f7c558ae1752bf31c6a4de</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24270.56">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24270.83">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>b23363eddcd40603106acf6055795f08d71d4adc</Sha>
|
||||
<Sha>3ee879352ffa2785a4f7c558ae1752bf31c6a4de</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.32-servicing.24269.17" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -135,9 +135,9 @@
|
|||
<Sha>6e76d580fcc69954441344175bd1b0ab2e432026</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22553.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.24270.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
<Sha>4be765525a1b45d28ab69a48f92e008b70a4e56e</Sha>
|
||||
<Sha>e66cbcaa36aa719936a46160198c9012c6e174e4</Sha>
|
||||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.32" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>14534e389c9ec9a70b77eea006909f6e75df4102</Sha>
|
||||
<Sha>5a2faf37a44cf9ec7d58ef5cf8e7e9420ea04615</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>
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24270.56</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24270.56</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24270.83</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24270.83</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.32-servicing.24267.29</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.32-servicing.24267.29</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.32-servicing.24270.20</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.32-servicing.24270.20</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.32</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.32</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.32</MicrosoftNETCoreAppRefPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue