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 /tests/runtest.proj | |
| 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 'tests/runtest.proj')
| -rw-r--r-- | tests/runtest.proj | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index 936825abdb..1adcfc4f12 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -370,7 +370,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <ExceptionForDepsJson Include="microsoft.netcore.app" /> <!-- TODO: We should see about generating this from scratch instead of relying on a previous deps file as a template --> - <_sharedFrameworkDepsJson Include="$(ToolsDir)dotnetcli\shared\Microsoft.NETCore.App\*\Microsoft.NETCore.App.deps.json" /> + <_sharedFrameworkDepsJson Include="$(DotnetCliPath)\shared\Microsoft.NETCore.App\*\Microsoft.NETCore.App.deps.json" /> </ItemGroup> <PropertyGroup> @@ -415,9 +415,9 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <ItemGroup> <CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" Exclude="$(CORE_ROOT)\**\@(CoreCLRBinariesToExclude -> '%(Identity)' )" /> - <HostFxFile Include="$(ToolsDir)\dotnetcli\**\$(HostFxrFileName).$(HostFxrFileExtension)" /> - <DotnetExe Include="$(ToolsDir)\dotnetcli\$(DotnetExecutableName)" /> - <HostPolicyFile Include="$(ToolsDir)\dotnetcli\**\$(HostPolicyFileName).$(HostPolicyExtension)" /> + <HostFxFile Include="$(DotnetCliPath)\**\$(HostFxrFileName).$(HostFxrFileExtension)" /> + <DotnetExe Include="$(DotnetCliPath)\$(DotnetExecutableName)" /> + <HostPolicyFile Include="$(DotnetCliPath)\**\$(HostPolicyFileName).$(HostPolicyExtension)" /> </ItemGroup> <Copy SourceFiles="@(HostFxFile)" |