From bb56f4f83881493737e54b1a921ef80da408d88b Mon Sep 17 00:00:00 2001
From: Sridhar Periyasamy <sridhper@microsoft.com>
Date: Wed, 27 Apr 2016 17:20:52 -0700
Subject: [PATCH] Update OSX branding.

And also address PR feedback.
---
 packaging/osx/clisdk/Distribution-Template               | 8 ++++----
 .../shared-framework-distribution-template.xml           | 6 +++---
 packaging/windows/clisdk/bundle.wxs                      | 2 +-
 packaging/windows/sharedframework/bundle.wxs             | 2 +-
 scripts/dotnet-cli-build/MsiTargets.cs                   | 4 ++--
 scripts/dotnet-cli-build/PkgTargets.cs                   | 9 +++++++--
 scripts/dotnet-cli-build/Utils/Monikers.cs               | 2 +-
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template
index 56e311c42..7ac911ff8 100644
--- a/packaging/osx/clisdk/Distribution-Template
+++ b/packaging/osx/clisdk/Distribution-Template
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-gui-script minSpecVersion="1">
-    <title>.NET CLI {CLISdkNugetVersion}</title>
+    <title>{CLISdkBrandName} {CLISdkNugetVersion}</title>
     <license file="eula.rtf" mime-type="application/rtf" />
     <background file="dotnetbackground.png" mime-type="image/png"/>
     <options customize="never" require-scripts="false" />
@@ -18,13 +18,13 @@
         <line choice="{SharedHostComponentId}.pkg" />
         <line choice="{CLISdkComponentId}.pkg"/>
     </choices-outline>
-    <choice id="{SharedFxComponentId}.pkg" visible="true" title=".NET Core Shared Framework (x64)" description="The .NET Core Shared Framework">
+    <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
         <pkg-ref id="{SharedFxComponentId}.pkg" />
     </choice>
-    <choice id="{SharedHostComponentId}.pkg" visible="true" title=".NET Core Shared Host (x64)" description="The .NET Core Shared Host." >
+    <choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
         <pkg-ref id="{SharedHostComponentId}.pkg" />
     </choice>
-    <choice id="{CLISdkComponentId}.pkg" visible="true" title=".NET CLI (x64)" description=".NET CLI">
+    <choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET Core SDK">
         <pkg-ref id="{CLISdkComponentId}.pkg"/>
     </choice>
     <pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
diff --git a/packaging/osx/sharedframework/shared-framework-distribution-template.xml b/packaging/osx/sharedframework/shared-framework-distribution-template.xml
index e2f5ea21c..cac0816c3 100644
--- a/packaging/osx/sharedframework/shared-framework-distribution-template.xml
+++ b/packaging/osx/sharedframework/shared-framework-distribution-template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-gui-script minSpecVersion="1">
-    <title>.NET Core Shared Framework ({SharedFrameworkNugetName} {SharedFrameworkNugetVersion})</title>
+    <title>{SharedFxBrandName} ({SharedFrameworkNugetName} {SharedFrameworkNugetVersion})</title>
     <license file="eula.rtf" mime-type="application/rtf" />
     <background file="dotnetbackground.png" mime-type="image/png"/>
     <options customize="never" require-scripts="false" />
@@ -13,10 +13,10 @@
         <line choice="{SharedFxComponentId}.pkg" />
         <line choice="{SharedHostComponentId}.pkg" />
     </choices-outline>
-    <choice id="{SharedFxComponentId}.pkg" visible="true" title=".NET Core Shared Framework (x64)" description="The .NET Core Shared Framework">
+    <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
         <pkg-ref id="{SharedFxComponentId}.pkg" />
     </choice>
-    <choice id="{SharedHostComponentId}.pkg" visible="true" title=".NET Core Shared Host (x64)" description="The .NET Core Shared Host." >
+    <choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
         <pkg-ref id="{SharedHostComponentId}.pkg" />
     </choice>
     <pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index 2a8caea94..d7d0d48bc 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -24,7 +24,7 @@
     <swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
 
     <Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="yes" />
-    <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="yes" />
+    <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
 
     <util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="SOFTWARE\dotnet\Setup" Value="InstallDir" Variable="PreviousInstallFolder" />
     <util:DirectorySearch Path="[PreviousInstallFolder]" Variable="DOTNETHOME" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />
diff --git a/packaging/windows/sharedframework/bundle.wxs b/packaging/windows/sharedframework/bundle.wxs
index 07978bad5..511d4cc09 100644
--- a/packaging/windows/sharedframework/bundle.wxs
+++ b/packaging/windows/sharedframework/bundle.wxs
@@ -24,7 +24,7 @@
     <swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
 
     <Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="yes" />
-    <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="yes" />
+    <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
 
     <util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="SOFTWARE\dotnet\sharedframework\$(var.FrameworkName) $(var.FrameworkDisplayVersion)\Setup" Value="InstallDir" Variable="PreviousInstallFolder" />
     <util:DirectorySearch Path="[PreviousInstallFolder]" Variable="DOTNETHOME" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />
diff --git a/scripts/dotnet-cli-build/MsiTargets.cs b/scripts/dotnet-cli-build/MsiTargets.cs
index 5f2d47793..8161496e4 100644
--- a/scripts/dotnet-cli-build/MsiTargets.cs
+++ b/scripts/dotnet-cli-build/MsiTargets.cs
@@ -124,7 +124,7 @@ namespace Microsoft.DotNet.Cli.Build
         {
             var cliSdkRoot = c.BuildContext.Get<string>("CLISDKRoot");
             var upgradeCode = Utils.GenerateGuidFromName(SdkMsi).ToString().ToUpper();
-            var cliSdkBrandName = $"'{Monikers.CLISDKBrandName}'";
+            var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'";
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatemsi.ps1"),
@@ -188,7 +188,7 @@ namespace Microsoft.DotNet.Cli.Build
         public static BuildTargetResult GenerateCliSdkBundle(BuildTargetContext c)
         {
             var upgradeCode = Utils.GenerateGuidFromName(SdkBundle).ToString().ToUpper();
-            var cliSdkBrandName = $"'{Monikers.CLISDKBrandName}'";
+            var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'";
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"),
diff --git a/scripts/dotnet-cli-build/PkgTargets.cs b/scripts/dotnet-cli-build/PkgTargets.cs
index 20ac7b770..1460ba3f8 100644
--- a/scripts/dotnet-cli-build/PkgTargets.cs
+++ b/scripts/dotnet-cli-build/PkgTargets.cs
@@ -69,7 +69,10 @@ namespace Microsoft.DotNet.Cli.Build
                 distTemplate.Replace("{SharedFxComponentId}", SharedFxComponentId)
                 .Replace("{SharedHostComponentId}", SharedHostComponentId)
                 .Replace("{CLISdkComponentId}", CLISdkComponentId)
-                .Replace("{CLISdkNugetVersion}", CLISdkNugetVersion);
+                .Replace("{CLISdkNugetVersion}", CLISdkNugetVersion)
+                .Replace("{CLISdkBrandName}", Monikers.CLISdkBrandName)
+                .Replace("{SharedFxBrandName}", Monikers.SharedFxBrandName)
+                .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName);
             File.WriteAllText(distributionPath, formattedDistContents);
 
             Cmd("productbuild",
@@ -125,7 +128,9 @@ namespace Microsoft.DotNet.Cli.Build
                 distTemplate.Replace("{SharedFxComponentId}", SharedFxComponentId)
                 .Replace("{SharedHostComponentId}", SharedHostComponentId)
                 .Replace("{SharedFrameworkNugetName}", Monikers.SharedFrameworkName)
-                .Replace("{SharedFrameworkNugetVersion}", SharedFrameworkNugetVersion);
+                .Replace("{SharedFrameworkNugetVersion}", SharedFrameworkNugetVersion)
+                .Replace("{SharedFxBrandName}", Monikers.SharedFxBrandName)
+                .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName);
             File.WriteAllText(distributionPath, formattedDistContents);
 
             Cmd("productbuild",
diff --git a/scripts/dotnet-cli-build/Utils/Monikers.cs b/scripts/dotnet-cli-build/Utils/Monikers.cs
index 6f56b813e..6e62fc181 100644
--- a/scripts/dotnet-cli-build/Utils/Monikers.cs
+++ b/scripts/dotnet-cli-build/Utils/Monikers.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.Build
     public class Monikers
     {
         public const string SharedFrameworkName = "Microsoft.NETCore.App";
-        public const string CLISDKBrandName = "Microsoft .NET Core SDK";
+        public const string CLISdkBrandName = "Microsoft .NET Core SDK";
         public const string SharedFxBrandName = "Microsoft .NET Core";
         public const string SharedHostBrandName = "Microsoft .NET Core Host";