diff options
author | Jeremy Koritzinsky <jkoritzinsky@gmail.com> | 2017-07-21 22:53:46 +0300 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2017-07-21 22:53:46 +0300 |
commit | 620db716ecb0842a1172fc60108a4fe6cd4b6861 (patch) | |
tree | 0cfbba1ae4b228af3a259f24171d23f7ba6e66e7 /Documentation | |
parent | 5366dc13818516ea0355826fab0f09061254102c (diff) |
Updated paths to ILC in docs and fixed .vscode/launch.json (#4212)
Diffstat (limited to 'Documentation')
3 files changed, 11 insertions, 8 deletions
diff --git a/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md b/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md index a241e9d96..0642f8c3b 100644 --- a/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md +++ b/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md @@ -13,7 +13,7 @@ If you're using Visual Studio 2017, you need to run the above command from the " This will result in the following: - Restore nuget packages required for building -- Build native and managed components of ILCompiler. The final binaries are placed to `<repo_root>\bin\Product\<OS>.<arch>.<Config>\packaging\publish1`. +- Build native and managed components of ILCompiler. The final binaries are placed to `<repo_root>\bin\<OS>.<arch>.<Config>\tools`. - Build and run tests # Install latest CLI tools @@ -45,11 +45,11 @@ You should now be able to use the `dotnet` commands of the CLI tools. </Project> ``` -* Set IlcPath environment variable to point to the built binaries. Alternatively, pass an extra `/p:IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug` argument to all dotnet commands below. +* Set IlcPath environment variable to point to the built binaries. Alternatively, pass an extra `/p:IlcPath=<repo_root>\bin\Windows_NT.x64.Debug` argument to all dotnet commands below. - * Unix: `export IlcPath=<repo_root>/bin/Product/Linux.x64.Debug` + * Unix: `export IlcPath=<repo_root>/bin/Linux.x64.Debug` - * Windows: `set IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug` + * Windows: `set IlcPath=<repo_root>\bin\Windows_NT.x64.Debug` * Run `dotnet restore`. This will download nuget packages required for compilation. @@ -95,7 +95,7 @@ If you are seeing errors such as: ``` libcpmtd.lib(nothrow.obj) : fatal error LNK1112: module machine type 'X86' conflicts with target machine type 'x64' [C:\Users\[omitted]\nativetest\app\app.csproj] -C:\Users\[omitted]\nativetest\bin\Product\Windows_NT.x64.Debug\packaging\publish1\Microsoft.NETCore.Native.targets(151,5): error MSB3073: The command "link @"obj\Debug\netcoreapp1.0\native\link.rsp"" exited with code 1112. [C:\Users\[omitted]\nativetest\app\app.csproj] +C:\Users\[omitted]\nativetest\bin\Windows_NT.x64.Debug\build\Microsoft.NETCore.Native.targets(151,5): error MSB3073: The command "link @"obj\Debug\netcoreapp1.0\native\link.rsp"" exited with code 1112. [C:\Users\[omitted]\nativetest\app\app.csproj] ``` Make sure you run these commands from the `x64 Native Tools Command Prompt for VS 2017` instead of a vanilla command prompt diff --git a/Documentation/how-to-build-and-run-ilcompiler-in-visual-studio.md b/Documentation/how-to-build-and-run-ilcompiler-in-visual-studio.md index d4169fed6..8c20b5668 100644 --- a/Documentation/how-to-build-and-run-ilcompiler-in-visual-studio.md +++ b/Documentation/how-to-build-and-run-ilcompiler-in-visual-studio.md @@ -12,7 +12,7 @@ Build your repo by issuing the following command at repo root: build.cmd ``` -If you changed `c:\corert\src\ILCompiler\repro\project.json` +If you changed `c:\corert\src\ILCompiler\repro\repro.csproj` ``` build.cmd clean diff --git a/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md b/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md index df1f3fe9b..e17ca9bbc 100644 --- a/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md +++ b/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md @@ -25,11 +25,14 @@ And then press SHIFT+COMMAND+B to start the build. Go to the debug pane and click Debug, choose .NET Core as the environment. If needed, you can change program property in launch.json (the gear button) to point to a different flavor of ilc: ```json + "windows": { + "program": "${workspaceRoot}/bin/Windows_NT.x64.Debug/tools/ilc.dll" + }, "osx": { - "program": "${workspaceRoot}/bin/Product/OSX.x64.Debug/packaging/publish1/ilc.dll" + "program": "${workspaceRoot}/bin/OSX.x64.Debug/tools/ilc.dll" }, "linux": { - "program": "${workspaceRoot}/bin/Product/Linux.x64.Debug/packaging/publish1/ilc.dll" + "program": "${workspaceRoot}/bin/Linux.x64.Debug/tools/ilc.dll" }, ``` |