diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2017-05-31 10:06:17 -0700 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2017-05-31 10:06:17 -0700 |
| commit | 1985eb421d61cbd007b7b85dc0f45665fd195735 (patch) | |
| tree | d64ca795f31c701f1f9c54b412c35b2a2f458fbb /tests/src/dir.props | |
| parent | a2abadfe7f67249cbe2b107d0b3f1b8d6f2ee06b (diff) | |
| download | coreclr-1985eb421d61cbd007b7b85dc0f45665fd195735.tar.gz coreclr-1985eb421d61cbd007b7b85dc0f45665fd195735.tar.bz2 coreclr-1985eb421d61cbd007b7b85dc0f45665fd195735.zip | |
Fix TestNugetRuntimeId.
This property was always being set to `OS-x64`, which was causing
libraries that targeted the wrong architecture to be deployed into
CORE_ROOT on x86. This change fixes this setting to use
`OS-$(__BuildArch)`.
Diffstat (limited to 'tests/src/dir.props')
| -rw-r--r-- | tests/src/dir.props | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/dir.props b/tests/src/dir.props index abad765fe4..d4f8b5d289 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> |