Merge in 'release/6.0.1xx' changes
This commit is contained in:
commit
a9a8031b98
3 changed files with 22 additions and 32 deletions
|
@ -172,7 +172,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.2</PrivateSourceBuiltArtifactsPackageVersion>
|
<PrivateSourceBuiltArtifactsPackageVersion>6.0.103</PrivateSourceBuiltArtifactsPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- Workload manifest package versions -->
|
<!-- Workload manifest package versions -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "6.0.102"
|
"dotnet": "6.0.103"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
||||||
|
|
|
@ -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.linux-x64/
|
-./packs/Microsoft.NETCore.App.Host.linux-x64/
|
||||||
|
@ -43,22 +29,18 @@ index ------------
|
||||||
-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.so
|
-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.so
|
||||||
-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/nethost.h
|
-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/nethost.h
|
||||||
-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/singlefilehost
|
-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/singlefilehost
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/
|
||||||
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/apphost
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/coreclr_delegates.h
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/hostfxr.h
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/libnethost.a
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/apphost
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/libnethost.so
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/coreclr_delegates.h
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/nethost.h
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/hostfxr.h
|
+./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.rid/native/singlefilehost
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.a
|
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.so
|
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/nethost.h
|
|
||||||
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/singlefilehost
|
|
||||||
./packs/Microsoft.NETCore.App.Ref/
|
./packs/Microsoft.NETCore.App.Ref/
|
||||||
./packs/Microsoft.NETCore.App.Ref/x.y.z/
|
./packs/Microsoft.NETCore.App.Ref/x.y.z/
|
||||||
./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/
|
./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/
|
||||||
|
@ -764,6 +746,14 @@ index ------------
|
||||||
./sdk/x.y.z/ref/mscorlib.dll
|
./sdk/x.y.z/ref/mscorlib.dll
|
||||||
./sdk/x.y.z/ref/netstandard.dll
|
./sdk/x.y.z/ref/netstandard.dll
|
||||||
@@ ------------ @@
|
@@ ------------ @@
|
||||||
|
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll
|
||||||
|
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
+./sdk/x.y.z/Roslyn/bincore/runtimes/
|
||||||
|
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/
|
||||||
|
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/
|
||||||
|
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/
|
||||||
|
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll
|
||||||
./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll
|
./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll
|
||||||
./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll
|
./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll
|
||||||
./sdk/x.y.z/Roslyn/bincore/System.Runtime.CompilerServices.Unsafe.dll
|
./sdk/x.y.z/Roslyn/bincore/System.Runtime.CompilerServices.Unsafe.dll
|
||||||
|
|
Loading…
Reference in a new issue