[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15583)
This commit is contained in:
commit
58c897f829
5 changed files with 23 additions and 46 deletions
|
@ -197,19 +197,19 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23060.6">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23114.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>74b7648c106865057c78ca1e4b2ffcb5e9bce071</Sha>
|
<Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23060.6">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23114.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>74b7648c106865057c78ca1e4b2ffcb5e9bce071</Sha>
|
<Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23060.6">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23114.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>74b7648c106865057c78ca1e4b2ffcb5e9bce071</Sha>
|
<Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22580.2">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22580.2">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23060.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
@ -174,7 +174,7 @@
|
||||||
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
|
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
|
||||||
necessary, and this property is removed from the file.
|
necessary, and this property is removed from the file.
|
||||||
-->
|
-->
|
||||||
<PrivateSourceBuiltArtifactsPackageVersion>6.0.113</PrivateSourceBuiltArtifactsPackageVersion>
|
<PrivateSourceBuiltArtifactsPackageVersion>6.0.114.1</PrivateSourceBuiltArtifactsPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- Workload manifest package versions -->
|
<!-- Workload manifest package versions -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "6.0.113",
|
"dotnet": "6.0.114",
|
||||||
"runtimes": {
|
"runtimes": {
|
||||||
"dotnet": [
|
"dotnet": [
|
||||||
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
|
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6",
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6"
|
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23114.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,21 +14,7 @@ index ------------
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/
|
./packs/Microsoft.AspNetCore.App.Ref/
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/
|
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/
|
||||||
@@ ------------ @@
|
@@ ------------ @@
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml
|
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll
|
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
|
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll
|
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml
|
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll
|
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml
|
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml
|
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll
|
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll
|
||||||
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml
|
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml
|
||||||
-./packs/Microsoft.NETCore.App.Host.portable-rid/
|
-./packs/Microsoft.NETCore.App.Host.portable-rid/
|
||||||
|
@ -43,10 +29,6 @@ index ------------
|
||||||
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so
|
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so
|
||||||
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h
|
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h
|
||||||
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost
|
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll
|
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
|
|
||||||
+./packs/Microsoft.NETCore.App.Host.banana-rid/
|
+./packs/Microsoft.NETCore.App.Host.banana-rid/
|
||||||
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/
|
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/
|
||||||
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/
|
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/
|
||||||
|
@ -1453,21 +1435,4 @@ index ------------
|
||||||
-./sdk/x.y.z/zh-Hant/vstest.console.resources.dll
|
-./sdk/x.y.z/zh-Hant/vstest.console.resources.dll
|
||||||
./shared/
|
./shared/
|
||||||
./shared/Microsoft.AspNetCore.App/
|
./shared/Microsoft.AspNetCore.App/
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/
|
|
||||||
@@ ------------ @@
|
@@ ------------ @@
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Extensions.WebEncoders.dll
|
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.JSInterop.dll
|
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Net.Http.Headers.dll
|
|
||||||
+./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.DiagnosticSource.dll
|
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.EventLog.dll
|
|
||||||
+./shared/Microsoft.AspNetCore.App/x.y.z/System.Formats.Asn1.dll
|
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/System.IO.Pipelines.dll
|
|
||||||
+./shared/Microsoft.AspNetCore.App/x.y.z/System.Runtime.CompilerServices.Unsafe.dll
|
|
||||||
+./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.AccessControl.dll
|
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Pkcs.dll
|
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Xml.dll
|
|
||||||
+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Encodings.Web.dll
|
|
||||||
+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Json.dll
|
|
||||||
./shared/Microsoft.AspNetCore.App/x.y.z/THIRD-PARTY-NOTICES.txt
|
|
||||||
./shared/Microsoft.NETCore.App/
|
|
||||||
./shared/Microsoft.NETCore.App/x.y.z/
|
|
|
@ -1079,6 +1079,12 @@
|
||||||
<File Path="Microsoft.DotNet.SharedFramework.Sdk.x.y.z/tools/netx.y/System.Text.Json.dll">
|
<File Path="Microsoft.DotNet.SharedFramework.Sdk.x.y.z/tools/netx.y/System.Text.Json.dll">
|
||||||
<Type>AssemblyAttribute</Type>
|
<Type>AssemblyAttribute</Type>
|
||||||
</File>
|
</File>
|
||||||
|
<File Path="Microsoft.DotNet.SignTool.x.y.z/lib/netx.y/Microsoft.ApplicationInsights.dll">
|
||||||
|
<Type>AssemblyAttribute</Type>
|
||||||
|
</File>
|
||||||
|
<File Path="Microsoft.DotNet.SignTool.x.y.z/lib/netx.y/Microsoft.ApplicationInsights.dll">
|
||||||
|
<Type>AssemblyAttribute</Type>
|
||||||
|
</File>
|
||||||
<File Path="Microsoft.DotNet.SignTool.x.y.z/lib/netx.y/Newtonsoft.Json.dll">
|
<File Path="Microsoft.DotNet.SignTool.x.y.z/lib/netx.y/Newtonsoft.Json.dll">
|
||||||
<Type>AssemblyAttribute</Type>
|
<Type>AssemblyAttribute</Type>
|
||||||
</File>
|
</File>
|
||||||
|
@ -1133,6 +1139,12 @@
|
||||||
<File Path="Microsoft.DotNet.SignTool.x.y.z/lib/netx.y/System.Runtime.CompilerServices.Unsafe.dll">
|
<File Path="Microsoft.DotNet.SignTool.x.y.z/lib/netx.y/System.Runtime.CompilerServices.Unsafe.dll">
|
||||||
<Type>AssemblyAttribute</Type>
|
<Type>AssemblyAttribute</Type>
|
||||||
</File>
|
</File>
|
||||||
|
<File Path="Microsoft.DotNet.SignTool.x.y.z/tools/netx.y/Microsoft.ApplicationInsights.dll">
|
||||||
|
<Type>AssemblyAttribute</Type>
|
||||||
|
</File>
|
||||||
|
<File Path="Microsoft.DotNet.SignTool.x.y.z/tools/netx.y/Microsoft.ApplicationInsights.dll">
|
||||||
|
<Type>AssemblyAttribute</Type>
|
||||||
|
</File>
|
||||||
<File Path="Microsoft.DotNet.SignTool.x.y.z/tools/netx.y/Newtonsoft.Json.dll">
|
<File Path="Microsoft.DotNet.SignTool.x.y.z/tools/netx.y/Newtonsoft.Json.dll">
|
||||||
<Type>AssemblyAttribute</Type>
|
<Type>AssemblyAttribute</Type>
|
||||||
</File>
|
</File>
|
||||||
|
|
Loading…
Reference in a new issue