Merged PR 28253: [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.308 to 6.0.308 (parent: Microsoft.NET.Sdk)
- **Microsoft.TemplateEngine.Cli**: from 6.0.308-servicing.22580.45 to 6.0.308-servicing.22605.2 (parent: Microsoft.NET.Sdk)
- **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.308 to 6.0.308 (parent: Microsoft.NET.Sdk)
- **NuGet.Build.Tasks**: from 6.2.2-rc.1 to 6.2.3-rc.8 (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**: 20230109.13
- **Date Produced**: January 9, 2023 7:23:16 PM UTC
- **Commit**: 41bb21af4043f3ff38dbcb71b281c43209e25468
- **Branch**: refs/heads/internal/release/6.0.3xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.308-servicing.22601.36 to 6.0.309-servicing.23059.13][11]
- **Microsoft.NET.Sdk**: [from 6.0.308-servicing.22601.36 to 6.0.309-servicing.23059.13][11]
- **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.308 to 6.0.308][12]
- **Microsoft.TemplateEngine.Cli**: [from 6.0.308-servicing.22580.45 to 6.0.308-servicing.22605.2][12]
- **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.308 to 6.0.308][12]
- **NuGet.Build.Tasks**: [from 6.2.2-rc.1 to 6.2.3-rc.8][13]
[11]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC873cc1a&targetVersion=GC41bb21a&_a=files
[12]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC7e40218&targetVersion=GC384bde1&_a=files
[13]: 027ca8b...51ca5ad
[DependencyUpdate]: <> (End)
[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
This commit is contained in:
DotNet Bot
Marc Paine
commit
4a73032274
3 changed files with 23 additions and 15 deletions
12
NuGet.config
12
NuGet.config
|
|
@ -8,6 +8,8 @@
|
|||
<!--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-50b7e9c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-50b7e9c6/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-50b7e9c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-50b7e9c6-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-50b7e9c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-50b7e9c6-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
|
|
@ -17,10 +19,12 @@
|
|||
<add key="darc-int-dotnet-runtime-1af80ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1af80ba0/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-7e40218" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7e40218f/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-384bde1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-384bde16/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-397c48f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-397c48f9/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-397c48f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-397c48f9-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-397c48f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-397c48f9-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
|
|
@ -41,14 +45,18 @@
|
|||
<!-- 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-50b7e9c-1" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-50b7e9c-2" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-50b7e9c" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-1af80ba" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-7e40218" value="true" />
|
||||
<add key="darc-int-dotnet-templating-384bde1" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-397c48f-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-397c48f-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-397c48f" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
|
|
|
|||
|
|
@ -92,25 +92,25 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.308" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>7e40218fedff9fad69162a8beab14468ac6c1cf3</Sha>
|
||||
<Sha>384bde1623ae79bbe6308f201c869d91f9f05569</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.308-servicing.22580.45" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.308-servicing.22605.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>7e40218fedff9fad69162a8beab14468ac6c1cf3</Sha>
|
||||
<Sha>384bde1623ae79bbe6308f201c869d91f9f05569</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.308" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>7e40218fedff9fad69162a8beab14468ac6c1cf3</Sha>
|
||||
<Sha>384bde1623ae79bbe6308f201c869d91f9f05569</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.308-servicing.22601.36">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.309-servicing.23059.13">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>873cc1a88b27554f9f12d378b91861fc4b82ee56</Sha>
|
||||
<Sha>41bb21af4043f3ff38dbcb71b281c43209e25468</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.308-servicing.22601.36">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.309-servicing.23059.13">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>873cc1a88b27554f9f12d378b91861fc4b82ee56</Sha>
|
||||
<Sha>41bb21af4043f3ff38dbcb71b281c43209e25468</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.13-servicing.22601.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -151,9 +151,9 @@
|
|||
<Sha>038f9bae9b34d1cca653360a46c5ce1eba4c2ac8</Sha>
|
||||
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.2.2-rc.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
|
||||
<Sha>027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d</Sha>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.2.3-rc.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>51ca5ad938c742e6ff876ea1545b0712b130f9d1</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.19.0">
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.308-servicing.22601.36</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.308-servicing.22601.36</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.309-servicing.23059.13</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.309-servicing.23059.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue