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

This pull request updates the following dependencies

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230307.34
- **Date Produced**: March 8, 2023 3:34:32 AM UTC
- **Commit**: 3760d8678b4a386b91b4018163f9e3e9e522f325
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.203][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23127.3 to 4.5.2-3.23152.4][3]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC288f106&targetVersion=GC3760d86&_a=files
[3]: e2bc27d...019bee6

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)

[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.Net.Compilers.Toolset**: from 4.5.0-6.23127.3 to 4.5.2-3.23152.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
This commit is contained in:
DotNet Bot 2023-03-09 00:01:51 +00:00 committed by Marc Paine
commit fa6a368a53
3 changed files with 29 additions and 16 deletions

View file

@ -8,23 +8,30 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-e56abc4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45/nuget/v3/index.json" /> <add key="darc-int-dotnet-aspnetcore-e56abc4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e56abc4-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e56abc4-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45-1/nuget/v3/index.json" /> <add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" /> <add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-1/nuget/v3/index.json" /> <add key="darc-pub-dotnet-emsdk-ba16583-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-6f08c67-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6f08c67f-1/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-0a396ac-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-0a396ac-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca-2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-288f106" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-288f1065/nuget/v3/index.json" /> <add key="darc-int-dotnet-sdk-3760d86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-3760d867/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d/nuget/v3/index.json" /> <add key="darc-int-dotnet-windowsdesktop-27813f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-1/nuget/v3/index.json" /> <add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@ -48,15 +55,21 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="true" /> <add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-e56abc4-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-e56abc4-3" value="true" />
<add key="darc-int-dotnet-aspnetcore-e56abc4" value="true" /> <add key="darc-int-dotnet-aspnetcore-e56abc4" value="true" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0a396ac-2" value="true" />
<add key="darc-int-dotnet-runtime-0a396ac-3" value="true" />
<add key="darc-int-dotnet-runtime-0a396ac" value="true" /> <add key="darc-int-dotnet-runtime-0a396ac" value="true" />
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-288f106" value="true" /> <add key="darc-int-dotnet-sdk-3760d86" value="true" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="true" /> <add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="true" /> <add key="darc-int-dotnet-windowsdesktop-27813f8" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->

View file

@ -98,22 +98,22 @@
<Sha>94c498e399eb1cbb7290ed1e42564589a259312a</Sha> <Sha>94c498e399eb1cbb7290ed1e42564589a259312a</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" /> <SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.202"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.203">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</Sha> <Sha>3760d8678b4a386b91b4018163f9e3e9e522f325</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.202-servicing.23128.1"> <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.203-servicing.23157.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</Sha> <Sha>3760d8678b4a386b91b4018163f9e3e9e522f325</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.202-servicing.23128.1"> <Dependency Name="Microsoft.NET.Sdk" Version="7.0.203-servicing.23157.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</Sha> <Sha>3760d8678b4a386b91b4018163f9e3e9e522f325</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.202-servicing.23128.1"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.203-servicing.23157.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>288f1065b0d882689bdbee4a91ceb34617fc9f96</Sha> <Sha>3760d8678b4a386b91b4018163f9e3e9e522f325</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- 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="7.0.4-servicing.23117.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.4-servicing.23117.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -144,9 +144,9 @@
<SourceBuild RepoName="linker" ManagedOnly="true" /> <SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName> <RepoName>linker</RepoName>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-6.23127.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.2-3.23152.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e2bc27d266040403e0c6de24f29a6bdce5cc7231</Sha> <Sha>019bee653d1f2c0d7500be262536e505f67117cf</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" /> <SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build" Version="17.5.0" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Build" Version="17.5.0" CoherentParentDependency="Microsoft.NET.Sdk">

View file

@ -63,9 +63,9 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.202</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.203</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.202-servicing.23128.1</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>7.0.203-servicing.23157.34</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.202-servicing.23128.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.203-servicing.23157.34</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>