Merged PR 39652: [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.DotNet.Common.ItemTemplates**: from 6.0.131 to 6.0.131 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.131-servicing.24264.5 to 6.0.131-servicing.24266.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.131 to 6.0.131 (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.29
- **Date Produced**: May 16, 2024 10:05:57 PM UTC
- **Commit**: 7eb68c9713c5bb53a4a717528c2f5db44fa624ad
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.131-servicing.24266.20 to 6.0.131-servicing.24266.29][1]
  - **Microsoft.NET.Sdk**: [from 6.0.131-servicing.24266.20 to 6.0.131-servicing.24266.29][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.131 to 6.0.131][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.131-servicing.24264.5 to 6.0.131-servicing.24266.1][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.131 to 6.0.131][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC342fed4b909c4ed513c68af8af525896aa168a7e&targetVersion=GC7eb68c9713c5bb53a4a717528c2f5db44fa624ad&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC2cf8da01f203e5bdf79575c0e405788f768f2d9d&targetVersion=GCc7c6fde67334f361b037c70327b9add0d370b87c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
DotNet Bot 2024-05-17 20:37:44 +00:00 committed by Sean Reeser
commit 5854214bf8
3 changed files with 12 additions and 12 deletions

View file

@ -18,7 +18,7 @@
<add key="darc-int-dotnet-runtime-62ae1c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-62ae1c7e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-2cf8da0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2cf8da01/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-c7c6fde" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c7c6fde6/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311/nuget/v3/index.json" />
@ -53,7 +53,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-62ae1c7" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-2cf8da0" value="true" />
<add key="darc-int-dotnet-templating-c7c6fde" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="true" />

View file

@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.131" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>2cf8da01f203e5bdf79575c0e405788f768f2d9d</Sha>
<Sha>c7c6fde67334f361b037c70327b9add0d370b87c</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.131-servicing.24264.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.131-servicing.24266.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>2cf8da01f203e5bdf79575c0e405788f768f2d9d</Sha>
<Sha>c7c6fde67334f361b037c70327b9add0d370b87c</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.131" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>2cf8da01f203e5bdf79575c0e405788f768f2d9d</Sha>
<Sha>c7c6fde67334f361b037c70327b9add0d370b87c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.131-servicing.24266.20">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.131-servicing.24266.29">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>342fed4b909c4ed513c68af8af525896aa168a7e</Sha>
<Sha>7eb68c9713c5bb53a4a717528c2f5db44fa624ad</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.131-servicing.24266.20">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.131-servicing.24266.29">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>342fed4b909c4ed513c68af8af525896aa168a7e</Sha>
<Sha>7eb68c9713c5bb53a4a717528c2f5db44fa624ad</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.30-servicing.24216.19" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

@ -55,8 +55,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.131-servicing.24266.20</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.131-servicing.24266.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.131-servicing.24266.29</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.131-servicing.24266.29</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>