Merged PR 25953: [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.Build**: from 17.2.0 to 17.2.2 (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**: 20220919.16
- **Date Produced**: September 19, 2022 7:26:24 PM UTC
- **Commit**: edd49c1bacac9342e15445a777722858e7f5fddf
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1]
  - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1]
  - **Microsoft.Build**: [from 17.2.0 to 17.2.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2336f3a&targetVersion=GCedd49c1&_a=files
[2]: https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted/branches?baseVersion=GC41abc56&targetVersion=GC038f9ba&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
This commit is contained in:
DotNet Bot 2022-09-20 18:04:39 +00:00 committed by Matt Mitchell
parent ba3be673e1
commit ef06dab37f
3 changed files with 15 additions and 15 deletions

View file

@ -7,13 +7,12 @@
<clear />
<!--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-3fe12b9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fe12b93/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-3fe12b9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fe12b93-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-3fe12b9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fe12b93-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-int-DotNet-msbuild-Trusted-038f9ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-038f9bae/nuget/v3/index.json" />
<add key="darc-int-DotNet-msbuild-Trusted-038f9ba-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-038f9bae-1/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
@ -37,10 +36,11 @@
</packageSources>
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-int-DotNet-msbuild-Trusted-038f9ba-1" value="true" />
<add key="darc-int-DotNet-msbuild-Trusted-038f9ba" value="true" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-3fe12b9-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-3fe12b9-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-3fe12b9" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->

View file

@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>0b3a1bf29b9888fb2ae25df25be9f5231606c66f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22464.21">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22469.16">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>2336f3adc98fface4160b2265684b302bf642fbd</Sha>
<Sha>edd49c1bacac9342e15445a777722858e7f5fddf</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22464.21">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22469.16">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>2336f3adc98fface4160b2265684b302bf642fbd</Sha>
<Sha>edd49c1bacac9342e15445a777722858e7f5fddf</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.9-servicing.22419.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -146,9 +146,9 @@
<Sha>432d17a83aa5623e4581756f4d642997048056bd</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.2.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>41abc5629965e3f9e41f1e67fdf78345c0c5cc4b</Sha>
<Dependency Name="Microsoft.Build" Version="17.2.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
<Sha>038f9bae9b34d1cca653360a46c5ce1eba4c2ac8</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.2.2-rc.1" CoherentParentDependency="Microsoft.NET.Sdk">

View file

@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.305-servicing.22464.21</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22464.21</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.305-servicing.22469.16</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22469.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>