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

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

Browse source 
This pull request updates the following dependencies

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://github.com/dotnet/sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220203.35
- **Date Produced**: February 4, 2022 6:54:19 AM UTC
- **Commit**: 82104d83fba7ad2710ba4526a645a6b1a490d331
- **Branch**: refs/heads/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.200-rtm.22103.4 to 6.0.200-rtm.22103.35][4]
  - **Microsoft.NET.Sdk**: [from 6.0.200-rtm.22103.4 to 6.0.200-rtm.22103.35][4]
  - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22081.5 to 6.0.200-1.22103.1][5]

[4]: db23431...82104d8
[5]: cc3dc76...2b78c5e

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)

[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.ILLink.Tasks**: from 6.0.200-1.22081.5 to 6.0.200-1.22103.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
This commit is contained in:
DotNet Bot 2022-02-04 21:15:42 +00:00 committed by Marc Paine
commit 5a238f1427
2 changed files with 8 additions and 8 deletions
Show stats 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>f6749ec0725a81db2491dd83b1c4b665332a7330</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-rtm.22103.4">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-rtm.22103.35">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>db234316ba6592d93da97a7cb1b95b2c2f74bd30</Sha>
<Sha>82104d83fba7ad2710ba4526a645a6b1a490d331</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-rtm.22103.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-rtm.22103.35">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>db234316ba6592d93da97a7cb1b95b2c2f74bd30</Sha>
<Sha>82104d83fba7ad2710ba4526a645a6b1a490d331</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.1-servicing.21567.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -135,9 +135,9 @@
<Sha>d3c6439b04452047cb62fc645ce341a034bdb5be</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22081.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22103.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>cc3dc76c374152f86ff73aa02f35782b713908c6</Sha>
<Sha>2b78c5e93b8dd36f4e55ee1e0327e064c0f5e84c</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>

4
eng/Versions.props
View file

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