Merge branch 'release/6.0.1xx' into release/6.0.2xx

This commit is contained in:
Jason Zhai 2022-03-15 01:56:45 -07:00
commit b6ca26dd0b
5 changed files with 24 additions and 17 deletions

View file

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

View file

@ -4,7 +4,7 @@ resources:
pipelines: pipelines:
- pipeline: installer-build-resource - pipeline: installer-build-resource
source: installer source: installer
trigger: true trigger: none
stages: stages:
- stage: build - stage: build

View file

@ -11,9 +11,7 @@
should be added to source-build-reference-packages. should be added to source-build-reference-packages.
--> -->
<ItemGroup> <ItemGroup>
<PackageDownload Include="Microsoft.DotNet.Common.ItemTemplates" Version="[$(MicrosoftDotNetCommonItemTemplates60PackageVersion)]" />
<PackageDownload Include="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" /> <PackageDownload Include="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" />
<PackageDownload Include="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="[$(MicrosoftDotNetCommonProjectTemplates60PackageVersion)]" />
<PackageDownload Include="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" /> <PackageDownload Include="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" />
<PackageDownload Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" /> <PackageDownload Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" />

View file

@ -47,18 +47,18 @@ index ------------
+./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.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.dll
+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
+./packs/Microsoft.NETCore.App.Host.bannana.rid/ +./packs/Microsoft.NETCore.App.Host.banana.rid/
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/ +./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/
+./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/
+./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/
+./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/apphost
+./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/coreclr_delegates.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/hostfxr.h
+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.a +./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/libnethost.so +./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/nethost.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/singlefilehost +./packs/Microsoft.NETCore.App.Host.banana.rid/x.y.z/runtimes/banana.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 +764,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

View file

@ -58,7 +58,8 @@
<SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" /> <SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
</ItemGroup> </ItemGroup>
<Exec Command="$(SignCheckExe) ^ <Exec Condition="'@(SignCheckWorkloadManifestMsiInputFiles->Count())' != '0'"
Command="$(SignCheckExe) ^
--recursive ^ --recursive ^
-f UnsignedFiles ^ -f UnsignedFiles ^
-i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^ -i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^