Merge in 'release/8.0.3xx' changes
This commit is contained in:
commit
320c5864bc
4 changed files with 15 additions and 15 deletions
|
@ -3,7 +3,7 @@
|
||||||
"isRoot": true,
|
"isRoot": true,
|
||||||
"tools": {
|
"tools": {
|
||||||
"microsoft.dotnet.darc": {
|
"microsoft.dotnet.darc": {
|
||||||
"version": "1.1.0-beta.24223.1",
|
"version": "1.1.0-beta.24253.1",
|
||||||
"commands": [
|
"commands": [
|
||||||
"darc"
|
"darc"
|
||||||
]
|
]
|
||||||
|
|
|
@ -214,26 +214,26 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24204.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24225.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
|
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24204.3">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24225.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
|
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24204.3">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24225.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
|
<Sha>67d23f4ba1813b315e7e33c71d18b63475f5c5f8</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24223.1">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24253.1">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
<Sha>0c89e9cbde00179871f262673c78893f1ce5b688</Sha>
|
<Sha>27d7e19521190350568160c486bf9126a7daf1c4</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24223.1">
|
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24253.1">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
<Sha>0c89e9cbde00179871f262673c78893f1ce5b688</Sha>
|
<Sha>27d7e19521190350568160c486bf9126a7daf1c4</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||||
|
|
|
@ -39,11 +39,11 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24204.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24223.1</MicrosoftDotNetDarcLibVersion>
|
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24253.1</MicrosoftDotNetDarcLibVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.21.0"
|
"cmake": "3.21.0"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3"
|
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24225.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue