Merge in 'release/6.0.4xx' changes

This commit is contained in:
dotnet-bot 2022-11-14 21:18:37 +00:00
commit 5c86e04790
3 changed files with 9 additions and 9 deletions

View file

@ -197,19 +197,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22560.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
<Sha>a0fd54b5c2dc3e23aa8466bd4638462df4303633</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22558.7">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22560.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
<Sha>a0fd54b5c2dc3e23aa8466bd4638462df4303633</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22558.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22560.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
<Sha>a0fd54b5c2dc3e23aa8466bd4638462df4303633</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22525.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

View file

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

View file

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