diff options
author | smile21prc <xiwe@microsoft.com> | 2017-08-17 10:42:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-17 10:42:22 -0700 |
commit | b2b5fef27a4cb68571549f2e19660f39bd76467b (patch) | |
tree | eb413e3bcf0b97ac2efaef54a872479da96ea4bc /tests/src | |
parent | 6e01319382dff1a08412602df207a7d38ed61526 (diff) | |
download | coreclr-b2b5fef27a4cb68571549f2e19660f39bd76467b.tar.gz coreclr-b2b5fef27a4cb68571549f2e19660f39bd76467b.tar.bz2 coreclr-b2b5fef27a4cb68571549f2e19660f39bd76467b.zip |
Enable RedHat 6 in coreclr master (#13315)
* Enable RedHat 6 in coreclr master
Enable RedHat 6 in coreclr master.
This is identical as the approved PR to enable RedHat 6 in coreclr
release/2.0.0:
https://github.com/dotnet/coreclr/pull/13301
* Correct Rid to match /src/.nuget/dirs.props
Correct Rid to match /src/.nuget/dirs.props
* Update dockertag and add logic to detect RHEL6 in init-tools.sh
Update dockertag and add logic to detect RHEL6 in init-tools.sh
* Port changes from Release/2.0.0 to fix coreclr RHEL 6 official runs.
Port changes from Release/2.0.0 to fix coreclr RHEL 6 official runs.
* Remove empty quotes.
Remove empty quotes.
Diffstat (limited to 'tests/src')
4 files changed, 6 insertions, 6 deletions
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..e61cb44e9b 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,11 +28,11 @@ <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>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.6-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-x64</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" - DependsOnTargets="ResolveReferences" /> + DependsOnTargets="ResolveReferences" /> </Project> 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..1cbc5ef238 100644 --- a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj @@ -16,11 +16,11 @@ <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>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.6-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" - DependsOnTargets="ResolveReferences" /> + DependsOnTargets="ResolveReferences" /> </Project> diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index cf1576a0f4..9ff057e387 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>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.6-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</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..facaf926a8 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>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.6-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> |