Merged PR 35839: [internal/release/6.0.3xx] 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.321 to 6.0.321 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231205.22 - **Date Produced**: December 5, 2023 11:12:12 PM UTC - **Commit**: 96ce218210ee10662e18423d95be11527ff19222 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.321 to 6.0.321][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.321 to 6.0.321][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc22a743f3a&targetVersion=GC96ce218210&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC6b4fc213e7&targetVersion=GC757b2e642e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
This commit is contained in:
DotNet Bot
Matt Mitchell
parent
151c083a87
commit
aa3e2f103a
3 changed files with 12 additions and 14 deletions
|
|
@ -19,8 +19,7 @@
|
|||
<add key="darc-int-dotnet-runtime-dc45e96" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dc45e968/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-6b4fc21" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-6b4fc213/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-6b4fc21-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-6b4fc213-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-757b2e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-757b2e64/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-456adb55/nuget/v3/index.json" />
|
||||
|
|
@ -50,8 +49,7 @@
|
|||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-dc45e96" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-6b4fc21-1" value="true" />
|
||||
<add key="darc-int-dotnet-templating-6b4fc21" value="true" />
|
||||
<add key="darc-int-dotnet-templating-757b2e6" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="true" />
|
||||
|
|
|
|||
|
|
@ -92,25 +92,25 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.321" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>6b4fc213e731cb128ad8ed54befea55d9e1d3f6d</Sha>
|
||||
<Sha>757b2e642e3fb918bae9a87715c8c2fddbc9b3bf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.321-servicing.23573.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.321-servicing.23605.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>6b4fc213e731cb128ad8ed54befea55d9e1d3f6d</Sha>
|
||||
<Sha>757b2e642e3fb918bae9a87715c8c2fddbc9b3bf</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.321" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>6b4fc213e731cb128ad8ed54befea55d9e1d3f6d</Sha>
|
||||
<Sha>757b2e642e3fb918bae9a87715c8c2fddbc9b3bf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.321-servicing.23605.15">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.321-servicing.23605.22">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>c22a743f3adc2dafbf2bc9b4993e23ca15d0c828</Sha>
|
||||
<Sha>96ce218210ee10662e18423d95be11527ff19222</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.321-servicing.23605.15">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.321-servicing.23605.22">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>c22a743f3adc2dafbf2bc9b4993e23ca15d0c828</Sha>
|
||||
<Sha>96ce218210ee10662e18423d95be11527ff19222</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.26-servicing.23573.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.321-servicing.23605.15</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.321-servicing.23605.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.321-servicing.23605.22</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.321-servicing.23605.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue