Merged PR 40350: [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.132 to 6.0.132 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.132-servicing.24270.9 to 6.0.132-servicing.24312.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.132 to 6.0.132 (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**: 20240612.23
- **Date Produced**: June 13, 2024 12:19:40 AM UTC
- **Commit**: 72c612743476ebd9dc615411535a8c8822d7fe88
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.132-servicing.24312.15 to 6.0.132-servicing.24312.23][1]
  - **Microsoft.NET.Sdk**: [from 6.0.132-servicing.24312.15 to 6.0.132-servicing.24312.23][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.132 to 6.0.132][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.132-servicing.24270.9 to 6.0.132-servicing.24312.8][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.132 to 6.0.132][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0c8fc8a49c4852edf68db34ff8e9c92fb081a3e6&targetVersion=GC72c612743476ebd9dc615411535a8c8822d7fe88&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCca4d7363e227ba79e7d9364a6338b3c734b58043&targetVersion=GC972c73d0942c7755163760369dc1333ecb667cb2&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
DotNet Bot 2024-06-13 20:53:22 +00:00 committed by Sean Reeser
commit d4fc928b37
3 changed files with 12 additions and 22 deletions

View file

@ -19,12 +19,7 @@
<add key="darc-int-dotnet-runtime-c1b0b27" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c1b0b279/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-ca4d736" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ca4d7363/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-ca4d736-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ca4d7363-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-ca4d736-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ca4d7363-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-ca4d736-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ca4d7363-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-ca4d736-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ca4d7363-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-ca4d736-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ca4d7363-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-972c73d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-972c73d0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-fd7dd9e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fd7dd9ef/nuget/v3/index.json" />
@ -60,12 +55,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-c1b0b27" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-ca4d736-1" value="true" />
<add key="darc-int-dotnet-templating-ca4d736-2" value="true" />
<add key="darc-int-dotnet-templating-ca4d736-3" value="true" />
<add key="darc-int-dotnet-templating-ca4d736-4" value="true" />
<add key="darc-int-dotnet-templating-ca4d736-5" value="true" />
<add key="darc-int-dotnet-templating-ca4d736" value="true" />
<add key="darc-int-dotnet-templating-972c73d" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-fd7dd9e-1" value="true" />

View file

@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.132" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>ca4d7363e227ba79e7d9364a6338b3c734b58043</Sha>
<Sha>972c73d0942c7755163760369dc1333ecb667cb2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.132-servicing.24270.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.132-servicing.24312.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>ca4d7363e227ba79e7d9364a6338b3c734b58043</Sha>
<Sha>972c73d0942c7755163760369dc1333ecb667cb2</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.132" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>ca4d7363e227ba79e7d9364a6338b3c734b58043</Sha>
<Sha>972c73d0942c7755163760369dc1333ecb667cb2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.132-servicing.24312.15">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.132-servicing.24312.23">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>0c8fc8a49c4852edf68db34ff8e9c92fb081a3e6</Sha>
<Sha>72c612743476ebd9dc615411535a8c8822d7fe88</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.132-servicing.24312.15">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.132-servicing.24312.23">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>0c8fc8a49c4852edf68db34ff8e9c92fb081a3e6</Sha>
<Sha>72c612743476ebd9dc615411535a8c8822d7fe88</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.24270.7" 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.132-servicing.24312.15</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.132-servicing.24312.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.132-servicing.24312.23</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.132-servicing.24312.23</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>