Skip to content

Commit a94848b

Browse files
wtgodbewtgodbe
authored
[release/6.0] Bundle runtime .MSI's instead of .exe's (#56632)
* Bundle runtime .MSI's instead of .exe's * Fixup * Fix again * fix download path * Update WindowsHostingBundle.wixproj
1 parent f3b2b05 commit a94848b

File tree

4 files changed

+92
-128
lines changed

4 files changed

+92
-128
lines changed

‎src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs

Lines changed: 41 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,56 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33
<Fragment>
4-
<util:ProductSearch Id="DotNetRedistLtsProductSearch_x86"
5-
Condition="NOT VersionNT64"
6-
ProductCode="$(var.DotNetRedistLtsInstallerProductCodex86)"
7-
Result="version"
8-
Variable="DotNetRedistLtsProductVersion_x86" />
9-
10-
<util:ProductSearch Id="DotNetRedistLtsProductSearch_x64"
11-
Condition="VersionNT64"
12-
ProductCode="$(var.DotNetRedistLtsInstallerProductCodex64)"
13-
Result="version"
14-
Variable="DotNetRedistLtsProductVersion_x64" />
15-
164
<PackageGroup Id="PG_DOTNET_REDIST_LTS_BUNDLE">
17-
<RollbackBoundary Id="RB_DOTNET_REDIST_LTS_BUNDLE" />
18-
5+
<RollbackBoundary Id="RB_DOTNET_REDIST_LTS_BUNDLE" />
6+
197
<!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
20-
<ExePackage Id="DotNetRedistLts_x64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistLtsInstallerx64)"
8+
<MsiPackage Id="DotNetRedistLts_x64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistLtsInstallerx64)"
219
Name="$(var.DotNetRedistLtsInstallerx64)"
2210
Compressed="yes"
2311
Vital="yes"
24-
InstallCondition="VersionNT64 AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)"
25-
InstallCommand="/quiet /norestart"
26-
RepairCommand="/quiet /norestart /repair"
27-
UninstallCommand="/quiet /norestart /uninstall"
28-
DetectCondition="DotNetRedistLtsProductVersion_x64 = v$(var.DotNetRedistLtsInstallerProductVersionx64)">
29-
</ExePackage>
12+
InstallCondition="VersionNT64 AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
13+
</MsiPackage>
3014

3115
<!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
32-
<ExePackage Id="DotNetRedistLts_x86" SourceFile="$(var.DepsPath)\$(var.DotNetRedistLtsInstallerx86)"
16+
<MsiPackage Id="DotNetRedistLts_x86" SourceFile="$(var.DepsPath)\$(var.DotNetRedistLtsInstallerx86)"
3317
Name="$(var.DotNetRedistLtsInstallerx86)"
3418
Compressed="yes"
3519
Vital="yes"
36-
InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)"
37-
InstallCommand="/quiet /norestart"
38-
RepairCommand="/quiet /norestart /repair"
39-
UninstallCommand="/quiet /norestart /uninstall"
40-
DetectCondition="DotNetRedistLtsProductVersion_x86 = v$(var.DotNetRedistLtsInstallerProductVersionx86)">
41-
</ExePackage>
20+
InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
21+
</MsiPackage>
22+
23+
<!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
24+
<MsiPackage Id="DotNetRedistHost_x64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostInstallerx64)"
25+
Name="$(var.DotNetRedistHostInstallerx64)"
26+
Compressed="yes"
27+
Vital="yes"
28+
InstallCondition="VersionNT64 AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
29+
</MsiPackage>
30+
31+
<!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
32+
<MsiPackage Id="DotNetRedistHost_x86" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostInstallerx86)"
33+
Name="$(var.DotNetRedistHostInstallerx86)"
34+
Compressed="yes"
35+
Vital="yes"
36+
InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
37+
</MsiPackage>
38+
39+
<!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
40+
<MsiPackage Id="DotNetRedistHostfxr_x64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostfxrInstallerx64)"
41+
Name="$(var.DotNetRedistHostfxrInstallerx64)"
42+
Compressed="yes"
43+
Vital="yes"
44+
InstallCondition="VersionNT64 AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
45+
</MsiPackage>
46+
47+
<!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
48+
<MsiPackage Id="DotNetRedistHostfxr_x86" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostfxrInstallerx86)"
49+
Name="$(var.DotNetRedistHostfxrInstallerx86)"
50+
Compressed="yes"
51+
Vital="yes"
52+
InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
53+
</MsiPackage>
4254
</PackageGroup>
4355
</Fragment>
44-
</Wix>
56+
</Wix>

‎src/Installers/Windows/WindowsHostingBundle/Product.targets

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,23 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<Platforms Include="x64;x86" />
11-
<RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe">
12-
<TargetPlatform>x64</TargetPlatform>
10+
<RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
1311
<BundleNameProperty>DotNetRedistLtsInstallerx64</BundleNameProperty>
14-
<Version>$(MicrosoftNETCoreAppRuntimeVersion)</Version>
1512
</RuntimeInstallers>
16-
<RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe">
17-
<TargetPlatform>x86</TargetPlatform>
13+
<RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
1814
<BundleNameProperty>DotNetRedistLtsInstallerx86</BundleNameProperty>
19-
<Version>$(MicrosoftNETCoreAppRuntimeVersion)</Version>
15+
</RuntimeInstallers>
16+
<RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
17+
<BundleNameProperty>DotNetRedistHostInstallerx64</BundleNameProperty>
18+
</RuntimeInstallers>
19+
<RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
20+
<BundleNameProperty>DotNetRedistHostInstallerx86</BundleNameProperty>
21+
</RuntimeInstallers>
22+
<RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
23+
<BundleNameProperty>DotNetRedistHostfxrInstallerx64</BundleNameProperty>
24+
</RuntimeInstallers>
25+
<RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
26+
<BundleNameProperty>DotNetRedistHostfxrInstallerx86</BundleNameProperty>
2027
</RuntimeInstallers>
2128
</ItemGroup>
2229

@@ -30,11 +37,23 @@
3037

3138
<!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for NETCoreApp. -->
3239
<ItemGroup>
33-
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe">
34-
<TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe</TargetFileName>
40+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
41+
<TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi</TargetFileName>
42+
</RemoteAsset>
43+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
44+
<TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi</TargetFileName>
45+
</RemoteAsset>
46+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
47+
<TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi</TargetFileName>
48+
</RemoteAsset>
49+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
50+
<TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi</TargetFileName>
3551
</RemoteAsset>
36-
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe">
37-
<TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe</TargetFileName>
52+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
53+
<TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi</TargetFileName>
54+
</RemoteAsset>
55+
<RemoteAsset Include="Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
56+
<TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi</TargetFileName>
3857
</RemoteAsset>
3958
</ItemGroup>
4059

@@ -54,38 +73,13 @@
5473
<Output TaskParameter="Value" PropertyName="%(RuntimeInstallers.BundleNameProperty)"/>
5574
</CreateProperty>
5675

57-
<!-- Decompile the bundles so that we can extract the MSI and read their version information. We need this to author ExePackage@DetectCondition
58-
in the bundles that chain the runtime bundles -->
59-
<Exec Command="$(DarkToolPath) -x $(DotNetDarkOutputPath)\%(RuntimeInstallers.Version)\%(TargetPlatform) %(Identity)" />
60-
61-
<ItemGroup>
62-
<DotNetPayload Include="$(DotNetDarkOutputPath)\$(MicrosoftNETCoreAppRuntimeVersion)\%(Platforms.Identity)\AttachedContainer\**\dotnet-host-*win-*.msi">
63-
<ProductVersionProperty>DotNetRedistLtsInstallerProductVersion%(Platforms.Identity)</ProductVersionProperty>
64-
<ProductCodeProperty>DotNetRedistLtsInstallerProductCode%(Platforms.Identity)</ProductCodeProperty>
65-
<UpgradeCodeProperty>DotNetRedistLtsInstallerUpgradeCode%(Platforms.Identity)</UpgradeCodeProperty>
66-
</DotNetPayload>
67-
</ItemGroup>
68-
69-
<!-- Read MSI properties -->
70-
<GetMsiProperty InstallPackage="%(DotNetPayload.Identity)" Property="ProductVersion">
71-
<Output TaskParameter="Value" PropertyName="%(ProductVersionProperty)" />
72-
</GetMsiProperty>
73-
<GetMsiProperty InstallPackage="%(DotNetPayload.Identity)" Property="ProductCode">
74-
<Output TaskParameter="Value" PropertyName="%(ProductCodeProperty)" />
75-
</GetMsiProperty>
76-
<GetMsiProperty InstallPackage="%(DotNetPayload.Identity)" Property="UpgradeCode">
77-
<Output TaskParameter="Value" PropertyName="%(UpgradeCodeProperty)" />
78-
</GetMsiProperty>
79-
8076
<PropertyGroup>
8177
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerx64=$(DotNetRedistLtsInstallerx64)</DefineConstants>
82-
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerProductVersionx64=$(DotNetRedistLtsInstallerProductVersionx64)</DefineConstants>
83-
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerProductCodex64=$(DotNetRedistLtsInstallerProductCodex64)</DefineConstants>
84-
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerUpgradeCodex64=$(DotNetRedistLtsInstallerUpgradeCodex64)</DefineConstants>
8578
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerx86=$(DotNetRedistLtsInstallerx86)</DefineConstants>
86-
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerProductVersionx86=$(DotNetRedistLtsInstallerProductVersionx86)</DefineConstants>
87-
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerProductCodex86=$(DotNetRedistLtsInstallerProductCodex86)</DefineConstants>
88-
<DefineConstants>$(DefineConstants);DotNetRedistLtsInstallerUpgradeCodex86=$(DotNetRedistLtsInstallerUpgradeCodex86)</DefineConstants>
79+
<DefineConstants>$(DefineConstants);DotNetRedistHostInstallerx64=$(DotNetRedistHostInstallerx64)</DefineConstants>
80+
<DefineConstants>$(DefineConstants);DotNetRedistHostInstallerx86=$(DotNetRedistHostInstallerx86)</DefineConstants>
81+
<DefineConstants>$(DefineConstants);DotNetRedistHostfxrInstallerx64=$(DotNetRedistHostfxrInstallerx64)</DefineConstants>
82+
<DefineConstants>$(DefineConstants);DotNetRedistHostfxrInstallerx86=$(DotNetRedistHostfxrInstallerx86)</DefineConstants>
8983
</PropertyGroup>
9084
</Target>
91-
</Project>
85+
</Project>

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

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
3-
<Fragment>
4-
<util:ProductSearch Id="SharedFxRedistProductSearch_x86"
5-
Condition="NOT VersionNT64"
6-
ProductCode="$(var.SharedFxInstallerProductCodex86)"
7-
Result="version"
8-
Variable="SharedFxRedistProductVersion_x86" />
9-
10-
<util:ProductSearch Id="SharedFxRedistProductSearch_x64"
11-
Condition="VersionNT64"
12-
ProductCode="$(var.SharedFxInstallerProductCodex64)"
13-
Result="version"
14-
Variable="SharedFxRedistProductVersion_x64" />
15-
3+
<Fragment>
164
<PackageGroup Id="PG_SHAREDFX_REDIST_BUNDLE">
175
<RollbackBoundary Id="RB_SHAREDFX_REDIST_BUNDLE" />
18-
6+
197
<!-- OPT_NO_SHAREDFX could be unset at this point, which we explicitly treat as 'false' -->
20-
<ExePackage Id="SharedFxRedist_x64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx64)"
8+
<MsiPackage Id="SharedFxRedist_x64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx64)"
219
Name="$(var.SharedFxRedistInstallerx64)"
2210
Compressed="yes"
2311
Vital="yes"
24-
InstallCondition="VersionNT64 AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)"
25-
InstallCommand="/quiet /norestart"
26-
RepairCommand="/quiet /norestart /repair"
27-
UninstallCommand="/quiet /norestart /uninstall"
28-
DetectCondition="SharedFxRedistProductVersion_x64 = v$(var.SharedFxInstallerProductVersionx64)">
29-
</ExePackage>
12+
InstallCondition="VersionNT64 AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)">
13+
</MsiPackage>
3014

3115
<!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
32-
<ExePackage Id="SharedFxRedist_x86" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx86)"
16+
<MsiPackage Id="SharedFxRedist_x86" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx86)"
3317
Name="$(var.SharedFxRedistInstallerx86)"
3418
Compressed="yes"
3519
Vital="yes"
36-
InstallCondition="(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)"
37-
InstallCommand="/quiet /norestart"
38-
RepairCommand="/quiet /norestart /repair"
39-
UninstallCommand="/quiet /norestart /uninstall"
40-
DetectCondition="SharedFxRedistProductVersion_x86 = v$(var.SharedFxInstallerProductVersionx86)">
41-
</ExePackage>
20+
InstallCondition="(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
21+
</MsiPackage>
22+
4223
</PackageGroup>
4324
</Fragment>
44-
</Wix>
25+
</Wix>

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

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
<Private>True</Private>
5555
<DoNotHarvest>true</DoNotHarvest>
5656
</ProjectReference>
57-
<ProjectReference Include="..\SharedFrameworkBundle\SharedFrameworkBundle.wixproj">
58-
<Private>True</Private>
59-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
60-
</ProjectReference>
57+
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
58+
Private="false"
59+
ReferenceOutputAssembly="false"
60+
SkipGetTargetFrameworkProperties="true" />
6161
<ProjectReference Include="..\HostOptions\HostOptions.wixproj">
6262
<Name>HostOptions</Name>
6363
<Project>20248cd1-c5aa-4f42-ad88-bc260d64deea</Project>
@@ -97,12 +97,12 @@
9797
</PropertyGroup>
9898

9999
<ItemGroup>
100-
<SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxPackageVersion)-win-x64.exe">
100+
<SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x64.msi">
101101
<TargetPlatform>x64</TargetPlatform>
102102
<BundleNameProperty>SharedFxRedistInstallerx64</BundleNameProperty>
103103
<Version>$(SharedFxPackageVersion)</Version>
104104
</SharedFxInstallers>
105-
<SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxPackageVersion)-win-x86.exe">
105+
<SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x86.msi">
106106
<TargetPlatform>x86</TargetPlatform>
107107
<BundleNameProperty>SharedFxRedistInstallerx86</BundleNameProperty>
108108
<Version>$(SharedFxPackageVersion)</Version>
@@ -128,32 +128,9 @@
128128
<Output TaskParameter="Value" PropertyName="%(SharedFxInstallers.BundleNameProperty)"/>
129129
</CreateProperty>
130130

131-
<ItemGroup>
132-
<SharedFxPayload Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x64.msi">
133-
<ProductVersionProperty>SharedFxInstallerProductVersionx64</ProductVersionProperty>
134-
<ProductCodeProperty>SharedFxInstallerProductCodex64</ProductCodeProperty>
135-
</SharedFxPayload>
136-
<SharedFxPayload Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x86.msi">
137-
<ProductVersionProperty>SharedFxInstallerProductVersionx86</ProductVersionProperty>
138-
<ProductCodeProperty>SharedFxInstallerProductCodex86</ProductCodeProperty>
139-
</SharedFxPayload>
140-
</ItemGroup>
141-
142-
<!-- Read MSI properties -->
143-
<GetMsiProperty InstallPackage="%(SharedFxPayload.Identity)" Property="ProductVersion">
144-
<Output TaskParameter="Value" PropertyName="%(ProductVersionProperty)" />
145-
</GetMsiProperty>
146-
<GetMsiProperty InstallPackage="%(SharedFxPayload.Identity)" Property="ProductCode">
147-
<Output TaskParameter="Value" PropertyName="%(ProductCodeProperty)" />
148-
</GetMsiProperty>
149-
150131
<PropertyGroup>
151132
<DefineConstants>$(DefineConstants);SharedFxRedistInstallerx64=$(SharedFxRedistInstallerx64)</DefineConstants>
152-
<DefineConstants>$(DefineConstants);SharedFxInstallerProductVersionx64=$(SharedFxInstallerProductVersionx64)</DefineConstants>
153-
<DefineConstants>$(DefineConstants);SharedFxInstallerProductCodex64=$(SharedFxInstallerProductCodex64)</DefineConstants>
154133
<DefineConstants>$(DefineConstants);SharedFxRedistInstallerx86=$(SharedFxRedistInstallerx86)</DefineConstants>
155-
<DefineConstants>$(DefineConstants);SharedFxInstallerProductVersionx86=$(SharedFxInstallerProductVersionx86)</DefineConstants>
156-
<DefineConstants>$(DefineConstants);SharedFxInstallerProductCodex86=$(SharedFxInstallerProductCodex86)</DefineConstants>
157134
</PropertyGroup>
158135
</Target>
159136
</Project>

0 commit comments

Comments
 (0)