diff options
| author | Chris Sienkiewicz <chsienki@microsoft.com> | 2018-08-03 10:11:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 10:11:32 -0700 |
| commit | 101baee1010eaad47cd7afd1e041a7f422aefa78 (patch) | |
| tree | 3257365fa66dabb5e71d0dca0d88773841c7f405 /tests/build.proj | |
| parent | 1ef1f2a27c2e79ce0eaab59a6cefe84d8a79fc95 (diff) | |
| download | coreclr-101baee1010eaad47cd7afd1e041a7f422aefa78.tar.gz coreclr-101baee1010eaad47cd7afd1e041a7f422aefa78.tar.bz2 coreclr-101baee1010eaad47cd7afd1e041a7f422aefa78.zip | |
Build managed tests with dotnet (#19254)
* Change managed projects to build with dotnet msbuild, rather than desktop msbuild
* Build sdk tests as AnyCPU
* Correct args passed through to dotnet for tests
* Remove extra backslash from baseIntermediateOutputPath that was causing individual test exe builds to fail
* Fix double import warning for sdk projects
* Add default params from config.json to build-test dotnet invocations
* Fix priority argument passing from the command line for tests
Diffstat (limited to 'tests/build.proj')
| -rw-r--r-- | tests/build.proj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/build.proj b/tests/build.proj index a421b130b6..6bdc8690bf 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -51,8 +51,8 @@ </Target> <Target Name="RestorePackage"> - <Exec Condition="'$(RunningOnCore)' == 'false'" Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> - <Exec Condition="'$(RunningOnCore)' == 'true'" Command="$(DotnetRestoreCommand) -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> + <Exec Condition="'$(__DistroRid)' == ''" Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> + <Exec Condition="'$(__DistroRid)' != ''" Command="$(DotnetRestoreCommand) -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> </Target> <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> |