diff options
Diffstat (limited to 'tests')
7 files changed, 10 insertions, 7 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index eeca687c40..983223b109 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -338,8 +338,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <Import Project="publishdependency.targets" /> <PropertyGroup> - <TargetRid Condition="'$(RuntimeId)' != ''">$(RuntimeId)</TargetRid> - <TargetRid Condition="'$(RuntimeId)' == ''">$(TestNugetRuntimeId)</TargetRid> <DesiredPackageVersionArg Condition="'$(DesiredPackageVersionArg)' == ''">$(CoreClrPackageVersion)</DesiredPackageVersionArg> </PropertyGroup> diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj index 088528579a..f3ae3050fe 100644 --- a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj +++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj @@ -28,7 +28,7 @@ <TargetFramework>netcoreapp2.1</TargetFramework> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback> - <RuntimeIdentifiers>win-arm;win-x64;win-x86;win7-x86;win7-x64;win10-arm64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-x64</RuntimeIdentifiers> + <RuntimeIdentifiers>$(TargetRid)</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> diff --git a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj index a7828fedff..5f6e901bfe 100644 --- a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj @@ -16,7 +16,7 @@ <TargetFramework>netcoreapp1.1</TargetFramework> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> - <RuntimeIdentifiers>win-arm;win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <RuntimeIdentifiers>$(TargetRid)</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index cf1576a0f4..0e9426929f 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -27,7 +27,7 @@ <TargetFramework>netcoreapp2.1</TargetFramework> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback> - <RuntimeIdentifiers>win-arm;win-x64;win-x86;win7-x86;win7-x64;win-arm64;win-arm;win7-arm64;win7-arm;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <RuntimeIdentifiers>$(TargetRid)</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj index 5838715850..05d9986132 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -30,7 +30,7 @@ <TargetFramework>netcoreapp2.1</TargetFramework> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> - <RuntimeIdentifiers>win-arm;win-x64;win-x86;win7-x86;win7-x64;win-arm64;win-arm;win7-arm64;win7-arm;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <RuntimeIdentifiers>$(TargetRid)</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> diff --git a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj index cab63a4a81..ddc8781364 100644 --- a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj +++ b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj @@ -28,7 +28,7 @@ <TargetFrameworks>netcoreapp1.1;net45</TargetFrameworks> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> - <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <RuntimeIdentifiers>$(TargetRid)</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> diff --git a/tests/src/dir.props b/tests/src/dir.props index a6da62227f..ee2d7a31d7 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -66,6 +66,11 @@ </Choose> <PropertyGroup> + <TargetRid Condition="'$(__RuntimeId)' != ''">$(__RuntimeId)</TargetRid> + <TargetRid Condition="'$(__RuntimeId)' == ''">$(TestNugetRuntimeId)</TargetRid> + </PropertyGroup> + + <PropertyGroup> <TargetsUnknownUnix Condition="'$(TargetsUnix)' == 'true' AND '$(OSGroup)' != 'FreeBSD' AND '$(OSGroup)' != 'Linux' AND '$(OSGroup)' != 'OSX'">true</TargetsUnknownUnix> <Language Condition="'$(Language)' == '' and '$(MSBuildProjectExtension)' == '.csproj'">C#</Language> <Language Condition="'$(Language)' == '' and '$(MSBuildProjectExtension)' == '.ilproj'">IL</Language> |