Skip to content

Commit 6a324be

Browse files
author
John Beisner
committed
Condition the upgradability of 3.0.100 Preview 1 and Preview 2 on the upgrade-code being that of '3.0.1xx'.
1 parent 27aca2d commit 6a324be

File tree

1 file changed

+9
-6
lines changed
  • src/redist/targets/packaging/windows/clisdk

1 file changed

+9
-6
lines changed

src/redist/targets/packaging/windows/clisdk/bundle.wxs

+9-6
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,25 @@
1010
AboutUrl="https://dotnet.github.io/"
1111
Compressed="yes">
1212

13-
<bal:Condition Message="The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X64]&quot;">
13+
<bal:Condition Message="The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;">
1414
WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
1515
</bal:Condition>
16-
17-
<?if $(var.Platform)=x86?>
16+
17+
<!-- ***** When the product-band version: "3.0.1xx" advances, remove this section ***** -->
18+
<?if $(var.Platform)~=x86 AND $(var.UpgradeCode)~=EDA4A0C5-5878-407C-F3CC-14834F1F2949?>
1819
<!-- "Preview 1" 3.0.100-preview-009812-win-x86 upgrade-code -->
1920
<RelatedBundle Action="Upgrade" Id="{489A47A1-5D69-51F1-3D54-3F8FE92E0963}"/>
2021
<!-- "Preview 2" 3.0.100-preview-010184-win-x86 upgrade-code -->
2122
<RelatedBundle Action="Upgrade" Id="{C1DD86C1-5FE4-573E-63FF-6BD0F23EBE69}"/>
22-
<?elseif $(var.Platform)=x64?>
23+
<?endif?>
24+
<?if $(var.Platform)~=x64 AND $(var.UpgradeCode)~=EE5DCFFE-5B0A-6020-1C66-78E351B6C727?>
2325
<!-- "Preview 1" 3.0.100-preview-009812-win-x64 upgrade-code -->
2426
<RelatedBundle Action="Upgrade" Id="{18D28236-562F-73EB-340C-2B4B3A5347BB}"/>
2527
<!-- "Preview 2" 3.0.100-preview-010184-win-x64 upgrade-code -->
2628
<RelatedBundle Action="Upgrade" Id="{B47FC45A-5547-64E8-CFD1-B4C5CA275757}"/>
2729
<?endif?>
28-
30+
<!-- ********************************************************************************** -->
31+
2932
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
3033
<bal:WixStandardBootstrapperApplication
3134
LicenseFile="dummyeula.rtf"
@@ -92,7 +95,7 @@
9295
Path="[ProgramFiles64Folder]dotnet"/>
9396

9497
<!--
95-
When installing the SDK bundle to a custom location using the commandline parameters, it is intended that
98+
When installing the SDK bundle to a custom location using the commandline parameters, it is intended, not mandatory, that
9699
both "DOTNETHOME_X86" and "DOTNETHOME_X64" should be used on the commandline and should take this convention:
97100
DOTNETHOME_X86=<InstallFolder>\x86
98101
DOTNETHOME_X64=<InstallFolder>\x64

0 commit comments

Comments
 (0)