|
10 | 10 | AboutUrl="https://dotnet.github.io/"
|
11 | 11 | Compressed="yes">
|
12 | 12 |
|
13 |
| - <bal:Condition Message="The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X64]""> |
| 13 | + <bal:Condition Message="The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]""> |
14 | 14 | WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
|
15 | 15 | </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?> |
18 | 19 | <!-- "Preview 1" 3.0.100-preview-009812-win-x86 upgrade-code -->
|
19 | 20 | <RelatedBundle Action="Upgrade" Id="{489A47A1-5D69-51F1-3D54-3F8FE92E0963}"/>
|
20 | 21 | <!-- "Preview 2" 3.0.100-preview-010184-win-x86 upgrade-code -->
|
21 | 22 | <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?> |
23 | 25 | <!-- "Preview 1" 3.0.100-preview-009812-win-x64 upgrade-code -->
|
24 | 26 | <RelatedBundle Action="Upgrade" Id="{18D28236-562F-73EB-340C-2B4B3A5347BB}"/>
|
25 | 27 | <!-- "Preview 2" 3.0.100-preview-010184-win-x64 upgrade-code -->
|
26 | 28 | <RelatedBundle Action="Upgrade" Id="{B47FC45A-5547-64E8-CFD1-B4C5CA275757}"/>
|
27 | 29 | <?endif?>
|
28 |
| - |
| 30 | + <!-- ********************************************************************************** --> |
| 31 | + |
29 | 32 | <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
|
30 | 33 | <bal:WixStandardBootstrapperApplication
|
31 | 34 | LicenseFile="dummyeula.rtf"
|
|
92 | 95 | Path="[ProgramFiles64Folder]dotnet"/>
|
93 | 96 |
|
94 | 97 | <!--
|
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 |
96 | 99 | both "DOTNETHOME_X86" and "DOTNETHOME_X64" should be used on the commandline and should take this convention:
|
97 | 100 | DOTNETHOME_X86=<InstallFolder>\x86
|
98 | 101 | DOTNETHOME_X64=<InstallFolder>\x64
|
|
0 commit comments