Remove vc-runtime package dependency (#21643)

5 files changed, 2 insertions, 51 deletions

diff --git a/dependencies.props b/dependencies.props
index 637e8e510e..6a0c64fc93 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -44,7 +44,6 @@
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.4</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
     <CommandLineParserVersion>2.2.0</CommandLineParserVersion>
-    <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/tests/build.proj b/tests/build.proj
index 20866db5aa..4fd840c92b 100644
--- a/tests/build.proj
+++ b/tests/build.proj
@@ -26,7 +26,6 @@
     <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' 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 e2addca7a4..1888d10735 100644
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -32,7 +32,6 @@
 
   <ItemGroup>
     <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
-    <VCRuntimeFiles Include="..\packages\vc-runtime\$(VCRuntimeVersion)\content\VC\Redist\MSVC\14.14.26405\onecore\$(BuildArch)\Microsoft.VC141.CRT\*"/>
   </ItemGroup>
 
   <PropertyGroup>
@@ -40,7 +39,7 @@
     <RefDestination>$(ProductDestination)\ref</RefDestination>
   </PropertyGroup>
 
-  <Target Name="CopyDependecyToCoreRoot"
+  <Target Name="CopyDependencyToCoreRoot"
     Inputs="@(CoreRootProjectLockJsonFiles)"
     Outputs="$(CORE_ROOT)\*.*">
 
@@ -159,22 +158,4 @@
 
   </Target>
 
-  <Target Name="CopyVCRuntimeToCoreRoot"
-    AfterTargets="CopyDependecyToCoreRoot"
-    Outputs="$(CORE_ROOT)\*.*"
-    Condition="'$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">
-
-    <Copy
-      SourceFiles="@(VCRuntimeFiles)"
-      DestinationFolder="$(CORE_ROOT)"
-      SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
-      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
-      Retries="$(CopyRetryCount)"
-      RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
-      UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-
-  </Target>
-
 </Project>
diff --git a/tests/runtest.proj b/tests/runtest.proj
index 81b09be9f8..a662a288aa 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -346,7 +346,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
 
   <Target Name="CreateTestOverlay">
     <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="CopyDependecyToCoreRoot"
+             Targets="CopyDependencyToCoreRoot"
              Properties="Language=C#;TargetRid=$(TargetRid)" />
   </Target>
 
diff --git a/tests/src/Common/vc_runtime/vc_runtime.csproj b/tests/src/Common/vc_runtime/vc_runtime.csproj
deleted file mode 100644
index e319af8d8b..0000000000
--- a/tests/src/Common/vc_runtime/vc_runtime.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
-    <IsTestProject>false</IsTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="vc-runtime">
-      <Version>$(VCRuntimeVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback>
-    <RuntimeIdentifiers>win-arm;win-arm64</RuntimeIdentifiers>
-    <ContainsPackageReferences>true</ContainsPackageReferences>
-    <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="Build"
-     DependsOnTargets="ResolveReferences" />
-</Project>