diff options
| -rwxr-xr-x | build-test.sh | 4 | ||||
| -rw-r--r-- | tests/build.proj | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/build-test.sh b/build-test.sh index 0ebee805de..2b83380dcb 100755 --- a/build-test.sh +++ b/build-test.sh @@ -37,6 +37,10 @@ initTargetDistroRid() export __DistroRid="osx-$__BuildArch" fi fi + + if [ "$ID.$VERSION_ID" == "ubuntu.16.04" ]; then + export __DistroRid="ubuntu.14.04-$__BuildArch" + fi } isMSBuildOnNETCoreSupported() diff --git a/tests/build.proj b/tests/build.proj index 2ff5f499ae..9f11919923 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -52,10 +52,10 @@ </Target> <Target Name="RestorePackage"> - <Exec Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" - StandardOutputImportance="Low" /> + <Exec Condition="'$(RunningOnCore)' == 'false'" Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> + <Exec Condition="'$(RunningOnCore)' == 'true'" Command="$(DotnetRestoreCommand) -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> </Target> <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> <Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" /> -</Project>
\ No newline at end of file +</Project> |