diff --git a/AspNetCore.sln b/AspNetCore.sln
index c7d7ef51fe8c..a7e53d11339a 100644
--- a/AspNetCore.sln
+++ b/AspNetCore.sln
@@ -1594,8 +1594,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFramework", "src\Inst
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkBundle", "src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj", "{D6C54D8B-043F-4877-B751-60E7390F9EC6}"
EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkLib", "src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj", "{5244BC49-2568-4701-80A6-EAB8950AB5FA}"
-EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj", "{6F1B115C-1903-40CB-837D-7961AB610F4E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "src\Servers\testassets\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}"
@@ -9749,16 +9747,6 @@ Global
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.Build.0 = Release|arm64
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x64.ActiveCfg = Release|arm64
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x86.ActiveCfg = Release|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|Any CPU.ActiveCfg = Debug|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|arm64.ActiveCfg = Debug|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|arm64.Build.0 = Debug|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x64.ActiveCfg = Debug|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x86.ActiveCfg = Debug|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|Any CPU.ActiveCfg = Release|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|arm64.ActiveCfg = Release|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|arm64.Build.0 = Release|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x64.ActiveCfg = Release|arm64
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x86.ActiveCfg = Release|arm64
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|Any CPU.ActiveCfg = Debug|arm64
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.ActiveCfg = Debug|arm64
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.Build.0 = Debug|arm64
diff --git a/eng/Build.props b/eng/Build.props
index 7828cca4419c..1a9072da9eed 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -250,11 +250,9 @@
-
-
-
-
-
+
+
+
@@ -271,8 +269,7 @@
-
-
+
diff --git a/src/Installers/Windows/Installers.slnf b/src/Installers/Windows/Installers.slnf
index 58edd65f7da2..55f11fa4d9cc 100644
--- a/src/Installers/Windows/Installers.slnf
+++ b/src/Installers/Windows/Installers.slnf
@@ -5,7 +5,7 @@
"src\\Installers\\Windows\\AspNetCoreModule-Setup\\CustomAction\\aspnetcoreCA.vcxproj",
"src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\iisca\\lib\\iisca.vcxproj",
"src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\IIS-Common\\lib\\IISSetup.CommonLib.vcxproj",
- "src\\Installers\\Windows\\SharedFrameworkLib\\SharedFrameworkLib.wixproj",
+ "src\\Installers\\Windows\\SharedFramework\\SharedFramework.wixproj",
"src\\Installers\\Windows\\SharedFrameworkBundle\\SharedFrameworkBundle.wixproj",
"src\\Installers\\Windows\\WindowsHostingBundle\\WindowsHostingBundle.wixproj",
"src\\Installers\\Windows\\SharedFramework\\SharedFramework.wixproj"
diff --git a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
index 52e85b9a96ce..a685b4d50787 100644
--- a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
+++ b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
@@ -94,13 +94,11 @@
-
-
-
-
-
-
-
+
+
diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
index a0782dea7539..d363eea36be0 100644
--- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
+++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
@@ -33,39 +33,14 @@
-
-
-
-
- SharedFrameworkLib
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}
- True
- True
-
-
-
-
-
-
- SharedFrameworkLib
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}
- True
- True
-
-
- SharedFrameworkLib
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}
- True
- True
-
-
-
-
-
+
+
+ SharedFramework
+ {5244BC49-2568-4701-80A6-EAB8950AB5FA}
+ True
+ True
+
+
@@ -94,6 +69,8 @@
$(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer)
$(DefineConstants);BundleRegFamily=$(BundleRegFamily)
$(DefineConstants);BundleRegName=$(BundleRegName)
+ $(DefineConstants);InstallersOutputPath=$(InstallersOutputPath)
+ $(DefineConstants);SharedFxRedistInstaller=$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform).msi
diff --git a/src/Installers/Windows/SharedFrameworkLib/Library.wxs b/src/Installers/Windows/SharedFrameworkLib/Library.wxs
deleted file mode 100644
index 26a9d2cbca57..000000000000
--- a/src/Installers/Windows/SharedFrameworkLib/Library.wxs
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
deleted file mode 100644
index 38742baf5847..000000000000
--- a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
- AspNetCoreSharedFrameworkLib$(Platform)
- $(Name)
-
-
- true
- Library
- true
- $(SharedFrameworkNamespaceGuid)
- {5244BC49-2568-4701-80A6-EAB8950AB5FA}
- 2.0
-
-
-
-
- $(WixExtDir)\WixBalExtension.dll
- WixBalExtension
-
-
-
-
-
-
-
-
-
- {C681D730-4505-42C6-9E6C-87F757C4FB32}
- SharedFramework
- True
- true
-
-
-
-
-
-
- $(RuntimeInstallerBaseName)-internal-$(PackageVersion)-win-$(Platform)$(TargetExt)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
index 50f3607c55bd..9c22d171a3d8 100644
--- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
+++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
@@ -61,7 +61,7 @@
True
true
-
diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index dd990c7f75e4..47a17c955f7c 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -40,7 +40,6 @@
-