Merged PR 29820: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230307.12
- **Date Produced**: March 7, 2023 9:47:14 PM UTC
- **Commit**: 4c281ffb84e84dff9ed743cc4952156c8530b18b
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.310-servicing.23126.2 to 6.0.311-servicing.23157.12][2]
  - **Microsoft.NET.Sdk**: [from 6.0.310-servicing.23126.2 to 6.0.311-servicing.23157.12][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9377719&targetVersion=GC4c281ff&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
This commit is contained in:
DotNet Bot 2023-03-09 00:01:34 +00:00 committed by Marc Paine
commit f80e505f9c
3 changed files with 22 additions and 6 deletions

View file

@ -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-6a6d775" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6a6d775f/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-6a6d775-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6a6d775f-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-6a6d775-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6a6d775f-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@ -15,14 +17,20 @@
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-5edef4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-5edef4b-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-5edef4b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2-3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-8d514aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8d514aa0/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8d514aa-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8d514aa0-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8d514aa-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8d514aa0-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8d514aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8d514aa0-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8d514aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8d514aa0-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
@ -45,18 +53,26 @@
<!-- 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-6a6d775-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-6a6d775-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-6a6d775" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-5edef4b-3" value="true" />
<add key="darc-int-dotnet-runtime-5edef4b-4" value="true" />
<add key="darc-int-dotnet-runtime-5edef4b" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-8d514aa-1" value="true" />
<add key="darc-int-dotnet-templating-8d514aa-2" value="true" />
<add key="darc-int-dotnet-templating-8d514aa-3" value="true" />
<add key="darc-int-dotnet-templating-8d514aa-4" value="true" />
<add key="darc-int-dotnet-templating-8d514aa" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7-4" value="true" />
<add key="darc-int-dotnet-windowsdesktop-6b2fdd7" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->

View file

@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>8d514aa078b709344008f1c595e854b9b56609cd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.310-servicing.23126.2">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.311-servicing.23157.12">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>9377719841f99261e56cca96905da8568de079c6</Sha>
<Sha>4c281ffb84e84dff9ed743cc4952156c8530b18b</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.310-servicing.23126.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.311-servicing.23157.12">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>9377719841f99261e56cca96905da8568de079c6</Sha>
<Sha>4c281ffb84e84dff9ed743cc4952156c8530b18b</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.15-servicing.23117.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

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