Merge branch 'release/6.0.3xx' into release/6.0.4xx

This commit is contained in:
Jason Zhai 2023-03-07 18:42:11 -08:00
commit 6eee81f109
3 changed files with 13 additions and 36 deletions

View file

@ -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>

View file

@ -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/

View file

@ -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>