Rename cli.msi and cli.cab to cli.asserts.msi and cli.asserts.cab

Author: mhegazy

platforms/Windows/SideBySideUpgradeStrategy.props

@@ -18,7 +18,7 @@
 
   <PropertyGroup>
     <BldAssertsUpgradeCode>{7E95DC06-7F84-4E8E-A038-8304AF0468FB}</BldAssertsUpgradeCode>
-    <CliUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliUpgradeCode>
+    <CliAssertsUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliAssertsUpgradeCode>
     <DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
     <IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
     <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
@@ -55,7 +55,7 @@
       $(DefineConstants);
       BundleUpgradeCode=$(BundleUpgradeCode);
       BldAssertsUpgradeCode=$(BldAssertsUpgradeCode);
-      CliUpgradeCode=$(CliUpgradeCode);
+      CliAssertsUpgradeCode=$(CliAssertsUpgradeCode);
       DbgUpgradeCode=$(DbgUpgradeCode);
       IdeUpgradeCode=$(IdeUpgradeCode);
       RtlUpgradeCode=$(RtlUpgradeCode);

platforms/Windows/bundle/installer.wixproj

@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\bld\asserts\bld.asserts.wixproj" BindName="bld.asserts" />
-    <ProjectReference Include="..\cli\cli.wixproj" BindName="cli" />
+    <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
     <ProjectReference Include="..\dbg\dbg.wixproj" BindName="dbg" />
     <ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />

platforms/Windows/bundle/installer.wxs

@@ -88,7 +88,7 @@
       </MsiPackage>
 
       <MsiPackage
-        SourceFile="!(bindpath.cli)\cli.msi"
+        SourceFile="!(bindpath.cli.asserts)\cli.asserts.msi"
         InstallCondition="OptionsInstallCLI = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />

platforms/Windows/cli/cli.wixproj renamed to platforms/Windows/cli/asserts/cli.asserts.wixproj

@@ -7,6 +7,7 @@
       SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
       SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
     </DefineConstants>
+    <OutputName>cli.asserts</OutputName>
   </PropertyGroup>
 
   <ItemGroup>

platforms/Windows/cli/asserts/cli.asserts.wxs

@@ -0,0 +1,3 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?include ../cli.wxi ?>
+</Wix>

platforms/Windows/cli/cli.wxs renamed to platforms/Windows/cli/cli.wxi

@@ -1,18 +1,19 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
 
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Cli_ProductName)"
-      UpgradeCode="$(CliUpgradeCode)"
+      Name="!(loc.CliAsserts_ProductName)"
+      UpgradeCode="$(CliAssertsUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="cli.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="cli.asserts.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(CliUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(CliAssertsUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
     <DirectoryRef Id="_usr_include">
@@ -735,7 +736,7 @@
       </Component>
     </ComponentGroup>
 
-    <Feature Id="CLITools" AllowAbsent="no" Title="!(loc.Cli_ProductName)">
+    <Feature Id="CLITools" AllowAbsent="no" Title="!(loc.CliAsserts_ProductName)">
       <ComponentGroupRef Id="clang" />
       <ComponentGroupRef Id="libclang" />
       <ComponentGroupRef Id="IndexStore" />
@@ -757,4 +758,4 @@
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
   </Package>
-</Wix>
+</Include>

platforms/Windows/readme.md

@@ -216,7 +216,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid
 
 | Property | Description |
 | -------- | ----------- |
-| BldAssertsUpgradeCode, CliUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. |
+| BldAssertsUpgradeCode, CliAssertsUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. |
 | BundleUpgradeCode | Upgrade codes for the bundle. Bundles don't support upgrade version ranges, so the bundle upgrade code must change for every minor version _and_ stay the same for the entire lifetime of that minor version (e.g., v5.10.0 through v5.10.9999). You can keep the history of upgrade codes using a condition like `Condition="'$(MajorMinorProductVersion)' == '5.10'` or just replace BundleUpgradeCode when forking to a new minor version. |
 
 

platforms/Windows/shared/swift.en-us.wxl

@@ -5,6 +5,7 @@
   <String Id="Bld_ProductName" Value="Swift Build Tools" />
   <String Id="BldAsserts_ProductName" Value="Swift Build Tools (Asserts)" />
   <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
+  <String Id="CliAsserts_ProductName" Value="Swift Command Line Tools (Asserts)" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />