From 1a9a5acb41390a9eb2480d480a938155493f69bb Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Fri, 16 Oct 2015 11:11:07 -0700 Subject: [PATCH] check in CoreConsole until there's a working build --- NuGet.Config | 2 +- ext/CLRHost/win7-x64/CoreConsole.exe | Bin 0 -> 61440 bytes ext/CLRHost/win7-x64/CoreRun.exe | Bin 0 -> 70656 bytes scripts/bootstrap.cmd | 20 ++++++++------ src/Microsoft.DotNet.Cli.Utils/Constants.cs | 2 ++ src/Microsoft.DotNet.Cli/project.json | 1 - .../Program.cs | 10 +++++-- .../project.json | 3 +- src/Microsoft.DotNet.Tools.Publish/Program.cs | 26 ++++++++---------- .../project.json | 5 ++-- 10 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 ext/CLRHost/win7-x64/CoreConsole.exe create mode 100644 ext/CLRHost/win7-x64/CoreRun.exe diff --git a/NuGet.Config b/NuGet.Config index 347ae77b5..639e51ca7 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,8 +3,8 @@ + - diff --git a/ext/CLRHost/win7-x64/CoreConsole.exe b/ext/CLRHost/win7-x64/CoreConsole.exe new file mode 100644 index 0000000000000000000000000000000000000000..421805d955c8ed52096ad72f540e7f25d4ab4f7e GIT binary patch literal 61440 zcmeHw3w%>W_Wz`9AQWl}Hd=fJ2vQ%EN?EP)N}$DCO|e2jP_!*=O1rdaO%on2>rz{g z8nU8`uJ1p(tgG(o4_%eQy1z{UX#pRAiul~3=ze=f%*;)0+7!^$-@bDD zxpQXDoH=vm%$YNfdvjZG)f$$_7)!z(3Nh9KNSB?5M-NN}#!fhM^9k&!0WS<|F*sis zR#aJ4Z>{sxF7TArSj$S??pm*PzRT+Ixvf=hYwqPUtu?jfuFRB_WSeAd_}d?<^X`3h zvUWQUPMdrg((9gkWzr>pcb1(oc^c1uW%59d-#3ZU>z>;^X$FUTCMkd$ktX_$&z&5g+Np~fFr2^6o z6`}bep1@c?isRBCD?~0S6;~oFX<#f}Bt%)nWh9&qV>n&6(ZJd%mStdt0|2`jnCJ9LyO$k@_kWOU#rUR!YME<0nv%sN5%8OesWaz$>}5g}?PepP}l z&q8_7@ks#BQ#^9ni7qRvtYQIUr-Fo85ulIQyAc|S*@@0m?lnIbB zOa#*@xQl{UpuEltsou>*mp=)?TNfgzr`QGP<<5(!wuco2myAKM1s2!Yd92IuOAn#6FWMdV+El z${jA--_?|f=H0zctyq_Te;j6gXX!9A2QBM-q2qH7^BCX*Pa zQ0{XuyUvmn1iz%*eHjP_=Oa+4`6p9Fn~C^zYE~r?pGpEvBBlYNOG`qqn98ms;s%QS zj%w>7b>2wwr4Vrv1%IK8CrLg7B{L{Fg8KIZQt|r~9HgL)`t4B)@~GdAkjx=!{uvbP zAt9|K-{MRJ36y+*id7PEh;(opB{wA^SVgfvkZ9)+zyBpxbwd!ejYn`6Rqi8_am0B6 znb~dg5d1A2LHcL}H&M$c5z~vP`9)+AmrO)(1F_<^VIs~Wh|6}WGCʜkTZsqd^eh(Ua*Xn$ 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 OE_EG&`1Q}Pf&UNAebFBP literal 0 HcmV?d00001 diff --git a/ext/CLRHost/win7-x64/CoreRun.exe b/ext/CLRHost/win7-x64/CoreRun.exe new file mode 100644 index 0000000000000000000000000000000000000000..4577bc5100f09131b962fd933f4ed557ecc2cdde GIT binary patch literal 70656 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 literal 0 HcmV?d00001 diff --git a/scripts/bootstrap.cmd b/scripts/bootstrap.cmd index 617eb3fe3..a87b8a1ba 100644 --- a/scripts/bootstrap.cmd +++ b/scripts/bootstrap.cmd @@ -13,6 +13,9 @@ popd set STAGE0_DIR=%REPOROOT%\artifacts\stage0 set STAGE1_DIR=%REPOROOT%\artifacts\stage1 set STAGE2_DIR=%REPOROOT%\artifacts\stage2 +set RID=win7-x64 +set OUTPUT_ROOT=%REPOROOT%\artifacts\%RID% +set DOTNET_CLR_HOSTS_PATH=%REPOROOT%\ext\CLRHost\%RID% where dnvm >nul 2>nul if %errorlevel% == 0 goto have_dnvm @@ -49,15 +52,15 @@ call %~dp0dnvm2 upgrade if errorlevel 1 goto fail echo Building stage1 dotnet.exe ... -dotnet --framework dnxcore50 --runtime win7-x64 --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli" +dotnet --framework dnxcore50 --runtime %RID% --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli" if errorlevel 1 goto fail echo Building stage1 dotnet-compile.exe ... -dotnet --framework dnxcore50 --runtime win7-x64 --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler" +dotnet --framework dnxcore50 --runtime %RID% --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler" if errorlevel 1 goto fail echo Building stage1 dotnet-publish.exe ... -dotnet --framework dnxcore50 --runtime win7-x64 --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish" +dotnet --framework dnxcore50 --runtime %RID% --output "%STAGE1_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish" if errorlevel 1 goto fail echo Re-building dotnet tools with the bootstrapped version @@ -66,20 +69,19 @@ set PATH=%STAGE1_DIR%;%PATH% if exist %STAGE2_DIR% rd /s /q %STAGE2_DIR% -REM This works around the coreconsole bug where the path to the exe can't be found -pushd -cd %STAGE1_DIR% +REM No longer need our special CoreConsole +set DOTNET_CLR_HOSTS_PATH= echo Building stage2 dotnet.exe ... -dotnet publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli" +dotnet publish --framework dnxcore50 --runtime %RID% --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Cli" if errorlevel 1 goto fail echo Building stage2 dotnet-compile.exe ... -dotnet publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler" +dotnet publish --framework dnxcore50 --runtime %RID% --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler" if errorlevel 1 goto fail echo Building stage2 dotnet-publish.exe ... -dotnet publish --framework dnxcore50 --runtime win7-x64 --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish" +dotnet publish --framework dnxcore50 --runtime %RID% --output "%STAGE2_DIR%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Publish" if errorlevel 1 goto fail echo Bootstrapped dotnet to %STAGE2_DIR% diff --git a/src/Microsoft.DotNet.Cli.Utils/Constants.cs b/src/Microsoft.DotNet.Cli.Utils/Constants.cs index 88cae2cf7..f7ff6d8ce 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Constants.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Constants.cs @@ -12,5 +12,7 @@ namespace Microsoft.DotNet.Cli.Utils public static readonly string CoreConsoleName = "coreconsole" + ExeSuffix; public static readonly string DefaultConfiguration = "Debug"; public static readonly string BinDirectoryName = "bin"; + + public static readonly string HostsPathEnvironmentVariable = "DOTNET_CLR_HOSTS_PATH"; } } diff --git a/src/Microsoft.DotNet.Cli/project.json b/src/Microsoft.DotNet.Cli/project.json index 0f310831a..5c2fe17a3 100644 --- a/src/Microsoft.DotNet.Cli/project.json +++ b/src/Microsoft.DotNet.Cli/project.json @@ -7,7 +7,6 @@ "dotnet": "Microsoft.DotNet.Cli" }, "dependencies": { - "Microsoft.NETCore.ConsoleHost": "1.0.0-*", "Microsoft.NETCore.Runtime": "1.0.1-*", "System.Console": "4.0.0-*", diff --git a/src/Microsoft.DotNet.Tools.Compiler/Program.cs b/src/Microsoft.DotNet.Tools.Compiler/Program.cs index 8cb561e4e..3086b70b7 100644 --- a/src/Microsoft.DotNet.Tools.Compiler/Program.cs +++ b/src/Microsoft.DotNet.Tools.Compiler/Program.cs @@ -151,9 +151,13 @@ namespace Microsoft.DotNet.Tools.Compiler private static Command RunCsc(string cscArgs) { - // Hack -- if we find csc + corerun in the app directory we should - // use that, otherwise just try to find csc on the PATH - var corerun = Path.Combine(AppContext.BaseDirectory, "CoreRun.exe"); + // Locate CoreRun + string hostRoot = Environment.GetEnvironmentVariable(Constants.HostsPathEnvironmentVariable); + if(string.IsNullOrEmpty(hostRoot)) + { + hostRoot = AppContext.BaseDirectory; + } + var corerun = Path.Combine(hostRoot, "CoreRun.exe"); var cscExe = Path.Combine(AppContext.BaseDirectory, "csc.exe"); return File.Exists(corerun) && File.Exists(cscExe) ? Command.Create(corerun, $@"""{cscExe}"" {cscArgs}") diff --git a/src/Microsoft.DotNet.Tools.Compiler/project.json b/src/Microsoft.DotNet.Tools.Compiler/project.json index 05abb8573..3b1e8584d 100644 --- a/src/Microsoft.DotNet.Tools.Compiler/project.json +++ b/src/Microsoft.DotNet.Tools.Compiler/project.json @@ -7,7 +7,6 @@ "dotnet-compile": "Microsoft.DotNet.Tools.Compiler" }, "dependencies": { - "Microsoft.NETCore.ConsoleHost": "1.0.0-*", "Microsoft.NETCore.TestHost": "1.0.0-*", "Microsoft.NETCore.Runtime": "1.0.1-*", @@ -25,7 +24,7 @@ "type": "build", "version": "1.0.0-*" }, - "Microsoft.Net.Compilers.netcore": "1.1.0-*", + "Microsoft.Net.Compilers.netcore": "1.1.0-*" }, "frameworks": { "dnxcore50": { } diff --git a/src/Microsoft.DotNet.Tools.Publish/Program.cs b/src/Microsoft.DotNet.Tools.Publish/Program.cs index 9d7d9ca7c..e29a49eec 100644 --- a/src/Microsoft.DotNet.Tools.Publish/Program.cs +++ b/src/Microsoft.DotNet.Tools.Publish/Program.cs @@ -116,29 +116,25 @@ namespace Microsoft.DotNet.Tools.Publish // Publishing for windows, TODO(anurse): Publish for Mac/Linux/etc. - // CoreConsole should be there... - var coreConsole = Path.Combine(outputPath, Constants.CoreConsoleName); - if (!File.Exists(coreConsole)) + // Locate CoreConsole + string hostsPath = Environment.GetEnvironmentVariable(Constants.HostsPathEnvironmentVariable); + if(string.IsNullOrEmpty(hostsPath)) { - Reporter.Error.WriteLine($"Unable to find {Constants.CoreConsoleName} at {coreConsole}. You must have an explicit dependency on Microsoft.NETCore.ConsoleHost (for now ;))".Red().Bold()); + hostsPath = AppContext.BaseDirectory; + } + var coreConsole = Path.Combine(hostsPath, Constants.CoreConsoleName); + if(!File.Exists(coreConsole)) + { + Reporter.Error.WriteLine($"Unable to locate CoreConsole.exe in {coreConsole}, use {Constants.HostsPathEnvironmentVariable} to set the path to it.".Red().Bold()); return 1; } - // Allow CoreConsole to be replaced - string overrideCoreConsole = Environment.GetEnvironmentVariable("DOTNET_CORE_CONSOLE_PATH"); - if(!string.IsNullOrEmpty(overrideCoreConsole) && File.Exists(overrideCoreConsole)) - { - Reporter.Output.WriteLine($"Using CoreConsole override: {overrideCoreConsole}"); - File.Copy(overrideCoreConsole, coreConsole, overwrite: true); - } + // TEMPORARILY bring CoreConsole along for the ride on it's own (without renaming) + File.Copy(coreConsole, Path.Combine(outputPath, Constants.CoreConsoleName), overwrite: true); // Use the 'command' field to generate the name var outputExe = Path.Combine(outputPath, context.ProjectFile.Name + ".exe"); File.Copy(coreConsole, outputExe, overwrite: true); - if (File.Exists(coreConsole)) - { - File.Delete(coreConsole); - } // Check if the a command name is specified, and rename the necessary files if(context.ProjectFile.Commands.Count == 1) diff --git a/src/Microsoft.DotNet.Tools.Publish/project.json b/src/Microsoft.DotNet.Tools.Publish/project.json index fd2795d77..548832c49 100644 --- a/src/Microsoft.DotNet.Tools.Publish/project.json +++ b/src/Microsoft.DotNet.Tools.Publish/project.json @@ -7,9 +7,7 @@ "dotnet-publish": "Microsoft.DotNet.Tools.Publish" }, "dependencies": { - "Microsoft.NETCore.ConsoleHost": "1.0.0-*", "Microsoft.NETCore.Runtime": "1.0.1-*", - "System.Console": "4.0.0-*", "System.Collections": "4.0.11-*", "System.Linq": "4.0.1-*", @@ -23,7 +21,8 @@ "Microsoft.Extensions.CommandLineUtils.Sources": { "type": "build", "version": "1.0.0-*" - } + }, + "System.AppContext": "4.0.1-*" }, "frameworks": { "dnxcore50": { }