From: Eric St. John <ericstj@microsoft.com>
Date: Tue, 2 May 2017 20:16:52 +0000 (-0700)
Subject: Fix folder name for cross-targeting assets
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7043^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd0c5f49d3c8b0878dc521a8484681633513a39f;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix folder name for cross-targeting assets


Commit migrated from https://github.com/dotnet/coreclr/commit/7c53fc2cee6f0a37db8a7d797c8cd2482c96cef6
---

diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props
index a7d8555..cd37324 100644
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props
@@ -44,7 +44,7 @@
     <LongNameFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordaccore.dll;
                            $(BinDir)$(CrossTargetComponentFolder)\sos.dll"
                   Condition="'$(HasCrossTargetComponents)'=='true'">
-      <TargetPath>tools\$(CrossTargetComponentFolder)_$(PackagePlatform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension)</TargetPath>
+      <TargetPath>tools\$(CrossTargetComponentFolder)_$(Platform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension)</TargetPath>
     </LongNameFile>
   </ItemGroup>
 </Project>
diff --git a/src/coreclr/src/.nuget/dir.targets b/src/coreclr/src/.nuget/dir.targets
index 49e550a..8628a0d 100644
--- a/src/coreclr/src/.nuget/dir.targets
+++ b/src/coreclr/src/.nuget/dir.targets
@@ -32,10 +32,10 @@
 
     <ItemGroup Condition="'$(HasCrossTargetComponents)'=='true'">
       <NativeWithSymbolFile Include="@(CrossArchitectureSpecificNativeFileAndSymbol)">
-        <TargetPath>runtimes/$(CrossTargetComponentFolder)_$(PackagePlatform)/native</TargetPath>
+        <TargetPath>runtimes/$(CrossTargetComponentFolder)_$(Platform)/native</TargetPath>
       </NativeWithSymbolFile>
       <NativeWithSymbolFile Include="@(CrossArchitectureSpecificToolFile)">
-        <TargetPath>tools/$(CrossTargetComponentFolder)_$(PackagePlatform)</TargetPath>
+        <TargetPath>tools/$(CrossTargetComponentFolder)_$(Platform)</TargetPath>
       </NativeWithSymbolFile>
     </ItemGroup>