Merged PR 40352: [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.DotNet.Common.ItemTemplates**: from 6.0.424 to 6.0.424 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.424-rtm.24270.10 to 6.0.424-rtm.24312.7 (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**: 20240612.25 - **Date Produced**: June 13, 2024 12:37:08 AM UTC - **Commit**: 69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.424-servicing.24312.16 to 6.0.424-servicing.24312.25][1] - **Microsoft.NET.Sdk**: [from 6.0.424-servicing.24312.16 to 6.0.424-servicing.24312.25][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.424 to 6.0.424][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.424-rtm.24270.10 to 6.0.424-rtm.24312.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.424 to 6.0.424][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a38de2eaeb73f0c990dd9afd20fcee54b1b4323&targetVersion=GC69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC18a8de8275918ced823bd7bea39220c9e675672b&targetVersion=GC66882f1064cade03b498f5ae5361aab07e7b3627&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
This commit is contained in:
DotNet Bot
Sean Reeser
commit
6231be170f
3 changed files with 12 additions and 22 deletions
14
NuGet.config
14
NuGet.config
|
|
@ -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-18a8de8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-18a8de82/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-18a8de82-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-18a8de82-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-18a8de82-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-18a8de82-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-18a8de82-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-66882f1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-66882f10/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" />
|
||||
|
|
@ -59,12 +54,7 @@
|
|||
<add key="darc-int-dotnet-runtime-c1b0b27" value="true" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-18a8de8-1" value="true" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-2" value="true" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-3" value="true" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-4" value="true" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8-5" value="true" />
|
||||
<add key="darc-int-dotnet-templating-18a8de8" value="true" />
|
||||
<add key="darc-int-dotnet-templating-66882f1" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-fd7dd9e-1" value="true" />
|
||||
|
|
|
|||
|
|
@ -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>18a8de8275918ced823bd7bea39220c9e675672b</Sha>
|
||||
<Sha>66882f1064cade03b498f5ae5361aab07e7b3627</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.424-rtm.24270.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.424-rtm.24312.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>18a8de8275918ced823bd7bea39220c9e675672b</Sha>
|
||||
<Sha>66882f1064cade03b498f5ae5361aab07e7b3627</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>18a8de8275918ced823bd7bea39220c9e675672b</Sha>
|
||||
<Sha>66882f1064cade03b498f5ae5361aab07e7b3627</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24312.16">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24312.25">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>5a38de2eaeb73f0c990dd9afd20fcee54b1b4323</Sha>
|
||||
<Sha>69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24312.16">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24312.25">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>5a38de2eaeb73f0c990dd9afd20fcee54b1b4323</Sha>
|
||||
<Sha>69b93c4ee7464e0a5fc5a5b31d14ebf01832ab4b</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">
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24312.16</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24312.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24312.25</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24312.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue