summaryrefslogtreecommitdiff
path: root/tests/src/dir.props
diff options
context:
space:
mode:
authorPat Gavlin <pgavlin@gmail.com>2017-06-08 15:59:07 -0700
committerGitHub <noreply@github.com>2017-06-08 15:59:07 -0700
commit46201b3b92bcacfff7518bf98b3627879158c322 (patch)
tree296f2e4d4505e2fadf2e1f1d03fcb721017b8927 /tests/src/dir.props
parentb4cbd9dbdc9f1850e5953bc785d2abb6cf0f69c3 (diff)
parent37751e7d129c94b372e968e8f99940c03ad76145 (diff)
downloadcoreclr-46201b3b92bcacfff7518bf98b3627879158c322.tar.gz
coreclr-46201b3b92bcacfff7518bf98b3627879158c322.tar.bz2
coreclr-46201b3b92bcacfff7518bf98b3627879158c322.zip
Merge pull request #12011 from pgavlin/FixTestNugetRuntimeId
Fix TestNugetRuntimeId.
Diffstat (limited to 'tests/src/dir.props')
-rw-r--r--tests/src/dir.props8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/dir.props b/tests/src/dir.props
index 8fb03f2acd..03c04a2a95 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -34,28 +34,28 @@
<When Condition="'$(OSGroup)'=='Windows_NT'">
<PropertyGroup>
<TargetsWindows>true</TargetsWindows>
- <TestNugetRuntimeId>win7-x64</TestNugetRuntimeId>
+ <TestNugetRuntimeId>win7-$(__BuildArch)</TestNugetRuntimeId>
</PropertyGroup>
</When>
<When Condition="'$(OSGroup)'=='Linux'">
<PropertyGroup>
<TargetsUnix>true</TargetsUnix>
<TargetsLinux>true</TargetsLinux>
- <TestNugetRuntimeId>ubuntu.14.04-x64</TestNugetRuntimeId>
+ <TestNugetRuntimeId>ubuntu.14.04-$(__BuildArch)</TestNugetRuntimeId>
</PropertyGroup>
</When>
<When Condition="'$(OSGroup)'=='OSX'">
<PropertyGroup>
<TargetsUnix>true</TargetsUnix>
<TargetsOSX>true</TargetsOSX>
- <TestNugetRuntimeId>osx.10.12-x64</TestNugetRuntimeId>
+ <TestNugetRuntimeId>osx.10.12-$(__BuildArch)</TestNugetRuntimeId>
</PropertyGroup>
</When>
<When Condition="'$(OSGroup)'=='FreeBSD'">
<PropertyGroup>
<TargetsUnix>true</TargetsUnix>
<TargetsFreeBSD>true</TargetsFreeBSD>
- <TestNugetRuntimeId>ubuntu.14.04-x64</TestNugetRuntimeId>
+ <TestNugetRuntimeId>ubuntu.14.04-$(__BuildArch)</TestNugetRuntimeId>
</PropertyGroup>
</When>
<Otherwise>