Skip to content

Commit 5e56818

Browse files
authored
Fix logic for .msi version in Hosting Bundle (#62147)
1 parent 05c5d65 commit 5e56818

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@
102102
<BundleNameShort>Microsoft .NET $(PackageBrandingVersion)</BundleNameShort>
103103
<SharedFxPackageVersion>$(PackageVersion)</SharedFxPackageVersion>
104104
<SharedFxMsiVersion>$(PackageVersion)</SharedFxMsiVersion>
105-
<SharedFxMsiVersion
106-
Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</SharedFxMsiVersion>
105+
<NonStableVersion>$(PackageVersion)</NonStableVersion>
106+
<NonStableVersion
107+
Condition="! $(NonStableVersion.Contains('$(_BuildNumberLabels)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</NonStableVersion>
107108
</PropertyGroup>
108109

109110
<PropertyGroup>
@@ -122,7 +123,7 @@
122123

123124
<!-- CrossArchitectureInstallerBasePath is a global property, so use a new property instead of modifying it -->
124125
<PropertyGroup Condition="'$(AddVersionToCrossArchitectureInstallerBasePath)' == 'true'">
125-
<CrossArchitectureInstallerBasePathNormalized>$([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime', '$(SharedFxMsiVersion)'))</CrossArchitectureInstallerBasePathNormalized>
126+
<CrossArchitectureInstallerBasePathNormalized>$([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime', '$(NonStableVersion)'))</CrossArchitectureInstallerBasePathNormalized>
126127
</PropertyGroup>
127128

128129
<PropertyGroup Condition="'$(AddVersionToCrossArchitectureInstallerBasePath)' != 'true'">

0 commit comments

Comments
 (0)