Skip to content

Commit 0aeb69f

Browse files
committed
Add a hook for the location of installers passed from phase 1 into phase 2
1 parent dc3490a commit 0aeb69f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@
247247
<!-- Allow overriding the public base URL for Unified Build scenarios to pull assets from a local build. -->
248248
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://dotnetbuilds.azureedge.net/public/</PublicBaseURL>
249249
<InternalBaseURL>https://dotnetbuilds.azureedge.net/internal/</InternalBaseURL>
250+
<!-- Allow overriding where installers are pulled in from previously completed jobs in Unified Build scenarios. -->
251+
<CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(InstallersOutputPath)</CrossArchitectureInstallerBasePath>
250252
</PropertyGroup>
251253

252254
<!-- Try various places to find the runtime. It's either released (use official version),

src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,17 @@
104104
</PropertyGroup>
105105

106106
<ItemGroup>
107-
<SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x64.msi">
107+
<SharedFxInstallers Include="$(CrossArchitectureInstallerBasePath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x64.msi">
108108
<TargetPlatform>x64</TargetPlatform>
109109
<BundleNameProperty>SharedFxRedistInstallerx64</BundleNameProperty>
110110
<Version>$(SharedFxPackageVersion)</Version>
111111
</SharedFxInstallers>
112-
<SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x86.msi">
112+
<SharedFxInstallers Include="$(CrossArchitectureInstallerBasePath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x86.msi">
113113
<TargetPlatform>x86</TargetPlatform>
114114
<BundleNameProperty>SharedFxRedistInstallerx86</BundleNameProperty>
115115
<Version>$(SharedFxPackageVersion)</Version>
116116
</SharedFxInstallers>
117-
<SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-arm64.msi">
117+
<SharedFxInstallers Include="$(CrossArchitectureInstallerBasePath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-arm64.msi">
118118
<TargetPlatform>arm64</TargetPlatform>
119119
<BundleNameProperty>SharedFxRedistInstallerarm64</BundleNameProperty>
120120
<Version>$(SharedFxPackageVersion)</Version>

0 commit comments

Comments
 (0)