diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de87dcefad95..7e03da02dc4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,46 +43,46 @@ 712d83f2dbaaff5e354f1d943c06f8200d688b2d - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e @@ -91,14 +91,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 34f1100060f0d618239c8e6d73d3e80862429598 + f36d59e61776e2e29bb2fc3e4ef5acdb4689d210 - + https://github.com/dotnet/emsdk - 34f1100060f0d618239c8e6d73d3e80862429598 + f36d59e61776e2e29bb2fc3e4ef5acdb4689d210 @@ -254,29 +254,29 @@ fa1172341736fdcab08a591fe4e5a6fb71117ad2 - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e https://github.com/dotnet/windowsdesktop @@ -558,85 +558,85 @@ - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e @@ -670,9 +670,9 @@ ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e https://github.com/dotnet/arcade-services @@ -723,9 +723,9 @@ https://github.com/microsoft/testfx 1d72cd03b28b06a261b5c4cf634c24c57e04b89b - + https://github.com/dotnet/runtime - 457e3eb93e35f60f9b0515ee6a4b75e76a64ce8c + db681fb307d754c3746ffb40e0634e4c4e0caa9e diff --git a/eng/Versions.props b/eng/Versions.props index 7dee47d346e8..d0a8fa131f00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,44 +87,44 @@ - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 8.0.0-rc.1.23414.4 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 2.1.0 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 - 10.0.0-preview.2.25119.7 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 + 10.0.0-preview.3.25124.11 8.0.0 @@ -305,7 +305,7 @@ 15.2.10321-net10-p1 18.2.10321-net10-p1 - 10.0.0-preview.2.25117.1 + 10.0.0-preview.3.25119.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion) 10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index 9abf002995ca..458c064b9614 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -34,6 +34,9 @@ $(BuildArgs) /p:NetCoreAppToolCurrentVersion=10.0 + + + true diff --git a/src/SourceBuild/patches/runtime/0001-use-standard-arcade-publish.patch b/src/SourceBuild/patches/runtime/0001-use-standard-arcade-publish.patch index 2b112c48e6cf..06986112dc3c 100644 --- a/src/SourceBuild/patches/runtime/0001-use-standard-arcade-publish.patch +++ b/src/SourceBuild/patches/runtime/0001-use-standard-arcade-publish.patch @@ -6,7 +6,7 @@ Subject: Publish dotnet/runtime using standard Arcade Publish tooling Backport: https://github.com/dotnet/runtime/pull/111934 --- diff --git a/Build.proj b/Build.proj -index 2f687610b4a..0957ae6846e 100644 +index 2f687610b4a93a..0957ae6846e573 100644 --- a/Build.proj +++ b/Build.proj @@ -1,6 +1,6 @@ @@ -18,7 +18,7 @@ index 2f687610b4a..0957ae6846e 100644 diff --git a/Directory.Build.props b/Directory.Build.props -index ce5c6e9173b..29771843752 100644 +index bff6874d7bbe4d..03f77f38f6dc4b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -17,39 +17,8 @@ @@ -63,7 +63,7 @@ index ce5c6e9173b..29771843752 100644 $(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion) @@ -190,7 +190,7 @@ index 75cfd1acb03..3ccab6c8aba 100644 diff --git a/eng/OSArch.props b/eng/OSArch.props new file mode 100644 -index 00000000000..d1be0745175 +index 00000000000000..d1be0745175825 --- /dev/null +++ b/eng/OSArch.props @@ -0,0 +1,35 @@ @@ -231,10 +231,10 @@ index 00000000000..d1be0745175 + \ No newline at end of file diff --git a/eng/Publishing.props b/eng/Publishing.props -index da3d606ed68..7072c278f83 100644 +index da3d606ed683c4..a68e020582b1de 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props -@@ -1,154 +1,107 @@ +@@ -1,154 +1,32 @@ - - + @@ -244,8 +244,8 @@ index da3d606ed68..7072c278f83 100644 false - - $(TargetArchitecture) -- -- + + - @@ -298,13 +298,19 @@ index da3d606ed68..7072c278f83 100644 - @(DownloadedWixPdbFile); - @(DownloadedWorkloadsVSInsertionFile); - @(DownloadedWixpackFile)" /> - +- -- ++ Mark host-RID-targeting assets as Vertical visibility when building in the VMR. ++ We can't use NETCoreSdkRuntimeIdentifier here as the Arcade SDK projects don't import the .NET SDK. ++ Instead, just make sure we include the assets targeting "not the output rid", which will catch the host assets. + --> ++ ++ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILAsm.*.nupkg" ++ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILAsm.*.nupkg" /> + - - -+ By default, we don't use the default artifacts settings for publishing (only for signing). -+ Every job will publish their RID-specific packages. -+ For non-RID-specific packages, we have various rules: ++ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILDAsm.*.nupkg" ++ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILDAsm.*.nupkg" /> - - -+ - A job can specify EnableDefaultArtifacts=true as a global property to publish all packages it produces. -+ We have specific jobs that produce RID-agnostic packages or packages for multiple RIDs set this property. -+ - For some target RIDs, we also include specific RID-agnostic packages. ++ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.DotNet.ILCompiler.*.nupkg" ++ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.DotNet.ILCompiler.*.nupkg" /> - - -+ VMR jobs control whether or not a vertical has EnableDefaultArtifacts set to true or false in DotNetBuild.props. ++ <_HostArtifact Include="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.*.nupkg" ++ Exclude="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.$(OutputRID).*.nupkg" /> - +- --> - -+ false -+ - +- - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ @@ -501,7 +426,7 @@ index da3d606ed68..7072c278f83 100644 @@ -522,7 +447,7 @@ index da3d606ed68..7072c278f83 100644 diff --git a/eng/RuntimeIdentifier.props b/eng/RuntimeIdentifier.props new file mode 100644 -index 00000000000..9ebd5e65194 +index 00000000000000..9ebd5e65194874 --- /dev/null +++ b/eng/RuntimeIdentifier.props @@ -0,0 +1,100 @@ @@ -628,20 +553,38 @@ index 00000000000..9ebd5e65194 + \ No newline at end of file diff --git a/eng/Signing.props b/eng/Signing.props -index c1ff2d8ba47..253ede751b4 100644 +index 12fc319128c6a6..a5b0869b43875d 100644 --- a/eng/Signing.props +++ b/eng/Signing.props -@@ -1,7 +1,6 @@ +@@ -1,6 +1,26 @@ -- -- false -- + + ++ + +- false ++ ++ false ++ true ++ false ++ ++ true + - -@@ -14,6 +13,9 @@ +@@ -14,6 +34,9 @@ @@ -651,26 +594,20 @@ index c1ff2d8ba47..253ede751b4 100644 -@@ -27,10 +29,10 @@ - - - -- - -@@ -45,30 +47,25 @@ - +@@ -47,37 +70,100 @@ + -- +- +- +- +- +- +- +- + - -+ ++ -- -\ No newline at end of file -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml -index 6bdd96038ac..6cbc0c09eed 100644 +index 6bdd96038acf75..6cbc0c09eeda37 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -52,6 +52,8 @@ jobs: @@ -741,7 +750,7 @@ index 6bdd96038ac..6cbc0c09eed 100644 diff --git a/eng/pipelines/common/macos-sign-with-entitlements.yml b/eng/pipelines/common/macos-sign-with-entitlements.yml deleted file mode 100644 -index 72a03b90f34..00000000000 +index 72a03b90f340d6..00000000000000 --- a/eng/pipelines/common/macos-sign-with-entitlements.yml +++ /dev/null @@ -1,77 +0,0 @@ @@ -823,10 +832,10 @@ index 72a03b90f34..00000000000 - targetFolder: '${{ file.path }}' - overWrite: true diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml -index db0ab302b43..d5f50ad4dfc 100644 +index 26b86483cd8e28..f88692190cc221 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml -@@ -28,7 +28,6 @@ parameters: +@@ -27,7 +27,6 @@ parameters: displayName: '' timeoutInMinutes: '' enableMicrobuild: '' @@ -835,7 +844,7 @@ index db0ab302b43..d5f50ad4dfc 100644 steps: diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml -index a822ccf28fd..1b1660693d6 100644 +index a822ccf28fd288..1b1660693d6e03 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests.yml @@ -11,7 +11,6 @@ parameters: @@ -847,7 +856,7 @@ index a822ccf28fd..1b1660693d6 100644 diff --git a/eng/pipelines/common/templates/runtimes/xplat-job.yml b/eng/pipelines/common/templates/runtimes/xplat-job.yml -index e22f8f968c4..3b7dfa334ed 100644 +index e22f8f968c4790..3b7dfa334ed259 100644 --- a/eng/pipelines/common/templates/runtimes/xplat-job.yml +++ b/eng/pipelines/common/templates/runtimes/xplat-job.yml @@ -18,7 +18,6 @@ parameters: @@ -872,7 +881,7 @@ index e22f8f968c4..3b7dfa334ed 100644 ${{ if ne(parameters.logsName, '') }}: diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml deleted file mode 100644 -index 1440a7a1dfd..00000000000 +index 1440a7a1dfdc35..00000000000000 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ /dev/null @@ -1,66 +0,0 @@ @@ -945,7 +954,7 @@ index 1440a7a1dfd..00000000000 \ No newline at end of file diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml deleted file mode 100644 -index 83b059ffc32..00000000000 +index 83b059ffc32a65..00000000000000 --- a/eng/pipelines/official/stages/publish.yml +++ /dev/null @@ -1,57 +0,0 @@ @@ -1007,7 +1016,7 @@ index 83b059ffc32..00000000000 - # Publish to blob storage. - publishInstallersAndChecksums: true diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml -index 03c4308e13a..e581348a11e 100644 +index 03c4308e13aebf..e581348a11eb80 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -72,6 +72,8 @@ extends: @@ -1444,493 +1453,3 @@ index 03c4308e13a..e581348a11e 100644 + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals 1es-windows-2022 + symbolPublishingAdditionalParameters: '/p:PublishSpecialClrFiles=true' -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 7072c278f83..1f986eff2e9 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -3,106 +3,8 @@ - true - - false -- -- -- false - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - -diff --git a/eng/Signing.props b/eng/Signing.props -index 253ede751b4..6c78a667bdd 100644 ---- a/eng/Signing.props -+++ b/eng/Signing.props -@@ -2,6 +2,23 @@ - - - -+ -+ -+ false -+ -+ - - - -@@ -68,4 +85,86 @@ - SubBlobFolder="workloads/" /> - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -diff --git a/eng/Signing.props b/eng/Signing.props -index 6c78a667bdd..18d123f01d4 100644 ---- a/eng/Signing.props -+++ b/eng/Signing.props -@@ -17,6 +17,10 @@ - Packages that do not meet the above rules are added with Vertical visibility in the VMR and excluded in non-VMR builds. - --> - false -+ true -+ false -+ -+ true - - - -@@ -57,14 +61,7 @@ - - - -- -- -- -- -- -- -- -- -+ - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -146,25 +168,6 @@ - Kind="Package" - Condition="'$(DotNetBuildOrchestrator)' == 'true'" /> - -- -- -- -- -- -- -- -- -- - - - -diff --git a/eng/Signing.props b/eng/Signing.props -index 18d123f01d4..746078a6cec 100644 ---- a/eng/Signing.props -+++ b/eng/Signing.props -@@ -115,6 +115,9 @@ - - - -+ - - - -diff --git a/eng/Signing.props b/eng/Signing.props -index 746078a6cec..5b6717e0eff 100644 ---- a/eng/Signing.props -+++ b/eng/Signing.props -@@ -18,7 +18,7 @@ - --> - false - true -- false -+ false - - true - -@@ -112,9 +112,9 @@ - IsShipping="false" /> - - -- -+ - -- -+ - -diff --git a/eng/Signing.props b/eng/Signing.props -index 5b6717e0eff..6b6b0d73a3c 100644 ---- a/eng/Signing.props -+++ b/eng/Signing.props -@@ -95,19 +95,24 @@ - - - -- -- -- -- -- -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILAsm.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILAsm.*.nupkg" /> -+ -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILDAsm.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILDAsm.*.nupkg" /> -+ -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.DotNet.ILCompiler.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.DotNet.ILCompiler.*.nupkg" /> -+ -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.$(OutputRID).*.nupkg" /> -+ -+ - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 1f986eff2e9..a68e020582b 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -5,6 +5,29 @@ - false - - -+ -+ -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILAsm.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILAsm.*.nupkg" /> -+ -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILDAsm.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILDAsm.*.nupkg" /> -+ -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.DotNet.ILCompiler.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.DotNet.ILCompiler.*.nupkg" /> -+ -+ <_HostArtifact Include="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.*.nupkg" -+ Exclude="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.$(OutputRID).*.nupkg" /> -+ -+ -+ -+ - - -diff --git a/eng/Signing.props b/eng/Signing.props -index 6b6b0d73a3c..f9bec2482b5 100644 ---- a/eng/Signing.props -+++ b/eng/Signing.props -@@ -93,30 +93,6 @@ - - For LLVM builds, we only publish LLVM-specific packages. - --> - -- -- -- -- <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILAsm.*.nupkg" -- Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILAsm.*.nupkg" /> -- -- <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILDAsm.*.nupkg" -- Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.NETCore.ILDAsm.*.nupkg" /> -- -- <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.DotNet.ILCompiler.*.nupkg" -- Exclude="$(ArtifactsPackagesDir)**\runtime.$(OutputRID).Microsoft.DotNet.ILCompiler.*.nupkg" /> -- -- <_HostArtifact Include="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.*.nupkg" -- Exclude="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.$(OutputRID).*.nupkg" /> -- -- -- -- - - - -@@ -125,7 +101,7 @@ - Kind="Package" /> - - -- -+ - - - -@@ -176,6 +152,8 @@ - Kind="Package" - Condition="'$(DotNetBuildOrchestrator)' == 'true'" /> - -+ -+ - - -