From 871debe753fe57d09af8f504349c4860125b2da1 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Mon, 8 Jan 2018 18:13:17 -0800
Subject: [PATCH] Use platform assemblies paths instead of app paths for
 crossgen

---
 build/SharedFx.props   | 3 +++
 build/SharedFx.targets | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/SharedFx.props b/build/SharedFx.props
index d9e8ce3372..ea3f45c872 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -14,6 +14,9 @@
     <_InstallerSourceDir>$(RepositoryRoot).deps\Installers\</_InstallerSourceDir>
     <_DockerRootDir>/opt/code/</_DockerRootDir>
     <_InstallersOutputDir>$(ArtifactsDir)installers\</_InstallersOutputDir>
+    <!-- 3B = semicolon in ASCII -->
+    <PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
+    <PathSeparator Condition="$(SharedFxRID.StartsWith('win'))">%3B</PathSeparator>
 
     <!-- installers -->
     <SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName>
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index f396901da0..6092d80c68 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -208,8 +208,7 @@
       <CrossGenArgs Include="-readytorun" />
       <CrossGenArgs Include="-in %(AssembliesToCrossgen.Source)" />
       <CrossGenArgs Include="-out %(AssembliesToCrossgen.Destination)" />
-      <CrossGenArgs Include="-app_paths $(SharedFxPublishDirectory)" />
-      <CrossGenArgs Include="-platform_assemblies_paths $(SharedFxCrossGenToolDirectory)" />
+      <CrossGenArgs Include="-platform_assemblies_paths $(SharedFxPublishDirectory)$(PathSeparator)$(SharedFxCrossGenToolDirectory)" />
       <CrossGenArgs Include="-JITPath %(ClrJitAssembly.FullPath)" />
     </ItemGroup>
 
@@ -233,8 +232,7 @@
     <ItemGroup>
       <CrossGenSymbolsArgs Include="-nologo" />
       <CrossGenSymbolsArgs Include="-readytorun" />
-      <CrossGenSymbolsArgs Include="-app_paths $(SharedFxPublishDirectory)" />
-      <CrossGenSymbolsArgs Include="-platform_assemblies_paths $(SharedFxCrossGenToolDirectory)" />
+      <CrossGenSymbolsArgs Include="-platform_assemblies_paths $(SharedFxPublishDirectory)$(PathSeparator)$(SharedFxCrossGenToolDirectory)" />
       <CrossGenSymbolsArgs Include="-$(CrossGenSymbolsType)" />
       <CrossGenSymbolsArgs Include="%(AssembliesToCrossgen.Symbols)" />
       <CrossGenSymbolsArgs Include="%(AssembliesToCrossgen.Destination)" />