WiX: avoid using extended versioning on the MSIs

Avoid semver on Packages and in max version property

Author: tristanlabelle

platforms/Windows/Directory.Build.props

@@ -89,6 +89,7 @@
       $(DefineConstants);
       ProductArchitecture=$(ProductArchitecture);
       ProductVersion=$(ProductVersion);
+      NonSemVerProductVersion=$(NonSemVerProductVersion);
       MajorMinorProductVersion=$(MajorMinorProductVersion);
       PackageScope=$(PackageScope);
       IsBundleCompressed=$(IsBundleCompressed);

platforms/Windows/bld/bld.wxs

@@ -11,7 +11,7 @@
       Manufacturer="!(loc.ManufacturerName)"
       Name="!(loc.Bld_ProductName)"
       UpgradeCode="$(BldUpgradeCode)"
-      Version="$(ProductVersion)"
+      Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
     <Media Id="1" Cabinet="bld.cab" EmbedCab="$(ArePackageCabsEmbedded)" />

platforms/Windows/cli/cli.wxs

@@ -4,7 +4,7 @@
       Manufacturer="!(loc.ManufacturerName)"
       Name="!(loc.Cli_ProductName)"
       UpgradeCode="$(CliUpgradeCode)"
-      Version="$(ProductVersion)"
+      Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
     <Media Id="1" Cabinet="cli.cab" EmbedCab="$(ArePackageCabsEmbedded)" />

platforms/Windows/dbg/dbg.wxs

@@ -4,7 +4,7 @@
       Manufacturer="!(loc.ManufacturerName)"
       Name="!(loc.Dbg_ProductName)"
       UpgradeCode="$(DbgUpgradeCode)"
-      Version="$(ProductVersion)"
+      Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
     <Media Id="1" Cabinet="dbg.cab" EmbedCab="$(ArePackageCabsEmbedded)" />

platforms/Windows/ide/ide.wxs

@@ -4,7 +4,7 @@
       Manufacturer="!(loc.ManufacturerName)"
       Name="!(loc.Ide_ProductName)"
       UpgradeCode="$(IdeUpgradeCode)"
-      Version="$(ProductVersion)"
+      Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
     <Media Id="1" Cabinet="ide.cab" EmbedCab="$(ArePackageCabsEmbedded)" />

platforms/Windows/rtl/msi/rtlmsi.wxs

@@ -4,7 +4,7 @@
       Manufacturer="!(loc.ManufacturerName)"
       Name="!(loc.Rtl_ProductName_$(ProductArchitecture))"
       UpgradeCode="$(RtlUpgradeCode)"
-      Version="$(ProductVersion)"
+      Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
     <Media Id="1" Cabinet="rtl.cab" EmbedCab="$(ArePackageCabsEmbedded)" />

platforms/Windows/rtl/msm/rtlmsm.wxs

@@ -12,7 +12,7 @@
     Guid="$(ModuleId)"
     Id="swift_runtime"
     Language="0"
-    Version="$(ProductVersion)">
+    Version="$(NonSemVerProductVersion)">
 
     <ComponentGroupRef Id="swift_runtime_$(ProductArchitecture)" />
   </Module>

platforms/Windows/sdk/sdk.wxs

@@ -20,7 +20,7 @@
       Manufacturer="!(loc.ManufacturerName)"
       Name="!(loc.Sdk_ProductName_$(ProductArchitecture))"
       UpgradeCode="$(SdkUpgradeCode)"
-      Version="$(ProductVersion)"
+      Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
     <Media Id="1" Cabinet="sdk.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />

platforms/Windows/shared/shared.wxs

@@ -134,7 +134,7 @@
 
     <Upgrade Id="!(wix.SideBySidePackageUpgradeCode)">
       <UpgradeVersion Minimum="$(MajorMinorProductVersion).65535" IncludeMinimum="no" OnlyDetect="yes" Property="NEWERVERSIONDETECTED" />
-      <UpgradeVersion Minimum="$(MajorMinorProductVersion).0" IncludeMinimum="yes" Maximum="$(ProductVersion)" IncludeMaximum="yes" Property="OLDERVERSIONBEINGUPGRADED" />
+      <UpgradeVersion Minimum="$(MajorMinorProductVersion).0" IncludeMinimum="yes" Maximum="$(NonSemVerProductVersion)" IncludeMaximum="yes" Property="OLDERVERSIONBEINGUPGRADED" />
     </Upgrade>
   </Fragment>