diff --git a/eng/Subsets.props b/eng/Subsets.props
index f9bde27cb9777..f26f40c7d7a05 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -35,14 +35,24 @@
<_subset Condition="'$(Subset)' == ''">+$(DefaultSubsets)+
+
+
+ CoreCLR
+ Mono
+
+
Mono
Mono
- CoreCLR
+ $(PrimaryRuntimeFlavor)
clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages
+
+ clr.iltools+clr.packages
mono.llvm+
mono.llvm+
@@ -58,8 +68,8 @@
host.native+host.tools
$(DefaultHostSubsets)+host.pkg+host.tests
-
- host.native
+
+ host.native
packs.product
$(DefaultPacksSubsets)+packs.tests
@@ -225,7 +235,7 @@
-
+
@@ -317,16 +327,16 @@
-
+
-
-
-
+
+
+
-
+
diff --git a/src/coreclr/.nuget/coreclr-packages.proj b/src/coreclr/.nuget/coreclr-packages.proj
index 1347e06d5ff0a..5d6391b6124e2 100644
--- a/src/coreclr/.nuget/coreclr-packages.proj
+++ b/src/coreclr/.nuget/coreclr-packages.proj
@@ -5,12 +5,15 @@
-
+
-
+
+
+
+
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
index 73768455ceddc..8f078c7c1bb6e 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
@@ -6,13 +6,15 @@
-
+
+
+
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets
index c570a22277456..61c12cb71a854 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets
@@ -8,7 +8,7 @@
-
+
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj
index ab948eb5ddbae..f32e7eb5e853b 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj
@@ -2,7 +2,7 @@
- true
+ true
AppHostPack
true
dotnet-apphost-pack
@@ -21,13 +21,15 @@
-
+
+
+
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
index 3fe16b05bacc0..87aaf9d263ced 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
@@ -15,7 +15,7 @@
The .NET Shared Framework
-
+
Mono
diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
index c69491f5044a0..90f8d4ad2a28f 100644
--- a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
+++ b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
@@ -5,7 +5,7 @@
Name, used to generate the bundle upgrade code. Must stay the same to allow bundles in a given
product band to upgrade in place.
-->
- true
+ true
false
.NET Core Shared Framework Bundle Installer
$(MSBuildProjectDirectory)
diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj
index 0963a7b89d8cc..953b0f4f8522f 100644
--- a/src/installer/pkg/sfx/installers/dotnet-host.proj
+++ b/src/installer/pkg/sfx/installers/dotnet-host.proj
@@ -1,6 +1,6 @@
- true
+ true
true
dotnet-host
dotnet-host-internal
diff --git a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
index 0edd1eaa9853d..2c5fa5d818886 100644
--- a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
+++ b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
@@ -1,6 +1,6 @@
- true
+ true
true
dotnet-hostfxr-internal
dotnet-hostfxr
diff --git a/src/libraries/pkg/Directory.Build.props b/src/libraries/pkg/Directory.Build.props
index d31c32ee6470c..f1bb5ff9c315d 100644
--- a/src/libraries/pkg/Directory.Build.props
+++ b/src/libraries/pkg/Directory.Build.props
@@ -11,7 +11,7 @@
-
+