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

Fixes for Windows.

Browse source
This commit is contained in:
Bryan 2015-11-17 13:02:05 -08:00
parent 6828fe0402
commit 22b3b497e0
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCommon.cs
View file

@ -15,17 +15,18 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
// TODO: This is not working because it sets the environment variables in a child process // TODO: This is not working because it sets the environment variables in a child process
// For now get around this by using x86_amd64 cross tools // For now get around this by using x86_amd64 cross tools
var commonToolsPath = Environment.GetEnvironmentVariable("VS140COMNTOOLS"); // var commonToolsPath = Environment.GetEnvironmentVariable("VS140COMNTOOLS");
var scriptPath = Path.Combine(commonToolsPath, "..\\..\\VC\\vcvarsall.bat"); // var scriptPath = Path.Combine(commonToolsPath, "..\\..\\VC\\vcvarsall.bat");
var scriptArgs = "x86_amd64"; // var scriptArgs = "x86_amd64";
var result = Command.Create(scriptPath, scriptArgs) // var result = Command.Create(scriptPath, scriptArgs)
.ForwardStdErr() // .ForwardStdErr()
.ForwardStdOut() // .ForwardStdOut()
.Execute(); // .Execute();
return result.ExitCode; // return result.ExitCode;
return 0;
} }
} }
} }

2
src/Microsoft.DotNet.Tools.Compiler.Native/project.json
View file

@ -10,7 +10,7 @@
"System.Console": "4.0.0-*", "System.Console": "4.0.0-*",
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-*",
"System.Linq": "4.0.1-*", "System.Linq": "4.0.1-*",
"System.Linq.Expressions": "4.0.1-*", "Microsoft.NETCore.TestHost": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.IO": "4.0.11-*", "System.IO": "4.0.11-*",
"System.IO.FileSystem": "4.0.1-*", "System.IO.FileSystem": "4.0.1-*",