Merged PR 39747: [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.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.24267.11 to 6.0.31-servicing.24267.21 (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.24267.11 to 6.0.31-servicing.24267.21 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.31-servicing.24267.11 to 6.0.31-servicing.24267.21 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.31-servicing.24267.11 to 6.0.31-servicing.24267.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.424 to 6.0.424 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.424-rtm.24267.26 to 6.0.424-rtm.24267.32 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.424 to 6.0.424 (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**: 20240518.4
- **Date Produced**: May 18, 2024 11:09:07 PM UTC
- **Commit**: 344674e5fd5e42b52abe8f4bed56342d15ff7c0e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.424-servicing.24267.78 to 6.0.424-servicing.24268.4][1]
  - **Microsoft.NET.Sdk**: [from 6.0.424-servicing.24267.78 to 6.0.424-servicing.24268.4][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.31 to 6.0.31][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.31-servicing.24267.11 to 6.0.31-servicing.24267.21][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.24267.11 to 6.0.31-servicing.24267.21][2]
  - **dotnet-dev-certs**: [from 6.0.31-servicing.24267.11 to 6.0.31-servicing.24267.21][2]
  - **dotnet-user-secrets**: [from 6.0.31-servicing.24267.11 to 6.0.31-servicing.24267.21][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.424 to 6.0.424][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.424-rtm.24267.26 to 6.0.424-rtm.24267.32][3]
  - **Microsoft.DotNet...
This commit is contained in:
DotNet Bot 2024-05-18 23:26:51 +00:00 committed by Sean Reeser
commit 66617f3b98
3 changed files with 28 additions and 28 deletions

View file

@ -7,7 +7,7 @@
<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-97a07eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-97a07eb6/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-3ee766d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3ee766d0/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" />
@ -19,7 +19,7 @@
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-4b74c65" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-4b74c656/nuget/v3/index.json" />
<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" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-732af8b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-732af8bb/nuget/v3/index.json" />
@ -43,13 +43,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-97a07eb" value="true" />
<add key="darc-int-dotnet-aspnetcore-3ee766d" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-abb709d" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-4b74c65" value="true" />
<add key="darc-int-dotnet-templating-9cf8f1e" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-732af8b" value="true" />

View file

@ -54,28 +54,28 @@
</Dependency>
<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>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
<Sha>3ee766d0b1b35a87e99083531ff098068045b6ae</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.31-servicing.24267.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
<Sha>3ee766d0b1b35a87e99083531ff098068045b6ae</Sha>
</Dependency>
<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>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
<Sha>3ee766d0b1b35a87e99083531ff098068045b6ae</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.31-servicing.24267.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
<Sha>3ee766d0b1b35a87e99083531ff098068045b6ae</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.31-servicing.24267.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
<Sha>3ee766d0b1b35a87e99083531ff098068045b6ae</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.31-servicing.24267.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
<Sha>3ee766d0b1b35a87e99083531ff098068045b6ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.424" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>4b74c656842f4e70599201b959d683025bf71a7e</Sha>
<Sha>9cf8f1e9c0038587fa55099867a453f265cb6273</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.424-rtm.24267.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.424-rtm.24267.32" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>4b74c656842f4e70599201b959d683025bf71a7e</Sha>
<Sha>9cf8f1e9c0038587fa55099867a453f265cb6273</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.424" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>4b74c656842f4e70599201b959d683025bf71a7e</Sha>
<Sha>9cf8f1e9c0038587fa55099867a453f265cb6273</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24267.78">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24268.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>c6ac680d25e36d9641f183d127f148eac1e11464</Sha>
<Sha>344674e5fd5e42b52abe8f4bed56342d15ff7c0e</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24267.78">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24268.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>c6ac680d25e36d9641f183d127f148eac1e11464</Sha>
<Sha>344674e5fd5e42b52abe8f4bed56342d15ff7c0e</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.31-servicing.24266.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

@ -45,18 +45,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.31</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.31</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.31-servicing.24267.11</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.31-servicing.24267.11</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.31-servicing.24267.11</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.31-servicing.24267.11</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.31-servicing.24267.21</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.31-servicing.24267.21</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.31-servicing.24267.21</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.31-servicing.24267.21</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24267.78</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24267.78</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24268.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24268.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>