diff options
| author | Steve MacLean <stmaclea@microsoft.com> | 2019-03-01 23:07:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 23:07:35 -0500 |
| commit | 42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e (patch) | |
| tree | 17cb448a25ea78394faba09f2f4b1b0b2b961183 /Documentation | |
| parent | c1801e85024add717f518feb6a9caed60d54500f (diff) | |
| download | coreclr-42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e.tar.gz coreclr-42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e.tar.bz2 coreclr-42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e.zip | |
Use arcade's version of dotnet to build (#22755)
* Use arcade dotnet
* Add cmake_msbuild.cmd
Move msbuild.cmd to cmake_msbuild.bat
Document intent that this file is only used to resolve
Windows cmake dependency on desktop msbuild.exe
Remove one instance of msbuild.cmd
* Fix inittools.cmd
* Remove spurious setup_vs_tools.cmd calls
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/building/unix-test-instructions.md | 8 | ||||
| -rw-r--r-- | Documentation/workflow/RunningTests.md | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Documentation/building/unix-test-instructions.md b/Documentation/building/unix-test-instructions.md index 0bf3ab5894..05f1f994b9 100644 --- a/Documentation/building/unix-test-instructions.md +++ b/Documentation/building/unix-test-instructions.md @@ -24,17 +24,13 @@ Please note that this builds the Priority 0 tests. To build priority 1: During development there are many instances where building an individual test is fast and necessary. All of the necessary tools to build are under `coreclr/Tools`. It is possible to use `coreclr/Tools/MSBuild.dll` as you would normally use MSBuild with a few caveats. -Note that `coreclr/Tools/msbuild.sh` exists as well to make the call shorter. +Note that `coreclr/dotnet.sh` exists as well to make the call shorter. **!! Note !! -- Passing /p:__BuildOs=[OSX|Linux] is required.** ## Building an Individual Test Example ->`coreclr/Tools/msbuild.sh /maxcpucount coreclr/tests/src/JIT/CodeGenBringUpTests/Array1.csproj /p:__BuildType=Release /p:__BuildOS=OSX` - -Or - ->`coreclr/Tools/dotnetcli/dotnet coreclr/Tools/MSBuild.dll /maxcpucount coreclr/tests/src/JIT/CodeGenBringUpTests/Array1.csproj /p:__BuildType=Release /p:__BuildOS=OSX` +>`coreclr/dotnet.sh msbuild /maxcpucount coreclr/tests/src/JIT/CodeGenBringUpTests/Array1.csproj /p:__BuildType=Release /p:__BuildOS=OSX` ## Aarch64/armhf multi-arch diff --git a/Documentation/workflow/RunningTests.md b/Documentation/workflow/RunningTests.md index 5ba8ae20d9..6b0b67a38e 100644 --- a/Documentation/workflow/RunningTests.md +++ b/Documentation/workflow/RunningTests.md @@ -31,12 +31,10 @@ Note: The CoreCLR must be built prior to building an individual test. See first ### Examples -* Using the `msbuild.sh` script - * `coreclr/Tools/msbuild.sh /maxcpucount coreclr/tests/src/JIT/CodeGenBringUpTests/Array1.csproj /p:__BuildType=Release /p:__BuildOS=OSX` -* Calling `MSBuild.dll` directly - * `coreclr/Tools/dotnetcli/dotnet coreclr/Tools/MSBuild.dll /maxcpucount coreclr/tests/src/JIT/CodeGenBringUpTests/Array1.csproj /p:__BuildType=Release /p:__BuildOS=OSX` +* Using the `dotnet.sh` script + * `coreclr/dotnet.sh msbuild /maxcpucount coreclr/tests/src/JIT/CodeGenBringUpTests/Array1.csproj /p:__BuildType=Release /p:__BuildOS=OSX` ## Additional Documents * [Windows](https://github.com/dotnet/coreclr/blob/master/Documentation/building/windows-test-instructions.md) -* [Non-Windows](https://github.com/dotnet/coreclr/blob/master/Documentation/building/unix-test-instructions.md)
\ No newline at end of file +* [Non-Windows](https://github.com/dotnet/coreclr/blob/master/Documentation/building/unix-test-instructions.md) |