Skip to content

Commit a3f460b

Browse files
committed
Pass the full path to the sharedfx installers instead of just the file name
1 parent 728358d commit a3f460b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
4-
<Fragment>
4+
<Fragment>
55
<PackageGroup Id="PG_SHAREDFX_REDIST_BUNDLE">
66
<RollbackBoundary Id="RB_SHAREDFX_REDIST_BUNDLE" />
77

88
<!-- OPT_NO_SHAREDFX could be unset at this point, which we explicitly treat as 'false' -->
9-
<MsiPackage Id="SharedFxRedist_arm64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerarm64)"
9+
<MsiPackage Id="SharedFxRedist_arm64" SourceFile="$(var.SharedFxRedistInstallerarm64)"
1010
Name="$(var.SharedFxRedistInstallerarm64)"
1111
Compressed="yes"
1212
Vital="yes"
1313
InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)">
1414
</MsiPackage>
15-
15+
1616
<!-- OPT_NO_SHAREDFX could be unset at this point, which we explicitly treat as 'false' -->
17-
<MsiPackage Id="SharedFxRedist_x64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx64)"
17+
<MsiPackage Id="SharedFxRedist_x64" SourceFile="$(var.SharedFxRedistInstallerx64)"
1818
Name="$(var.SharedFxRedistInstallerx64)"
1919
Compressed="yes"
2020
Vital="yes"
2121
InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)">
2222
</MsiPackage>
2323

2424
<!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
25-
<MsiPackage Id="SharedFxRedist_x86" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx86)"
25+
<MsiPackage Id="SharedFxRedist_x86" SourceFile="$(var.SharedFxRedistInstallerx86)"
2626
Name="$(var.SharedFxRedistInstallerx86)"
2727
Compressed="yes"
2828
Vital="yes"
2929
InstallCondition="(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
3030
</MsiPackage>
31-
31+
3232
</PackageGroup>
3333
</Fragment>
3434
</Wix>

src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@
130130
</PropertyGroup>
131131

132132
<Target Name="ExtractPropertiesFromSharedFxMsi" DependsOnTargets="FetchDependencies" AfterTargets="ResolveProjectReferences">
133-
<!-- Create properties that holds the executable name. These are passed to the bundles so we can reference them as variables
133+
<!-- Create properties that holds the executable path. These are passed to the bundles so we can reference them as variables
134134
from inside the ExePackage authoring. -->
135-
<CreateProperty Value="%(SharedFxInstallers.Filename)%(Extension)">
135+
<CreateProperty Value="%(SharedFxInstallers.Identity)">
136136
<Output TaskParameter="Value" PropertyName="%(SharedFxInstallers.BundleNameProperty)"/>
137137
</CreateProperty>
138138

0 commit comments

Comments
 (0)