diff options
| author | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-02 20:34:21 -0700 |
|---|---|---|
| committer | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-06 17:15:13 -0700 |
| commit | 377ee6ce052d5615e38dfe1c649f1d6fcd3b67bb (patch) | |
| tree | 4a8d48bcae0bedc0dfe1fd238d161a5ba203e96c /tests | |
| parent | c10efe004d8720a799bf666d3fac3b800f204848 (diff) | |
| download | coreclr-377ee6ce052d5615e38dfe1c649f1d6fcd3b67bb.tar.gz coreclr-377ee6ce052d5615e38dfe1c649f1d6fcd3b67bb.tar.bz2 coreclr-377ee6ce052d5615e38dfe1c649f1d6fcd3b67bb.zip | |
[WIP] Update vc-runtime package to support ARM and ARM64 with current builds.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/arm/Tests.lst | 2 | ||||
| -rw-r--r-- | tests/arm64/Tests.lst | 2 | ||||
| -rw-r--r-- | tests/build.proj | 2 | ||||
| -rw-r--r-- | tests/publishdependency.targets | 4 | ||||
| -rw-r--r-- | tests/src/Common/vc_runtime/vc_runtime.csproj | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/arm/Tests.lst b/tests/arm/Tests.lst index e317236e25..49a092c005 100644 --- a/tests/arm/Tests.lst +++ b/tests/arm/Tests.lst @@ -10417,7 +10417,7 @@ RelativePath=Exceptions\ForeignThread\ForeignThreadExceptions\ForeignThreadExcep WorkingDir=Exceptions\ForeignThread\ForeignThreadExceptions Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;12898 +Categories=EXPECTED_PASS HostStyle=0 [box-unbox-generics013.cmd_1310] diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst index 56e94c0f43..c89410a8da 100644 --- a/tests/arm64/Tests.lst +++ b/tests/arm64/Tests.lst @@ -89585,7 +89585,7 @@ RelativePath=Exceptions\ForeignThread\ForeignThreadExceptions\ForeignThreadExcep WorkingDir=Exceptions\ForeignThread\ForeignThreadExceptions Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_FAIL;10636;NEW +Categories=EXPECTED_PASS;NEW HostStyle=0 [MathFExp.cmd_11575] diff --git a/tests/build.proj b/tests/build.proj index a421b130b6..1235c17cc7 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -26,7 +26,7 @@ <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\vc_runtime\vc_runtime.csproj" Condition="'$(__BuildArch)' == 'arm'"/> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\vc_runtime\vc_runtime.csproj" Condition="'$(__BuildArch)' == 'arm' or '$(__BuildArch)' == 'arm64'"/> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" /> diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 346b1749f8..e2addca7a4 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -32,7 +32,7 @@ <ItemGroup> <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/> - <VCRuntimeFiles Include="..\packages\vc-runtime\$(VCRuntimeVersion)\lib\netcoreapp1.1\*.dll"/> + <VCRuntimeFiles Include="..\packages\vc-runtime\$(VCRuntimeVersion)\content\VC\Redist\MSVC\14.14.26405\onecore\$(BuildArch)\Microsoft.VC141.CRT\*"/> </ItemGroup> <PropertyGroup> @@ -162,7 +162,7 @@ <Target Name="CopyVCRuntimeToCoreRoot" AfterTargets="CopyDependecyToCoreRoot" Outputs="$(CORE_ROOT)\*.*" - Condition="'$(BuildArch)' == 'arm'"> + Condition="'$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'"> <Copy SourceFiles="@(VCRuntimeFiles)" diff --git a/tests/src/Common/vc_runtime/vc_runtime.csproj b/tests/src/Common/vc_runtime/vc_runtime.csproj index 3380240ff6..e319af8d8b 100644 --- a/tests/src/Common/vc_runtime/vc_runtime.csproj +++ b/tests/src/Common/vc_runtime/vc_runtime.csproj @@ -5,8 +5,8 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> - <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> - <NugetTargetMonikerShort>netcoreapp1.1</NugetTargetMonikerShort> + <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort> <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> @@ -15,10 +15,10 @@ </PackageReference> </ItemGroup> <PropertyGroup> - <TargetFramework>netcoreapp1.1</TargetFramework> + <TargetFramework>netcoreapp3.0</TargetFramework> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback> - <RuntimeIdentifiers>win-arm</RuntimeIdentifiers> + <RuntimeIdentifiers>win-arm;win-arm64</RuntimeIdentifiers> <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> |