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

Fixed formatting

Browse source
This commit is contained in:
David Fowler 2015-10-17 07:50:02 -07:00
parent f2fdba5887
commit fe3a9d1332
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Microsoft.DotNet.Tools.Publish/Program.cs
View file

@ -29,11 +29,11 @@ namespace Microsoft.DotNet.Tools.Publish
app.OnExecute(() => app.OnExecute(() =>
{ {
if(!CheckArg(framework)) if (!CheckArg(framework))
{ {
return 1; return 1;
} }
if(!CheckArg(runtime)) if (!CheckArg(runtime))
{ {
return 1; return 1;
} }
@ -116,7 +116,7 @@ namespace Microsoft.DotNet.Tools.Publish
// Publishing for windows, TODO(anurse): Publish for Mac/Linux/etc. // Publishing for windows, TODO(anurse): Publish for Mac/Linux/etc.
int exitCode; int exitCode;
if(context.RuntimeIdentifier.Equals("win7-x64")) if (context.RuntimeIdentifier.Equals("win7-x64"))
{ {
exitCode = PublishForWindows(context, outputPath); exitCode = PublishForWindows(context, outputPath);
} }
@ -133,18 +133,18 @@ namespace Microsoft.DotNet.Tools.Publish
{ {
// Locate Hosts // Locate Hosts
string hostsPath = Environment.GetEnvironmentVariable(Constants.HostsPathEnvironmentVariable); string hostsPath = Environment.GetEnvironmentVariable(Constants.HostsPathEnvironmentVariable);
if(string.IsNullOrEmpty(hostsPath)) if (string.IsNullOrEmpty(hostsPath))
{ {
hostsPath = AppContext.BaseDirectory; hostsPath = AppContext.BaseDirectory;
} }
var coreConsole = Path.Combine(hostsPath, Constants.CoreConsoleName); var coreConsole = Path.Combine(hostsPath, Constants.CoreConsoleName);
if(!File.Exists(coreConsole)) if (!File.Exists(coreConsole))
{ {
Reporter.Error.WriteLine($"Unable to locate {Constants.CoreConsoleName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold()); Reporter.Error.WriteLine($"Unable to locate {Constants.CoreConsoleName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold());
return 1; return 1;
} }
var coreRun = Path.Combine(hostsPath, Constants.CoreRunName); var coreRun = Path.Combine(hostsPath, Constants.CoreRunName);
if(!File.Exists(coreRun)) if (!File.Exists(coreRun))
{ {
Reporter.Error.WriteLine($"Unable to locate {Constants.CoreRunName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold()); Reporter.Error.WriteLine($"Unable to locate {Constants.CoreRunName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold());
return 1; return 1;
@ -159,7 +159,7 @@ namespace Microsoft.DotNet.Tools.Publish
var outputDll = Path.Combine(outputPath, context.ProjectFile.Name + ".dll"); var outputDll = Path.Combine(outputPath, context.ProjectFile.Name + ".dll");
// Check if the a command name is specified, and rename the necessary files // Check if the a command name is specified, and rename the necessary files
if(context.ProjectFile.Commands.Count == 1) if (context.ProjectFile.Commands.Count == 1)
{ {
// Write a script that can be used to launch with CoreRun // Write a script that can be used to launch with CoreRun
var script = $@"#!/usr/bin/env bash var script = $@"#!/usr/bin/env bash
@ -188,18 +188,18 @@ exec ""$DIR/corerun"" ""$DIR/{context.ProjectFile.Name}.exe"" $*";
{ {
// Locate Hosts // Locate Hosts
string hostsPath = Environment.GetEnvironmentVariable(Constants.HostsPathEnvironmentVariable); string hostsPath = Environment.GetEnvironmentVariable(Constants.HostsPathEnvironmentVariable);
if(string.IsNullOrEmpty(hostsPath)) if (string.IsNullOrEmpty(hostsPath))
{ {
hostsPath = AppContext.BaseDirectory; hostsPath = AppContext.BaseDirectory;
} }
var coreConsole = Path.Combine(hostsPath, Constants.CoreConsoleName); var coreConsole = Path.Combine(hostsPath, Constants.CoreConsoleName);
if(!File.Exists(coreConsole)) if (!File.Exists(coreConsole))
{ {
Reporter.Error.WriteLine($"Unable to locate {Constants.CoreConsoleName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold()); Reporter.Error.WriteLine($"Unable to locate {Constants.CoreConsoleName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold());
return 1; return 1;
} }
var coreRun = Path.Combine(hostsPath, Constants.CoreRunName); var coreRun = Path.Combine(hostsPath, Constants.CoreRunName);
if(!File.Exists(coreRun)) if (!File.Exists(coreRun))
{ {
Reporter.Error.WriteLine($"Unable to locate {Constants.CoreRunName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold()); Reporter.Error.WriteLine($"Unable to locate {Constants.CoreRunName} in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold());
return 1; return 1;
@ -215,14 +215,14 @@ exec ""$DIR/corerun"" ""$DIR/{context.ProjectFile.Name}.exe"" $*";
File.Copy(coreConsole, outputExe, overwrite: true); File.Copy(coreConsole, outputExe, overwrite: true);
// Check if the a command name is specified, and rename the necessary files // Check if the a command name is specified, and rename the necessary files
if(context.ProjectFile.Commands.Count == 1) if (context.ProjectFile.Commands.Count == 1)
{ {
var commandName = context.ProjectFile.Commands.Single().Key; var commandName = context.ProjectFile.Commands.Single().Key;
// Move coreconsole and the matching dll // Move coreconsole and the matching dll
var renamedExe = Path.Combine(outputPath, commandName + ".exe"); var renamedExe = Path.Combine(outputPath, commandName + ".exe");
var renamedDll = Path.ChangeExtension(renamedExe, ".dll"); var renamedDll = Path.ChangeExtension(renamedExe, ".dll");
if(File.Exists(renamedExe)) if (File.Exists(renamedExe))
{ {
File.Delete(renamedExe); File.Delete(renamedExe);
} }