Merge in 'release/7.0.1xx' changes
This commit is contained in:
commit
edb0ad546b
3 changed files with 10 additions and 10 deletions
|
@ -188,18 +188,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22513.4">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
|
||||
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22513.4">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22558.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
|
||||
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22513.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22558.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
|
||||
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22514.1">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22558.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "7.0.100-rc.2.22477.23",
|
||||
"dotnet": "7.0.100",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
|
||||
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.16.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22513.4"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue