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

Merge in 'release/6.0.2xx' changes

Browse source
This commit is contained in:
dotnet-bot 2022-04-08 02:08:59 +00:00
commit 64b9715b0c
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -201,23 +201,23 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22178.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22206.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f8c0d51185208227e582f76ac3c5003db237b689</Sha>
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22178.5">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22206.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f8c0d51185208227e582f76ac3c5003db237b689</Sha>
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22178.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22206.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f8c0d51185208227e582f76ac3c5003db237b689</Sha>
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22179.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22207.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>dfdfa4ee297fe8daa90cd623c5b612abf3f60873</Sha>
<Sha>7cdb7a26c89847fcd5dc72ef5eba659030f57666</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22178.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22206.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7"
}
}