mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source 
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.Net.Compilers.Toolset**: from 4.2.0-4.22220.2 to 4.2.0-4.22220.5 (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**: 20220511.2
- **Date Produced**: May 11, 2022 9:45:42 AM UTC
- **Commit**: 07c36a7706dfa2b3775da973646c86f1da485a8b
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22252.6 to 6.0.301-rtm.22261.2][11]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22252.6 to 6.0.301-rtm.22261.2][11]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22220.2 to 4.2.0-4.22220.5][12]

[11]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1a8f1ba&targetVersion=GC07c36a7&_a=files
[12]: 1e40aa1...432d17a

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
This commit is contained in:
DotNet Bot 2022-05-12 16:42:14 +00:00 • committed by Matt Mitchell
parent b805b02916
commit c9abd25c04
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -103,14 +103,14 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-rtm.22252.6">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22261.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1a8f1baf45ee888efa9607571f2c4c649900fc4a</Sha>
<Sha>07c36a7706dfa2b3775da973646c86f1da485a8b</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-rtm.22252.6">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22261.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>1a8f1baf45ee888efa9607571f2c4c649900fc4a</Sha>
<Sha>07c36a7706dfa2b3775da973646c86f1da485a8b</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.5-servicing.22214.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -141,9 +141,9 @@
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-4.22220.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-4.22220.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>1e40aa11ca0b522e201320f70d469de40f211b2c</Sha>
<Sha>432d17a83aa5623e4581756f4d642997048056bd</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.2.0" CoherentParentDependency="Microsoft.NET.Sdk">

4
eng/Versions.props
View file

@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.300-rtm.22252.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-rtm.22252.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.301-rtm.22261.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22261.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>