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

Rename strongName: true to useOssSigning

Browse source
This commit is contained in:
David Fowler 2015-11-09 00:19:39 -08:00
parent 46810f5775
commit 5711d1764d
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Microsoft.DotNet.Compiler.Common/CommonCompilerOptionsExtensions.cs
View file

@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
internal static readonly OptionTemplate s_delaySignTemplate = new OptionTemplate("delay-sign"); internal static readonly OptionTemplate s_delaySignTemplate = new OptionTemplate("delay-sign");
internal static readonly OptionTemplate s_strongNameTemplate = new OptionTemplate("strong-name"); internal static readonly OptionTemplate s_ossSignTemplate = new OptionTemplate("oss-sign");
internal static readonly OptionTemplate s_emitEntryPointTemplate = new OptionTemplate("emit-entry-point"); internal static readonly OptionTemplate s_emitEntryPointTemplate = new OptionTemplate("emit-entry-point");
@ -67,8 +67,8 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
syntax.DefineOption(s_delaySignTemplate.LongName, ref delaySign, syntax.DefineOption(s_delaySignTemplate.LongName, ref delaySign,
nullableBoolConverter, "Delay-sign the output assembly"); nullableBoolConverter, "Delay-sign the output assembly");
syntax.DefineOption(s_strongNameTemplate.LongName, ref strongName, syntax.DefineOption(s_ossSignTemplate.LongName, ref strongName,
nullableBoolConverter, "Strong-name sign the output assembly"); nullableBoolConverter, "OSS sign the output assembly");
syntax.DefineOption(s_emitEntryPointTemplate.LongName, ref emitEntryPoint, syntax.DefineOption(s_emitEntryPointTemplate.LongName, ref emitEntryPoint,
nullableBoolConverter, "Output an executable console program"); nullableBoolConverter, "Output an executable console program");
@ -83,7 +83,7 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
Optimize = optimize, Optimize = optimize,
KeyFile = keyFile, KeyFile = keyFile,
DelaySign = delaySign, DelaySign = delaySign,
StrongName = strongName, UseOssSigning = strongName,
EmitEntryPoint = emitEntryPoint EmitEntryPoint = emitEntryPoint
}; };
} }
@ -98,7 +98,7 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
var optimize = options.Optimize; var optimize = options.Optimize;
var keyFile = options.KeyFile; var keyFile = options.KeyFile;
var delaySign = options.DelaySign; var delaySign = options.DelaySign;
var strongName = options.StrongName; var ossSign = options.UseOssSigning;
var emitEntryPoint = options.EmitEntryPoint; var emitEntryPoint = options.EmitEntryPoint;
var args = new List<string>(); var args = new List<string>();
@ -143,9 +143,9 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
args.Add(s_delaySignTemplate.ToLongArg(delaySign)); args.Add(s_delaySignTemplate.ToLongArg(delaySign));
} }
if (strongName != null) if (ossSign != null)
{ {
args.Add(s_strongNameTemplate.ToLongArg(strongName)); args.Add(s_ossSignTemplate.ToLongArg(ossSign));
} }
if (emitEntryPoint != null) if (emitEntryPoint != null)

6
src/Microsoft.DotNet.ProjectModel/CommonCompilerOptions.cs
View file

@ -25,7 +25,7 @@ namespace Microsoft.Extensions.ProjectModel
public bool? DelaySign { get; set; } public bool? DelaySign { get; set; }
public bool? StrongName { get; set; } public bool? UseOssSigning { get; set; }
public bool? EmitEntryPoint { get; set; } public bool? EmitEntryPoint { get; set; }
@ -82,9 +82,9 @@ namespace Microsoft.Extensions.ProjectModel
result.DelaySign = option.DelaySign; result.DelaySign = option.DelaySign;
} }
if (option.StrongName != null) if (option.UseOssSigning != null)
{ {
result.StrongName = option.StrongName; result.UseOssSigning = option.UseOssSigning;
} }
if (option.EmitEntryPoint != null) if (option.EmitEntryPoint != null)

2
src/Microsoft.DotNet.ProjectModel/ProjectReader.cs
View file

@ -522,7 +522,7 @@ namespace Microsoft.Extensions.ProjectModel
Optimize = rawOptions.ValueAsNullableBoolean("optimize"), Optimize = rawOptions.ValueAsNullableBoolean("optimize"),
KeyFile = rawOptions.ValueAsString("keyFile"), KeyFile = rawOptions.ValueAsString("keyFile"),
DelaySign = rawOptions.ValueAsNullableBoolean("delaySign"), DelaySign = rawOptions.ValueAsNullableBoolean("delaySign"),
StrongName = rawOptions.ValueAsNullableBoolean("strongName"), UseOssSigning = rawOptions.ValueAsNullableBoolean("useOssSigning"),
EmitEntryPoint = rawOptions.ValueAsNullableBoolean("emitEntryPoint") EmitEntryPoint = rawOptions.ValueAsNullableBoolean("emitEntryPoint")
}; };
} }