Skip to content

Commit e2a857c

Browse files
jkoritzinskyjkoritzinsky
authored
Remove the Shared Framework WixLib in favor of the MSI installer (dotnet#59351)
1 parent b2a83d4 commit e2a857c

File tree

9 files changed

+21
-160
lines changed

9 files changed

+21
-160
lines changed

‎AspNetCore.sln

-12
Original file line numberDiff line numberDiff line change
@@ -1594,8 +1594,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFramework", "src\Inst
15941594
EndProject
15951595
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkBundle", "src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj", "{D6C54D8B-043F-4877-B751-60E7390F9EC6}"
15961596
EndProject
1597-
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkLib", "src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj", "{5244BC49-2568-4701-80A6-EAB8950AB5FA}"
1598-
EndProject
15991597
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj", "{6F1B115C-1903-40CB-837D-7961AB610F4E}"
16001598
EndProject
16011599
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
97499747
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.Build.0 = Release|arm64
97509748
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x64.ActiveCfg = Release|arm64
97519749
{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x86.ActiveCfg = Release|arm64
9752-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|Any CPU.ActiveCfg = Debug|arm64
9753-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|arm64.ActiveCfg = Debug|arm64
9754-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|arm64.Build.0 = Debug|arm64
9755-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x64.ActiveCfg = Debug|arm64
9756-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x86.ActiveCfg = Debug|arm64
9757-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|Any CPU.ActiveCfg = Release|arm64
9758-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|arm64.ActiveCfg = Release|arm64
9759-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|arm64.Build.0 = Release|arm64
9760-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x64.ActiveCfg = Release|arm64
9761-
{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x86.ActiveCfg = Release|arm64
97629750
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|Any CPU.ActiveCfg = Debug|arm64
97639751
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.ActiveCfg = Debug|arm64
97649752
{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.Build.0 = Debug|arm64

‎eng/Build.props

+4-7
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,9 @@
253253
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x64" />
254254
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x86" />
255255
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=arm64" />
256-
257-
<!-- Build the SharedFramework wixlib -->
258-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x64" />
259-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x86" />
260-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />
256+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=x64" />
257+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=x86" />
258+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=arm64" />
261259

262260
<!-- Windows hosting bundle -->
263261
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
@@ -274,8 +272,7 @@
274272
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
275273
<!-- Build the SharedFramework installers -->
276274
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
277-
<!-- Build the SharedFramework wixlib -->
278-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
275+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
279276
</ItemGroup>
280277

281278
<ItemGroup Condition="'$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '2') and '$(TargetOsName)' == 'win' and '$(TargetArchitecture)' == 'x64'">

‎src/Installers/Windows/Installers.slnf

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"src\\Installers\\Windows\\AspNetCoreModule-Setup\\CustomAction\\aspnetcoreCA.vcxproj",
66
"src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\iisca\\lib\\iisca.vcxproj",
77
"src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\IIS-Common\\lib\\IISSetup.CommonLib.vcxproj",
8-
"src\\Installers\\Windows\\SharedFrameworkLib\\SharedFrameworkLib.wixproj",
8+
"src\\Installers\\Windows\\SharedFramework\\SharedFramework.wixproj",
99
"src\\Installers\\Windows\\SharedFrameworkBundle\\SharedFrameworkBundle.wixproj",
1010
"src\\Installers\\Windows\\WindowsHostingBundle\\WindowsHostingBundle.wixproj",
1111
"src\\Installers\\Windows\\SharedFramework\\SharedFramework.wixproj"

‎src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs

+5-7
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,11 @@
9494
<Variable Name="BundleNameFull" Value="$(var.BundleNameFull)"/>
9595

9696
<Chain>
97-
<?if $(var.Platform)=x86?>
98-
<PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>
99-
<?elseif $(var.Platform)=x64?>
100-
<PackageGroupRef Id="PG_AspNetCoreSharedFramework_x64"/>
101-
<?elseif $(var.Platform)=arm64?>
102-
<PackageGroupRef Id="PG_AspNetCoreSharedFramework_arm64"/>
103-
<?endif?>
97+
<MsiPackage Id="SharedFxRedist" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstaller)"
98+
Name="$(var.SharedFxRedistInstaller)"
99+
Compressed="yes"
100+
Vital="yes">
101+
</MsiPackage>
104102
</Chain>
105103
</Bundle>
106104
</Wix>

‎src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj

+10-33
Original file line numberDiff line numberDiff line change
@@ -33,39 +33,14 @@
3333
<Content Include="thm.xml" />
3434
</ItemGroup>
3535

36-
<Choose>
37-
<When Condition="'$(Platform)' == 'arm64'">
38-
<ItemGroup>
39-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=arm64">
40-
<Name>SharedFrameworkLib</Name>
41-
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
42-
<Private>True</Private>
43-
<DoNotHarvest>True</DoNotHarvest>
44-
</ProjectReference>
45-
</ItemGroup>
46-
</When>
47-
<Otherwise>
48-
<ItemGroup>
49-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
50-
SetPlatform="Platform=x86"
51-
Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x86'">
52-
<Name>SharedFrameworkLib</Name>
53-
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
54-
<Private>True</Private>
55-
<DoNotHarvest>True</DoNotHarvest>
56-
</ProjectReference>
57-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
58-
SetPlatform="Platform=x64"
59-
Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x64'">
60-
<Name>SharedFrameworkLib</Name>
61-
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
62-
<Private>True</Private>
63-
<DoNotHarvest>True</DoNotHarvest>
64-
</ProjectReference>
65-
</ItemGroup>
66-
</Otherwise>
67-
</Choose>
68-
36+
<ItemGroup>
37+
<ProjectReference Include="..\SharedFramework\SharedFramework.wixproj" SetPlatform="Platform=$(Platform)">
38+
<Name>SharedFramework</Name>
39+
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
40+
<Private>True</Private>
41+
<DoNotHarvest>True</DoNotHarvest>
42+
</ProjectReference>
43+
</ItemGroup>
6944

7045
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
7146

@@ -94,6 +69,8 @@
9469
<DefineConstants>$(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer)</DefineConstants>
9570
<DefineConstants>$(DefineConstants);BundleRegFamily=$(BundleRegFamily)</DefineConstants>
9671
<DefineConstants>$(DefineConstants);BundleRegName=$(BundleRegName)</DefineConstants>
72+
<DefineConstants>$(DefineConstants);InstallersOutputPath=$(InstallersOutputPath)</DefineConstants>
73+
<DefineConstants>$(DefineConstants);SharedFxRedistInstaller=$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform).msi</DefineConstants>
9774
</PropertyGroup>
9875

9976
</Project>

‎src/Installers/Windows/SharedFrameworkLib/Library.wxs

-35
This file was deleted.

‎src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj

-63
This file was deleted.

‎src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<Private>True</Private>
6262
<DoNotHarvest>true</DoNotHarvest>
6363
</ProjectReference>
64-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
64+
<ProjectReference Include="..\SharedFramework\SharedFramework.wixproj"
6565
Private="false"
6666
ReferenceOutputAssembly="false"
6767
SkipGetTargetFrameworkProperties="true" />

‎src/Installers/Windows/Wix.targets

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
</PropertyGroup>
4141

4242
<UsingTask TaskName="CreateLightCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
43-
<UsingTask TaskName="CreateLitCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
4443

4544
<Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />
4645

0 commit comments

Comments
 (0)