File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
src/Installers/Windows/WindowsHostingBundle Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 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),
Original file line number Diff line number Diff line change 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 >
You can’t perform that action at this time.
0 commit comments