Skip to content

Commit 34f808c

Browse files
jkoritzinskyjkoritzinsky
committed
Remove the shared framework wixlib. Depends on dotnet/sdk#45346 
1 parent 75b48ac commit 34f808c

File tree

9 files changed

+43
-132
lines changed

9 files changed

+43
-132
lines changed

‎AspNetCore.sln‎

Lines changed: 0 additions & 12 deletions
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‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,9 @@
250250
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x64" />
251251
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x86" />
252252
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=arm64" />
253-
254-
<!-- Build the SharedFramework wixlib -->
255-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x64" />
256-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x86" />
257-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />
253+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=x64" />
254+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=x86" />
255+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=arm64" />
258256

259257
<!-- Windows hosting bundle -->
260258
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
@@ -271,8 +269,7 @@
271269
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
272270
<!-- Build the SharedFramework installers -->
273271
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
274-
<!-- Build the SharedFramework wixlib -->
275-
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
272+
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\SharedFramework\SharedFramework.wixproj" AdditionalProperties="Platform=$(TargetArchitecture)" />
276273
</ItemGroup>
277274

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

‎src/Installers/Windows/Installers.slnf‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,7 @@
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+
<PackageGroupRef Id="PG_SHAREDFX_REDIST_BUNDLE"/>
10498
</Chain>
10599
</Bundle>
106100
</Wix>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
3+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
4+
<Fragment>
5+
<PackageGroup Id="PG_SHAREDFX_REDIST_BUNDLE">
6+
<RollbackBoundary Id="RB_SHAREDFX_REDIST_BUNDLE" />
7+
8+
<?if $(var.Platform)=x86?>
9+
<MsiPackage Id="SharedFxRedist_x86" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx86)"
10+
Name="$(var.SharedFxRedistInstallerx86)"
11+
Compressed="yes"
12+
Vital="yes">
13+
</MsiPackage>
14+
<?elseif $(var.Platform)=x64?>
15+
<MsiPackage Id="SharedFxRedist_x64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx64)"
16+
Name="$(var.SharedFxRedistInstallerx64)"
17+
Compressed="yes"
18+
Vital="yes">
19+
</MsiPackage>
20+
<?elseif $(var.Platform)=arm64?>
21+
<MsiPackage Id="SharedFxRedist_arm64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerarm64)"
22+
Name="$(var.SharedFxRedistInstallerarm64)"
23+
Compressed="yes"
24+
Vital="yes">
25+
</MsiPackage>
26+
<?endif?>
27+
</PackageGroup>
28+
</Fragment>
29+
</Wix>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@
2929

3030
<ItemGroup>
3131
<Compile Include="Bundle.wxs" />
32+
<Compile Include="SharedFramework.wxs" />
3233
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs" />
3334
<Content Include="thm.xml" />
3435
</ItemGroup>
3536

3637
<Choose>
3738
<When Condition="'$(Platform)' == 'arm64'">
3839
<ItemGroup>
39-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=arm64">
40-
<Name>SharedFrameworkLib</Name>
40+
<ProjectReference Include="..\SharedFramework\SharedFramework.wixproj" SetPlatform="Platform=arm64">
41+
<Name>SharedFramework</Name>
4142
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
4243
<Private>True</Private>
4344
<DoNotHarvest>True</DoNotHarvest>
@@ -46,18 +47,18 @@
4647
</When>
4748
<Otherwise>
4849
<ItemGroup>
49-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
50+
<ProjectReference Include="..\SharedFramework\SharedFramework.wixproj"
5051
SetPlatform="Platform=x86"
5152
Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x86'">
52-
<Name>SharedFrameworkLib</Name>
53+
<Name>SharedFramework</Name>
5354
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
5455
<Private>True</Private>
5556
<DoNotHarvest>True</DoNotHarvest>
5657
</ProjectReference>
57-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
58+
<ProjectReference Include="..\SharedFramework\SharedFramework.wixproj"
5859
SetPlatform="Platform=x64"
5960
Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x64'">
60-
<Name>SharedFrameworkLib</Name>
61+
<Name>SharedFramework</Name>
6162
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
6263
<Private>True</Private>
6364
<DoNotHarvest>True</DoNotHarvest>

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 0 additions & 63 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
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" />

0 commit comments

Comments
 (0)