Merged PR 29135: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) [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**: 20230124.8 - **Date Produced**: January 24, 2023 3:53:30 PM UTC - **Commit**: 3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23073.4 to 6.0.406-servicing.23074.8][1] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23073.4 to 6.0.406-servicing.23074.8][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0efeb6c&targetVersion=GC3caaeaa&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
This commit is contained in:
DotNet Bot
Matt Mitchell
parent
faa22bb359
commit
c165970f9f
3 changed files with 18 additions and 18 deletions
|
|
@ -14,7 +14,7 @@
|
|||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-51b4c94" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-51b4c949/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-3808dc6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-3808dc64/nuget/v3/index.json" />
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
<add key="darc-int-dotnet-aspnetcore-a1bfef7" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-51b4c94" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-2a90daa" value="true" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-3808dc6" value="true" />
|
||||
|
|
|
|||
|
|
@ -17,30 +17,30 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>1312fabe6644dfaf40da8052d8960291e688dd86</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23070.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23073.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>51b4c949feae0e7d5980ac6b3c52ed68628be4c1</Sha>
|
||||
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>51b4c949feae0e7d5980ac6b3c52ed68628be4c1</Sha>
|
||||
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.14-servicing.23070.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.14-servicing.23073.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>51b4c949feae0e7d5980ac6b3c52ed68628be4c1</Sha>
|
||||
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>51b4c949feae0e7d5980ac6b3c52ed68628be4c1</Sha>
|
||||
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>51b4c949feae0e7d5980ac6b3c52ed68628be4c1</Sha>
|
||||
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>51b4c949feae0e7d5980ac6b3c52ed68628be4c1</Sha>
|
||||
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</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>3808dc647c961aec9812a18f6454fd33f7cb4a8c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.406-servicing.23073.4">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.406-servicing.23074.8">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3</Sha>
|
||||
<Sha>3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.406-servicing.23073.4">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.406-servicing.23074.8">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>0efeb6cfaf25a60ad8d8e6c2166e92d02bb7b0f3</Sha>
|
||||
<Sha>3caaeaa4e49b63fec1c1c98c6ef0807c0109cd24</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.14-servicing.23070.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.406-servicing.23073.4</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.406-servicing.23073.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.406-servicing.23074.8</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.406-servicing.23074.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -68,8 +68,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23070.4</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.14-servicing.23070.4</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23073.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.14-servicing.23073.9</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.14</MicrosoftNETCoreAppRefPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue