summaryrefslogtreecommitdiff
path: root/tests/publishdependency.targets
diff options
context:
space:
mode:
authorBruce Forstall <Bruce_Forstall@msn.com>2018-08-02 20:34:21 -0700
committerBruce Forstall <Bruce_Forstall@msn.com>2018-08-06 17:15:13 -0700
commit377ee6ce052d5615e38dfe1c649f1d6fcd3b67bb (patch)
tree4a8d48bcae0bedc0dfe1fd238d161a5ba203e96c /tests/publishdependency.targets
parentc10efe004d8720a799bf666d3fac3b800f204848 (diff)
downloadcoreclr-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/publishdependency.targets')
-rw-r--r--tests/publishdependency.targets4
1 files changed, 2 insertions, 2 deletions
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)"