Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit b20917f

Browse files
authored
Remove vc-runtime package dependency (#21643)
1 parent 8cf62cb commit b20917f

File tree

5 files changed

+2
-51
lines changed

5 files changed

+2
-51
lines changed

dependencies.props

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
4545
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.4</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
4646
<CommandLineParserVersion>2.2.0</CommandLineParserVersion>
47-
<VCRuntimeVersion>2.0.0</VCRuntimeVersion>
4847

4948
<!-- Scenario tests install this version of Microsoft.NetCore.App, then patch coreclr binaries via xcopy. At the moment it is
5049
updated manually whenever breaking changes require it to move forward, but it would be nice if we could update it automatically

tests/build.proj

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" />
2727
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" />
2828
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" />
29-
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\vc_runtime\vc_runtime.csproj" Condition="'$(__BuildArch)' == 'arm' or '$(__BuildArch)' == 'arm64'"/>
3029
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" />
3130
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" />
3231
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" />

tests/publishdependency.targets

+1-20
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,14 @@
3232

3333
<ItemGroup>
3434
<CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
35-
<VCRuntimeFiles Include="..\packages\vc-runtime\$(VCRuntimeVersion)\content\VC\Redist\MSVC\14.14.26405\onecore\$(BuildArch)\Microsoft.VC141.CRT\*"/>
3635
</ItemGroup>
3736

3837
<PropertyGroup>
3938
<ProductDestination>$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)</ProductDestination>
4039
<RefDestination>$(ProductDestination)\ref</RefDestination>
4140
</PropertyGroup>
4241

43-
<Target Name="CopyDependecyToCoreRoot"
42+
<Target Name="CopyDependencyToCoreRoot"
4443
Inputs="@(CoreRootProjectLockJsonFiles)"
4544
Outputs="$(CORE_ROOT)\*.*">
4645

@@ -159,22 +158,4 @@
159158

160159
</Target>
161160

162-
<Target Name="CopyVCRuntimeToCoreRoot"
163-
AfterTargets="CopyDependecyToCoreRoot"
164-
Outputs="$(CORE_ROOT)\*.*"
165-
Condition="'$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">
166-
167-
<Copy
168-
SourceFiles="@(VCRuntimeFiles)"
169-
DestinationFolder="$(CORE_ROOT)"
170-
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
171-
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
172-
Retries="$(CopyRetryCount)"
173-
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
174-
UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)">
175-
<Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
176-
</Copy>
177-
178-
</Target>
179-
180161
</Project>

tests/runtest.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
346346

347347
<Target Name="CreateTestOverlay">
348348
<MSBuild Projects="$(MSBuildProjectFile)"
349-
Targets="CopyDependecyToCoreRoot"
349+
Targets="CopyDependencyToCoreRoot"
350350
Properties="Language=C#;TargetRid=$(TargetRid)" />
351351
</Target>
352352

tests/src/Common/vc_runtime/vc_runtime.csproj

-28
This file was deleted.

0 commit comments

Comments
 (0)