From 0a5bd01047256de1b42daaf88ebdd3d557fcb026 Mon Sep 17 00:00:00 2001
From: Bruce Forstall <Bruce_Forstall@msn.com>
Date: Thu, 2 Aug 2018 20:34:21 -0700
Subject: [PATCH] [WIP] Update vc-runtime package to support ARM and ARM64 with
 current builds.

---
 dependencies.props                            | 2 +-
 netci.groovy                                  | 6 ------
 tests/arm/Tests.lst                           | 2 +-
 tests/arm64/Tests.lst                         | 2 +-
 tests/build.proj                              | 2 +-
 tests/publishdependency.targets               | 4 ++--
 tests/src/Common/vc_runtime/vc_runtime.csproj | 8 ++++----
 7 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index d16d43d1f3ad..b7b1a69c183e 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -41,7 +41,7 @@
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.4</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
     <CommandLineParserVersion>2.2.0</CommandLineParserVersion>
-    <VCRuntimeVersion>1.2.0</VCRuntimeVersion>
+    <VCRuntimeVersion>2.0.0</VCRuntimeVersion>
     
     <!-- Scenario tests install this version of Microsoft.NetCore.App, then patch coreclr binaries via xcopy. At the moment it is
          updated manually whenever breaking changes require it to move forward, but it would be nice if we could update it automatically
diff --git a/netci.groovy b/netci.groovy
index 384fe1c2150e..1f9c339ee317 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -3227,12 +3227,6 @@ def static CreateWindowsArmTestJob(def dslFactory, def project, def architecture
                 def archLocation = testListArch[architecture]
 
                 addCommand("copy %WORKSPACE%\\tests\\${archLocation}\\Tests.lst bin\\tests\\${osGroup}.${architecture}.${configuration}")
-
-                if (architecture == "arm64") {
-                    addCommand("copy C:\\Jenkins\\vcruntime140.dll bin\\tests\\${osGroup}.${architecture}.${configuration}\\Tests\\Core_Root")
-                    addCommand("copy C:\\Jenkins\\vcruntime140d.dll bin\\tests\\${osGroup}.${architecture}.${configuration}\\Tests\\Core_Root")
-                }
-
                 addCommand("pushd bin\\tests\\${osGroup}.${architecture}.${configuration}")
                 addCommand("${smartyCommand}")
 
diff --git a/tests/arm/Tests.lst b/tests/arm/Tests.lst
index e317236e25b7..49a092c00558 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 56e94c0f432d..c89410a8da87 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 6bdc8690bfa0..0247cb8c68ae 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 346b1749f86d..e2addca7a40f 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 3380240ff690..e319af8d8b4b 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>