Merge in 'release/8.0.3xx' changes
This commit is contained in:
commit
7477768a2e
4 changed files with 17 additions and 17 deletions
|
@ -3,7 +3,7 @@
|
||||||
"isRoot": true,
|
"isRoot": true,
|
||||||
"tools": {
|
"tools": {
|
||||||
"microsoft.dotnet.darc": {
|
"microsoft.dotnet.darc": {
|
||||||
"version": "1.1.0-beta.24267.1",
|
"version": "1.1.0-beta.24303.1",
|
||||||
"commands": [
|
"commands": [
|
||||||
"darc"
|
"darc"
|
||||||
]
|
]
|
||||||
|
|
|
@ -193,9 +193,9 @@
|
||||||
<Sha>5957c5c5f85f17c145e7fab4ece37ad6aafcded9</Sha>
|
<Sha>5957c5c5f85f17c145e7fab4ece37ad6aafcded9</Sha>
|
||||||
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
|
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24263.1">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24269.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
<Uri>https://github.com/dotnet/source-build-externals</Uri>
|
||||||
<Sha>a3021ef9ed72d7bdf799092a47d2d024fc13bfcd</Sha>
|
<Sha>4f2151df120194f0268944f1b723c14820738fc8</Sha>
|
||||||
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">
|
||||||
|
@ -214,26 +214,26 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24266.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24270.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
|
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24266.3">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24270.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
|
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24266.3">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24270.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
|
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24267.1">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24303.1">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
<Sha>edea2714d4eb808921b2128d47234f387c03bf91</Sha>
|
<Sha>eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24267.1">
|
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24303.1">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
<Sha>edea2714d4eb808921b2128d47234f387c03bf91</Sha>
|
<Sha>eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf</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.24266.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24270.4</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.24267.1</MicrosoftDotNetDarcLibVersion>
|
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24303.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.24266.3",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24266.3"
|
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24270.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue