From fdf70b7a510e9137ec92fcd7f2e15071f8bac6db Mon Sep 17 00:00:00 2001
From: PiotrP <piotrp@microsoft.com>
Date: Wed, 4 May 2016 15:57:08 -0700
Subject: [PATCH] Cleaning up ARP entries.

---
 packaging/windows/clisdk/variables.wxi          | 2 +-
 packaging/windows/host/variables.wxi            | 2 +-
 packaging/windows/sharedframework/variables.wxi | 2 +-
 scripts/dotnet-cli-build/Utils/Monikers.cs      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packaging/windows/clisdk/variables.wxi b/packaging/windows/clisdk/variables.wxi
index a11f06d36..197031f6f 100644
--- a/packaging/windows/clisdk/variables.wxi
+++ b/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      =   "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?>
+  <?define ProductName      =   "$(var.ProductMoniker) ($(sys.BUILDARCH))" ?>
   <?define ProductLanguage  =   "1033" ?>
   <?define ProductVersion   =   "$(var.Dotnet_ProductVersion)" ?>
   <?define ProductFamily    =   "dotnet" ?>
diff --git a/packaging/windows/host/variables.wxi b/packaging/windows/host/variables.wxi
index f470a8c5e..fba50a8d0 100644
--- a/packaging/windows/host/variables.wxi
+++ b/packaging/windows/host/variables.wxi
@@ -7,7 +7,7 @@
   <?define Dotnet_ProductVersion   =   "$(var.BuildVersion)" ?>
   <?define Dotnet_BuildVersion   =   "$(var.BuildVersion)" ?>
   <?define Manufacturer     =   "Microsoft Corporation" ?>
-  <?define ProductName      =   "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?>
+  <?define ProductName      =   "$(var.ProductMoniker) ($(sys.BUILDARCH))" ?>
   <?define ProductLanguage  =   "1033" ?>
   <?define ProductVersion   =   "$(var.Dotnet_ProductVersion)" ?>
   <?define LCID  = "$(var.ProductLanguage)"?>
diff --git a/packaging/windows/sharedframework/variables.wxi b/packaging/windows/sharedframework/variables.wxi
index 4d67cd253..200815b28 100644
--- a/packaging/windows/sharedframework/variables.wxi
+++ b/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      =   "$(var.ProductMoniker) ($(var.FrameworkName) $(var.FrameworkDisplayVersion) $(sys.BUILDARCH))" ?>
+  <?define ProductName      =   "$(var.ProductMoniker) ($(sys.BUILDARCH))" ?>
   <?define ProductLanguage  =   "1033" ?>
   <?define ProductVersion   =   "$(var.BuildVersion)" ?>
   <?define LCID  = "$(var.ProductLanguage)"?>
diff --git a/scripts/dotnet-cli-build/Utils/Monikers.cs b/scripts/dotnet-cli-build/Utils/Monikers.cs
index d032bbb2e..5a3f599f5 100644
--- a/scripts/dotnet-cli-build/Utils/Monikers.cs
+++ b/scripts/dotnet-cli-build/Utils/Monikers.cs
@@ -9,9 +9,9 @@ namespace Microsoft.DotNet.Cli.Build
     public class Monikers
     {
         public const string SharedFrameworkName = "Microsoft.NETCore.App";
-        public const string CLISdkBrandName = "Microsoft .NET Core 1.0 RC2 - SDK Preview 1";
-        public const string SharedFxBrandName = "Microsoft .NET Core 1.0 RC2 - Runtime";
-        public const string SharedHostBrandName = "Microsoft .NET Core 1.0 RC2 - Host";
+        public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 RC2 - SDK Preview 1";
+        public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 RC2 - Runtime";
+        public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 RC2 - Host";
 
         public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
         {