Remove the Shared Framework WixLib in favor of the MSI installer (dot…

…net#59351)
ks1990cn · Dec 8, 2024 · e2a857c · e2a857c
1 parent b2a83d4
commit e2a857c
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 160 deletions.
diff --git 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
@@ -253,11 +253,9 @@
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x64" />
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x86" />
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=arm64" />
-
-        <!-- Build the SharedFramework wixlib -->
-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x64" />
-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x86" />
-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=x64" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=x86" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=arm64" />
 
         <!-- Windows hosting bundle -->
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
@@ -274,8 +272,7 @@
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
         <!-- Build the SharedFramework installers -->
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
-        <!-- Build the SharedFramework wixlib -->
-        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
       </ItemGroup>
 
       <ItemGroup Condition="'$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '2') and '$(TargetOsName)' == 'win' and '$(TargetArchitecture)' == 'x64'">

diff --git 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
@@ -94,13 +94,11 @@
         <Variable Name="BundleNameFull" Value="$(var.BundleNameFull)"/>
 
         <Chain>
-            <?if $(var.Platform)=x86?>
-            <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>
-            <?elseif $(var.Platform)=x64?>
-            <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x64"/>
-            <?elseif $(var.Platform)=arm64?>
-            <PackageGroupRef Id="PG_AspNetCoreSharedFramework_arm64"/>
-            <?endif?>
+            <MsiPackage Id="SharedFxRedist" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstaller)"
+                        Name="$(var.SharedFxRedistInstaller)"
+                        Compressed="yes"
+                        Vital="yes">
+            </MsiPackage>
         </Chain>
     </Bundle>
 </Wix>
diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
@@ -33,39 +33,14 @@
     <Content Include="thm.xml" />
   </ItemGroup>
 
-  <Choose>
-    <When Condition="'$(Platform)' == 'arm64'">
-      <ItemGroup>
-        <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=arm64">
-          <Name>SharedFrameworkLib</Name>
-          <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
-          <Private>True</Private>
-          <DoNotHarvest>True</DoNotHarvest>
-        </ProjectReference>
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
-                          SetPlatform="Platform=x86"
-                          Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x86'">
-          <Name>SharedFrameworkLib</Name>
-          <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
-          <Private>True</Private>
-          <DoNotHarvest>True</DoNotHarvest>
-        </ProjectReference>
-        <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
-                          SetPlatform="Platform=x64"
-                          Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x64'">
-          <Name>SharedFrameworkLib</Name>
-          <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
-          <Private>True</Private>
-          <DoNotHarvest>True</DoNotHarvest>
-        </ProjectReference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-
+  <ItemGroup>
+    <ProjectReference Include="..\SharedFramework\SharedFramework.wixproj" SetPlatform="Platform=$(Platform)">
+      <Name>SharedFramework</Name>
+      <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+    </ProjectReference>
+  </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
@@ -94,6 +69,8 @@
     <DefineConstants>$(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer)</DefineConstants>
     <DefineConstants>$(DefineConstants);BundleRegFamily=$(BundleRegFamily)</DefineConstants>
     <DefineConstants>$(DefineConstants);BundleRegName=$(BundleRegName)</DefineConstants>
+    <DefineConstants>$(DefineConstants);InstallersOutputPath=$(InstallersOutputPath)</DefineConstants>
+    <DefineConstants>$(DefineConstants);SharedFxRedistInstaller=$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform).msi</DefineConstants>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Installers/Windows/SharedFrameworkLib/Library.wxs b/src/Installers/Windows/SharedFrameworkLib/Library.wxs
diff --git a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
@@ -61,7 +61,7 @@
       <Private>True</Private>
       <DoNotHarvest>true</DoNotHarvest>
     </ProjectReference>
-    <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
+    <ProjectReference Include="..\SharedFramework\SharedFramework.wixproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />

diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
@@ -40,7 +40,6 @@
   </PropertyGroup>
 
   <UsingTask TaskName="CreateLightCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
-  <UsingTask TaskName="CreateLitCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
 
   <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />