Merge pull request #2704 from Sridhar-MS/msi-branding

Fix the branding in CLI windows installer

packaging/debian/dotnet-debian_config.json

@@ -5,7 +5,7 @@
     "package_name": "dotnet-dev-%SDK_NUGET_VERSION%",
     "install_root": "/usr/share/dotnet",
 
-    "short_description": ".NET Core CLI",              
+    "short_description": "%CLI_SDK_BRAND_NAME%",
     "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", 
     "homepage": "https://dotnet.github.io/core",                        
 

packaging/debian/dotnet-nightly-debian_config.json

@@ -1,42 +0,0 @@
-{
-    "maintainer_name":"Microsoft",
-    "maintainer_email": "dotnetcore@microsoft.com",        
-
-    "package_name": "dotnet-nightly",                           
-
-    "short_description": "Unstable Developer Build of .NET Core CLI",              
-    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", 
-    "homepage": "https://dotnet.github.io/core",                        
-
-    "release":{
-        "package_version":"0.0.0.0",                               
-        "package_revision":"1",                                 
-        "urgency" : "low",                                      
-        "changelog_message" : "Bootstrap loop package"                
-    },
-
-    "control": {                                               
-        "priority":"standard",                                  
-        "section":"devel",                                      
-        "architecture":"any"                                    
-    },
-
-    "copyright": "2015 Microsoft",                              
-    "license": {                                                
-        "type": "MIT",                                 
-        "full_text": "Copyright (c) 2015 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-
-    "debian_dependencies":{
-        "clang-3.5" : {},
-        "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}
-    },
-
-    "package_conflicts" : [
-        "dotnet"
-    ],
-
-    "symlinks": {
-        "bin/dotnet-compile-native" : "/usr/bin/dotnet-compile-native"
-    }
-}

packaging/host/debian/dotnet-sharedhost-debian_config.json

@@ -5,7 +5,7 @@
     "package_name": "dotnet-host",
     "install_root": "/usr/share/dotnet",
 
-    "short_description": ".NET Core Host",
+    "short_description": "%SHARED_HOST_BRAND_NAME%",
     "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
     "homepage": "https://dotnet.github.io/core",
 

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>

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>

packaging/sharedframework/debian/dotnet-sharedframework-debian_config.json

@@ -5,7 +5,7 @@
     "package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%",
     "install_root": "/usr/share/dotnet",
 
-    "short_description": ".NET Core %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
+    "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
     "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
     "homepage": "https://dotnet.github.io/core",
 

packaging/windows/clisdk/bundle.wxl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
   <String Id="Caption">[WixBundleName] Setup</String>
-  <String Id="Title">Microsoft .Net CLI for Windows</String>
+  <String Id="Title">[BUNDLEMONIKER]</String>
   <String Id="Motto">You just need a shell, a text editor and 10 minutes of your time.
 
 Ready? Set? Let's go!</String>

packaging/windows/clisdk/bundle.wxs

@@ -24,6 +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="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" />

packaging/windows/clisdk/generatebundle.ps1

@@ -7,6 +7,7 @@ param(
     [Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
     [Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
     [Parameter(Mandatory=$true)][string]$WixRoot,
+    [Parameter(Mandatory=$true)][string]$ProductMoniker,
     [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
@@ -28,6 +29,7 @@ function RunCandleForBundle
     .\candle.exe -nologo `
         -dDotnetSrc="$inputDir" `
         -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
+        -dProductMoniker="$ProductMoniker" `
         -dBuildVersion="$DotnetMSIVersion" `
         -dDisplayVersion="$DotnetCLIDisplayVersion" `
         -dNugetVersion="$DotnetCLINugetVersion" `

packaging/windows/clisdk/generatemsi.ps1

@@ -5,6 +5,7 @@ param(
     [Parameter(Mandatory=$true)][string]$inputDir,
     [Parameter(Mandatory=$true)][string]$DotnetMSIOutput,
     [Parameter(Mandatory=$true)][string]$WixRoot,
+    [Parameter(Mandatory=$true)][string]$ProductMoniker,
     [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
@@ -48,6 +49,7 @@ function RunCandle
     .\candle.exe -nologo `
         -dDotnetSrc="$inputDir" `
         -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
+        -dProductMoniker="$ProductMoniker" `
         -dBuildVersion="$DotnetMSIVersion" `
         -dDisplayVersion="$DotnetCLIDisplayVersion" `
         -dNugetVersion="$DotnetCLINugetVersion" `

packaging/windows/clisdk/variables.wxi

@@ -7,7 +7,7 @@
   <?define Dotnet_DisplayVersion   =   "$(var.DisplayVersion)" ?>
   <?define Dotnet_BuildVersion   =   "$(var.BuildVersion)" ?>
   <?define Manufacturer     =   "Microsoft Corporation" ?>
-  <?define ProductName      =   "Microsoft .NET Core CLI for Windows ($(var.NugetVersion))" ?>
+  <?define ProductName      =   "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?>
   <?define ProductLanguage  =   "1033" ?>
   <?define ProductVersion   =   "$(var.Dotnet_ProductVersion)" ?>
   <?define ProductFamily    =   "dotnet" ?>

packaging/windows/host/generatemsi.ps1

@@ -5,6 +5,7 @@ param(
     [Parameter(Mandatory=$true)][string]$SharedHostPublishRoot,
     [Parameter(Mandatory=$true)][string]$DotnetHostMSIOutput,
     [Parameter(Mandatory=$true)][string]$WixRoot,
+    [Parameter(Mandatory=$true)][string]$ProductMoniker,
     [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
@@ -28,6 +29,7 @@ function RunCandle
         -ext WixDependencyExtension.dll `
         -dHostSrc="$SharedHostPublishRoot" `
         -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
+        -dProductMoniker="$ProductMoniker" `
         -dBuildVersion="$DotnetMSIVersion" `
         -dDisplayVersion="$DotnetCLIDisplayVersion" `
         -dNugetVersion="$DotnetCLINugetVersion" `

packaging/windows/host/variables.wxi

@@ -8,7 +8,7 @@
   <?define Dotnet_DisplayVersion   =   "$(var.DisplayVersion)" ?>
   <?define Dotnet_BuildVersion   =   "$(var.BuildVersion)" ?>
   <?define Manufacturer     =   "Microsoft Corporation" ?>
-  <?define ProductName      =   "Microsoft .NET Core Host for Windows ($(var.NugetVersion))" ?>
+  <?define ProductName      =   "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?>
   <?define ProductLanguage  =   "1033" ?>
   <?define ProductVersion   =   "$(var.Dotnet_ProductVersion)" ?>
   <?define LCID  = "$(var.ProductLanguage)"?>

packaging/windows/sharedframework/bundle.wxl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
   <String Id="Caption">[WixBundleName] Setup</String>
-  <String Id="Title">Microsoft .Net Core for Windows</String>
+  <String Id="Title">[BUNDLEMONIKER]</String>
   <String Id="Motto">You just need a shell, a text editor and 10 minutes of your time.
 
 Ready? Set? Let's go!</String>

packaging/windows/sharedframework/bundle.wxs

@@ -24,6 +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="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" />

packaging/windows/sharedframework/generatebundle.ps1

@@ -6,6 +6,7 @@ param(
     [Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
     [Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
     [Parameter(Mandatory=$true)][string]$WixRoot,
+    [Parameter(Mandatory=$true)][string]$ProductMoniker,
     [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLIVersion,
     [Parameter(Mandatory=$true)][string]$SharedFrameworkNugetName,
@@ -27,6 +28,7 @@ function RunCandleForBundle
 
     .\candle.exe -nologo `
         -dMicrosoftEula="$RepoRoot\packaging\osx\sharedframework\resources\en.lproj\eula.rtf" `
+        -dProductMoniker="$ProductMoniker" `
         -dBuildVersion="$DotnetMSIVersion" `
         -dDisplayVersion="$DotnetCLIVersion" `
         -dSharedFXMsiSourcePath="$SharedFxMSIFile" `

packaging/windows/sharedframework/generatemsi.ps1

@@ -5,6 +5,7 @@ param(
     [Parameter(Mandatory=$true)][string]$SharedFrameworkPublishRoot,
     [Parameter(Mandatory=$true)][string]$SharedFrameworkMSIOutput,
     [Parameter(Mandatory=$true)][string]$WixRoot,
+    [Parameter(Mandatory=$true)][string]$ProductMoniker,
     [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
     [Parameter(Mandatory=$true)][string]$SharedFrameworkNugetName,
     [Parameter(Mandatory=$true)][string]$SharedFrameworkNugetVersion,
@@ -60,6 +61,7 @@ function RunCandle
         -out "$WixObjRoot\" `
         -dSharedFrameworkSource="$SharedFrameworkPublishRoot" `
         -dMicrosoftEula="$RepoRoot\packaging\osx\sharedframework\resources\en.lproj\eula.rtf" `
+        -dProductMoniker="$ProductMoniker" `
         -dFrameworkName="$SharedFrameworkNugetName" `
         -dFrameworkDisplayVersion="$SharedFrameworkNugetVersion" `
         -dFrameworkComponentVersion="$SharedFrameworkComponentVersion" `

packaging/windows/sharedframework/variables.wxi

@@ -5,7 +5,7 @@
   <?define Servicing_Key_SPIndex   =   "0" ?>
   <?define Servicing_Key_SPName   =   "Beta" ?>
   <?define Manufacturer     =   "Microsoft Corporation" ?>
-  <?define ProductName      =   "Microsoft .NET Core ($(var.FrameworkName) $(var.FrameworkDisplayVersion))" ?>
+  <?define ProductName      =   "$(var.ProductMoniker) ($(var.FrameworkName) $(var.FrameworkDisplayVersion) $(sys.BUILDARCH))" ?>
   <?define ProductLanguage  =   "1033" ?>
   <?define ProductVersion   =   "$(var.BuildVersion)" ?>
   <?define LCID  = "$(var.ProductLanguage)"?>

scripts/dotnet-cli-build/DebTargets.cs

@@ -47,7 +47,8 @@ namespace Microsoft.DotNet.Cli.Build
                 "-v", version, 
                 "-i", sdkPublishRoot, 
                 "-o", debFile, 
-                "-p", packageName, 
+                "-p", packageName,
+                "-b", Monikers.CLISdkBrandName,
                 "-m", manPagesDir, 
                 "--framework-debian-package-name", sharedFxDebianPackageName,
                 "--framework-nuget-name", Monikers.SharedFrameworkName,
@@ -78,7 +79,8 @@ namespace Microsoft.DotNet.Cli.Build
             Directory.CreateDirectory(objRoot);
 
             Cmd(Path.Combine(Dirs.RepoRoot, "scripts", "package", "package-sharedhost-debian.sh"),
-                    "--input", inputRoot, "--output", debFile, "--obj-root", objRoot, "--version", version, "-m", manPagesDir)
+                    "--input", inputRoot, "--output", debFile, "-b", Monikers.SharedFxBrandName,
+                    "--obj-root", objRoot, "--version", version, "-m", manPagesDir)
                     .Execute()
                     .EnsureSuccessful();
             return c.Success();
@@ -102,7 +104,7 @@ namespace Microsoft.DotNet.Cli.Build
             Directory.CreateDirectory(objRoot);
 
             Cmd(Path.Combine(Dirs.RepoRoot, "scripts", "package", "package-sharedframework-debian.sh"),
-                    "--input", inputRoot, "--output", debFile, "--package-name", packageName,
+                    "--input", inputRoot, "--output", debFile, "--package-name", packageName, "-b", Monikers.SharedFxBrandName,
                     "--framework-nuget-name", Monikers.SharedFrameworkName,
                     "--framework-nuget-version", c.BuildContext.Get<string>("SharedFrameworkNugetVersion"),
                     "--obj-root", objRoot, "--version", version)

scripts/dotnet-cli-build/MsiTargets.cs

@@ -124,10 +124,11 @@ namespace Microsoft.DotNet.Cli.Build
         {
             var cliSdkRoot = c.BuildContext.Get<string>("CLISDKRoot");
             var upgradeCode = Utils.GenerateGuidFromName(SdkMsi).ToString().ToUpper();
+            var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'";
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatemsi.ps1"),
-                cliSdkRoot, SdkMsi, WixRoot, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
+                cliSdkRoot, SdkMsi, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
                     .Execute()
                     .EnsureSuccessful();
             return c.Success();
@@ -139,6 +140,7 @@ namespace Microsoft.DotNet.Cli.Build
         {
             var inputDir = c.BuildContext.Get<string>("SharedHostPublishRoot");
             var wixObjRoot = Path.Combine(Dirs.Output, "obj", "wix", "sharedhost");
+            var sharedHostBrandName = $"'{Monikers.SharedHostBrandName}'";
 
             if (Directory.Exists(wixObjRoot))
             {
@@ -148,7 +150,7 @@ namespace Microsoft.DotNet.Cli.Build
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "host", "generatemsi.ps1"),
-                inputDir, SharedHostMsi, WixRoot, MsiVersion, CliDisplayVersion, CliNugetVersion, Arch, wixObjRoot)
+                inputDir, SharedHostMsi, WixRoot, sharedHostBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, Arch, wixObjRoot)
                     .Execute()
                     .EnsureSuccessful();
             return c.Success();
@@ -164,6 +166,7 @@ namespace Microsoft.DotNet.Cli.Build
             var msiVerison = sharedFrameworkNuGetVersion.Split('-')[0];
             var upgradeCode = Utils.GenerateGuidFromName(SharedFrameworkMsi).ToString().ToUpper();
             var wixObjRoot = Path.Combine(Dirs.Output, "obj", "wix", "sharedframework");
+            var sharedFxBrandName = $"'{Monikers.SharedFxBrandName}'";
 
             if (Directory.Exists(wixObjRoot))
             {
@@ -173,7 +176,7 @@ namespace Microsoft.DotNet.Cli.Build
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "sharedframework", "generatemsi.ps1"),
-                inputDir, SharedFrameworkMsi, WixRoot, msiVerison, sharedFrameworkNuGetName, sharedFrameworkNuGetVersion, upgradeCode, Arch, wixObjRoot)
+                inputDir, SharedFrameworkMsi, WixRoot, sharedFxBrandName, msiVerison, sharedFrameworkNuGetName, sharedFrameworkNuGetVersion, upgradeCode, Arch, wixObjRoot)
                     .Execute()
                     .EnsureSuccessful();
             return c.Success();
@@ -185,10 +188,11 @@ namespace Microsoft.DotNet.Cli.Build
         public static BuildTargetResult GenerateCliSdkBundle(BuildTargetContext c)
         {
             var upgradeCode = Utils.GenerateGuidFromName(SdkBundle).ToString().ToUpper();
+            var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'";
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"),
-                SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
+                SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
                     .EnvironmentVariable("Stage2Dir", Dirs.Stage2)
                     .Execute()
                     .EnsureSuccessful();
@@ -202,10 +206,11 @@ namespace Microsoft.DotNet.Cli.Build
             var sharedFrameworkNuGetName = Monikers.SharedFrameworkName;
             var sharedFrameworkNuGetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
             var upgradeCode = Utils.GenerateGuidFromName(SharedFrameworkBundle).ToString().ToUpper();
+            var sharedFxBrandName = $"'{Monikers.SharedFxBrandName}'";
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "sharedframework", "generatebundle.ps1"),
-                SharedFrameworkMsi, SharedHostMsi, SharedFrameworkBundle, WixRoot, MsiVersion, CliDisplayVersion, sharedFrameworkNuGetName, sharedFrameworkNuGetVersion, upgradeCode, Arch)
+                SharedFrameworkMsi, SharedHostMsi, SharedFrameworkBundle, WixRoot, sharedFxBrandName, MsiVersion, CliDisplayVersion, sharedFrameworkNuGetName, sharedFrameworkNuGetVersion, upgradeCode, Arch)
                     .Execute()
                     .EnsureSuccessful();
             return c.Success();

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",

scripts/dotnet-cli-build/Utils/Monikers.cs

@@ -9,6 +9,9 @@ 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 SharedFxBrandName = "Microsoft .NET Core";
+        public const string SharedHostBrandName = "Microsoft .NET Core Host";
 
         public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
         {

scripts/package/package-debian.sh

@@ -28,9 +28,10 @@ help(){
     echo "  --manpages <man pages directory>   Directory containing man pages for the package (Optional)."
     echo "  --output <output debfile>          The full path to which the package will be written."
     echo "  --package-name <package name>      Package to identify during installation. Example - 'dotnet-nightly', 'dotnet'"
+    echo "  --brand-name <brand name>          Brand name of the package, used for 'short_description' of the deb file. Example - '.NET CLI SDK'"
     echo "  --framework-nuget-name <name>      The name of the nuget package that produced this shared framework."
     echo "  --framework-nuget-version <ver>    The versionf of the nuget package that produced this shared framework."
-    echo "  --previous-version-url <url>           Url to the previous version of the debian packge against which to run the upgrade tests."
+    echo "  --previous-version-url <url>       Url to the previous version of the debian packge against which to run the upgrade tests."
     echo "  --obj-root <object root>           Root folder for intermediate objects."
     exit 1
 }
@@ -56,6 +57,10 @@ parseargs(){
             DOTNET_DEB_PACKAGE_NAME=$2
             shift
             ;;
+        -b|--brand-name)
+            DOTNET_CLI_BRAND_NAME=$2
+            shift
+            ;;
         -v|--version)
             DOTNET_CLI_VERSION=$2
             shift
@@ -196,6 +201,7 @@ update_debian_json()
     sed -i "s/%SHARED_FRAMEWORK_NUGET_NAME%/$SHARED_FRAMEWORK_NUGET_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
     sed -i "s/%SHARED_FRAMEWORK_NUGET_VERSION%/$SHARED_FRAMEWORK_NUGET_VERSION/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
     sed -i "s/%SDK_NUGET_VERSION%/$DOTNET_CLI_VERSION/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
+    sed -i "s/%CLI_SDK_BRAND_NAME%/$DOTNET_CLI_BRAND_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
 }
 
 test_debian_package(){

scripts/package/package-sharedframework-debian.sh

@@ -26,6 +26,7 @@ help(){
     echo "  --input <input directory>          Package the entire contents of the directory tree."
     echo "  --output <output debfile>          The full path to which the package will be written."
     echo "  --package-name <package name>      Package to identify during installation. Example - 'dotnet-sharedframework'"
+    echo "  --brand-name <brand name>          Brand name of the package, used for 'short_description' of the deb file. Example - '.NET Core'"
     echo "  --framework-nuget-name <name>      The name of the nuget package that produced this shared framework."
     echo "  --framework-nuget-version <ver>    The versionf of the nuget package that produced this shared framework."
     echo "  --obj-root <object root>           Root folder for intermediate objects."
@@ -48,6 +49,10 @@ while [[ $# > 0 ]]; do
             SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME=$2
             shift
             ;;
+        -b|--brand-name)
+            SHARED_FRAMEWORK_BRAND_NAME=$2
+            shift
+            ;;
         --framework-nuget-name)
             SHARED_FRAMEWORK_NUGET_NAME=$2
             shift
@@ -124,6 +129,7 @@ update_debian_json()
     sed -i "s/%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%/$SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
     sed -i "s/%SHARED_FRAMEWORK_NUGET_NAME%/$SHARED_FRAMEWORK_NUGET_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
     sed -i "s/%SHARED_FRAMEWORK_NUGET_VERSION%/$SHARED_FRAMEWORK_NUGET_VERSION/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
+    sed -i "s/%SHARED_FRAMEWORK_BRAND_NAME%/$SHARED_FRAMEWORK_BRAND_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
 }
 
 test_debian_package(){

scripts/package/package-sharedhost-debian.sh

@@ -26,6 +26,7 @@ help(){
     echo "  --input <input directory>          Package the entire contents of the directory tree."
     echo "  --output <output debfile>          The full path to which the package will be written."
     echo "  --package-name <package name>      Package to identify during installation. Example - 'dotnet-sharedhost'"
+    echo "  --brand-name <brand name>          Brand name of the package, used for 'short_description' of the deb file. Example - '.NET Core Host'"
     echo "  --obj-root <object root>           Root folder for intermediate objects."
     echo "  --version <version>                Version for the debain package."
     exit 1
@@ -46,6 +47,10 @@ while [[ $# > 0 ]]; do
             SHARED_HOST_DEBIAN_PACKAGE_NAME=$2
             shift
             ;;
+        -b|--brand-name)
+            SHARED_HOST_BRAND_NAME=$2
+            shift
+            ;;
         --obj-root)
             OBJECT_DIR=$2
             shift
@@ -78,6 +83,7 @@ TEST_STAGE_DIR="$OBJECT_DIR/debian_tests"
 execute_build(){
     create_empty_debian_layout
     copy_files_to_debian_layout
+    update_debian_json
     create_debian_package
 }
 
@@ -114,6 +120,12 @@ create_debian_package(){
     "$PACKAGING_TOOL_DIR/package_tool" -i "$PACKAGE_LAYOUT_DIR" -o "$PACKAGE_OUTPUT_DIR" -n "$SHARED_HOST_DEBIAN_PACKAGE_NAME" -v "$SHARED_HOST_DEBIAN_VERSION"
 }
 
+update_debian_json()
+{
+    header "Updating debian.json file"
+    sed -i "s/%SHARED_HOST_BRAND_NAME%/$SHARED_HOST_BRAND_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
+}
+
 test_debian_package(){
     header "Testing debian Shared Host package"