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

Update OSX branding.

Browse source 
And also address PR feedback.
This commit is contained in:
Sridhar Periyasamy 2016-04-27 17:20:52 -07:00
parent aa512b771c
commit bb56f4f838
7 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/dotnet-cli-build/MsiTargets.cs
View file

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

9
scripts/dotnet-cli-build/PkgTargets.cs
View file

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

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

@ -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";