mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Cleaning up ARP entries.

Browse source
This commit is contained in:
PiotrP 2016-05-04 15:57:08 -07:00 • committed by Bryan
parent 94840de4e1
commit fdf70b7a51
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packaging/windows/clisdk/variables.wxi
View file

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

2
packaging/windows/host/variables.wxi
View file

@ -7,7 +7,7 @@
<?define Dotnet_ProductVersion = "$(var.BuildVersion)" ?> <?define Dotnet_ProductVersion = "$(var.BuildVersion)" ?>
<?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?> <?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
<?define Manufacturer = "Microsoft Corporation" ?> <?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?> <?define ProductName = "$(var.ProductMoniker) ($(sys.BUILDARCH))" ?>
<?define ProductLanguage = "1033" ?> <?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?> <?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?>
<?define LCID = "$(var.ProductLanguage)"?> <?define LCID = "$(var.ProductLanguage)"?>

2
packaging/windows/sharedframework/variables.wxi
View file

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

6
scripts/dotnet-cli-build/Utils/Monikers.cs
View file

@ -9,9 +9,9 @@ namespace Microsoft.DotNet.Cli.Build
public class Monikers public class Monikers
{ {
public const string SharedFrameworkName = "Microsoft.NETCore.App"; public const string SharedFrameworkName = "Microsoft.NETCore.App";
public const string CLISdkBrandName = "Microsoft .NET Core 1.0 RC2 - SDK Preview 1"; public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 RC2 - SDK Preview 1";
public const string SharedFxBrandName = "Microsoft .NET Core 1.0 RC2 - Runtime"; public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 RC2 - Runtime";
public const string SharedHostBrandName = "Microsoft .NET Core 1.0 RC2 - Host"; public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 RC2 - Host";
public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version) public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
{ {