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

Merge in 'release/6.0.1xx' changes

Browse source
This commit is contained in:
dotnet-bot 2022-05-05 03:15:35 +00:00
commit 9aaf4280d7
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

@ -197,23 +197,23 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22212.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22254.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22212.5">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22254.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22212.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22254.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22254.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22254.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>eba16eaac0a3f27f6e37c88313717776d4f38710</Sha>
<Sha>6998584e7856a384d12fa7d0f898daec9be22c13</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.22212.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22254.3</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.22212.5",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3"
}
}