Merged PR 39646: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.31 to 6.0.31 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.31 to 6.0.31 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240516.20 - **Date Produced**: May 16, 2024 9:03:18 PM UTC - **Commit**: 342fed4b909c4ed513c68af8af525896aa168a7e - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.131-servicing.24266.13 to 6.0.131-servicing.24266.20][1] - **Microsoft.NET.Sdk**: [from 6.0.131-servicing.24266.13 to 6.0.131-servicing.24266.20][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.31 to 6.0.31][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.31 to 6.0.31][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4][2] - **dotnet-dev-certs**: [from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4][2] - **dotnet-user-secrets**: [from 6.0.31-servicing.24264.8 to 6.0.31-servicing.24266.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC15f9921579663c4a5ea448226549fb773786a81c&targetVersion=GC342fed4b909c4ed513c68af8af525896aa168a7e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC5a497cd2299423cfe8be2be3a116d3effc39725d&targetVersion=GC929d26b875576909aad373373c983c63c65234c0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
DotNet Bot
Sean Reeser
commit
3453bde319
3 changed files with 22 additions and 22 deletions
|
|
@ -7,7 +7,7 @@
|
||||||
<clear />
|
<clear />
|
||||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||||
<add key="darc-int-dotnet-aspnetcore-5a497cd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-5a497cd2/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-aspnetcore-929d26b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-929d26b8/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||||
<!-- End: Package sources from dotnet-emsdk -->
|
<!-- End: Package sources from dotnet-emsdk -->
|
||||||
|
|
@ -46,7 +46,7 @@
|
||||||
<disabledPackageSources>
|
<disabledPackageSources>
|
||||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||||
<add key="darc-int-dotnet-aspnetcore-5a497cd" value="true" />
|
<add key="darc-int-dotnet-aspnetcore-929d26b" value="true" />
|
||||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||||
|
|
|
||||||
|
|
@ -54,28 +54,28 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||||
<Sha>5a497cd2299423cfe8be2be3a116d3effc39725d</Sha>
|
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.31-servicing.24264.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||||
<Sha>5a497cd2299423cfe8be2be3a116d3effc39725d</Sha>
|
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||||
<Sha>5a497cd2299423cfe8be2be3a116d3effc39725d</Sha>
|
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
|
||||||
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
|
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.31-servicing.24264.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||||
<Sha>5a497cd2299423cfe8be2be3a116d3effc39725d</Sha>
|
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="dotnet-dev-certs" Version="6.0.31-servicing.24264.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="dotnet-dev-certs" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||||
<Sha>5a497cd2299423cfe8be2be3a116d3effc39725d</Sha>
|
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="dotnet-user-secrets" Version="6.0.31-servicing.24264.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="dotnet-user-secrets" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||||
<Sha>5a497cd2299423cfe8be2be3a116d3effc39725d</Sha>
|
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
|
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
|
||||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||||
|
|
@ -103,14 +103,14 @@
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||||
<Sha>2cf8da01f203e5bdf79575c0e405788f768f2d9d</Sha>
|
<Sha>2cf8da01f203e5bdf79575c0e405788f768f2d9d</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.131-servicing.24266.13">
|
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.131-servicing.24266.20">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>15f9921579663c4a5ea448226549fb773786a81c</Sha>
|
<Sha>342fed4b909c4ed513c68af8af525896aa168a7e</Sha>
|
||||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.131-servicing.24266.13">
|
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.131-servicing.24266.20">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>15f9921579663c4a5ea448226549fb773786a81c</Sha>
|
<Sha>342fed4b909c4ed513c68af8af525896aa168a7e</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
<!-- 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.30-servicing.24216.19" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.30-servicing.24216.19" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||||
|
|
|
||||||
|
|
@ -45,18 +45,18 @@
|
||||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.31</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.31</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||||
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.31</MicrosoftAspNetCoreAppRefPackageVersion>
|
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.31</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.31-servicing.24264.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.31-servicing.24266.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||||
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.31-servicing.24264.8</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
|
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.31-servicing.24266.4</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
|
||||||
<dotnetdevcertsPackageVersion>6.0.31-servicing.24264.8</dotnetdevcertsPackageVersion>
|
<dotnetdevcertsPackageVersion>6.0.31-servicing.24266.4</dotnetdevcertsPackageVersion>
|
||||||
<dotnetusersecretsPackageVersion>6.0.31-servicing.24264.8</dotnetusersecretsPackageVersion>
|
<dotnetusersecretsPackageVersion>6.0.31-servicing.24266.4</dotnetusersecretsPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||||
<MicrosoftNETSdkPackageVersion>6.0.131-servicing.24266.13</MicrosoftNETSdkPackageVersion>
|
<MicrosoftNETSdkPackageVersion>6.0.131-servicing.24266.20</MicrosoftNETSdkPackageVersion>
|
||||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.131-servicing.24266.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.131-servicing.24266.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue