Merged PR 13169: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210223.24 - **Date Produced**: 2/24/2021 1:54 AM - **Commit**: 51ff67bd457ca07bab44409a3f58b9bb68997f2f - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.201-servicing.21123.23 to 5.0.201-servicing.21123.24][1] - **Microsoft.NET.Sdk**: [from 5.0.201-servicing.21123.23 to 5.0.201-servicing.21123.24][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC51ff67b&targetVersion=GC51ff67b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) [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.WindowsDesktop.App**: from 5.0.4-servicing.21117.6 to 5.0.4-servicing.21117.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 3.9.0-5.21120.8 to 3.9.0-6.21123.28 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
This commit is contained in:
commit
a09bd5c86c
2 changed files with 10 additions and 10 deletions
|
@ -5,7 +5,7 @@
|
|||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>ec2af60c1eb8b2665745750f6445b3ff133178fb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.4-servicing.21117.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.4-servicing.21117.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>e708867037ec6edbe7965b8f0f1193999785037e</Sha>
|
||||
</Dependency>
|
||||
|
@ -91,13 +91,13 @@
|
|||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.201-servicing.21123.16">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.201-servicing.21123.24">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>eb87e99879e0d4f697c33b6d991af832d4345a06</Sha>
|
||||
<Sha>51ff67bd457ca07bab44409a3f58b9bb68997f2f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.201-servicing.21123.16">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.201-servicing.21123.24">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>eb87e99879e0d4f697c33b6d991af832d4345a06</Sha>
|
||||
<Sha>51ff67bd457ca07bab44409a3f58b9bb68997f2f</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="5.0.4-servicing.21117.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
@ -121,9 +121,9 @@
|
|||
<Sha>0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d</Sha>
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-5.21120.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-6.21123.28" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>accdcb77007e801eabcb2c221bad9ef837b64ee3</Sha>
|
||||
<Sha>0ffb65777acd74de98f6faef0ade9a14211475c2</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="16.9.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
|
|
|
@ -55,8 +55,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>5.0.201-servicing.21123.16</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.201-servicing.21123.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>5.0.201-servicing.21123.24</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.201-servicing.21123.24</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
@ -74,7 +74,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.4-servicing.21117.6</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.4-servicing.21117.9</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>5.0.0-rtm.20520.1</VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>
|
||||
|
|
Loading…
Reference in a new issue