huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use platform assemblies paths instead of app paths for crossgen

This commit is contained in:
John Luo 2018-01-08 18:13:17 -08:00 committed by =
parent 2d38720211
commit 871debe753
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/SharedFx.props
View File

@ -14,6 +14,9 @@
<_InstallerSourceDir>$(RepositoryRoot).deps\Installers\</_InstallerSourceDir> <_InstallerSourceDir>$(RepositoryRoot).deps\Installers\</_InstallerSourceDir>
<_DockerRootDir>/opt/code/</_DockerRootDir> <_DockerRootDir>/opt/code/</_DockerRootDir>
<_InstallersOutputDir>$(ArtifactsDir)installers\</_InstallersOutputDir> <_InstallersOutputDir>$(ArtifactsDir)installers\</_InstallersOutputDir>
<!-- 3B = semicolon in ASCII -->
<PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
<PathSeparator Condition="$(SharedFxRID.StartsWith('win'))">%3B</PathSeparator>
<!-- installers --> <!-- installers -->
<SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName> <SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName>

6
build/SharedFx.targets
View File

@ -208,8 +208,7 @@
<CrossGenArgs Include="-readytorun" /> <CrossGenArgs Include="-readytorun" />
<CrossGenArgs Include="-in %(AssembliesToCrossgen.Source)" /> <CrossGenArgs Include="-in %(AssembliesToCrossgen.Source)" />
<CrossGenArgs Include="-out %(AssembliesToCrossgen.Destination)" /> <CrossGenArgs Include="-out %(AssembliesToCrossgen.Destination)" />
<CrossGenArgs Include="-app_paths $(SharedFxPublishDirectory)" /> <CrossGenArgs Include="-platform_assemblies_paths $(SharedFxPublishDirectory)$(PathSeparator)$(SharedFxCrossGenToolDirectory)" />
<CrossGenArgs Include="-platform_assemblies_paths $(SharedFxCrossGenToolDirectory)" />
<CrossGenArgs Include="-JITPath %(ClrJitAssembly.FullPath)" /> <CrossGenArgs Include="-JITPath %(ClrJitAssembly.FullPath)" />
</ItemGroup> </ItemGroup>
@ -233,8 +232,7 @@
<ItemGroup> <ItemGroup>
<CrossGenSymbolsArgs Include="-nologo" /> <CrossGenSymbolsArgs Include="-nologo" />
<CrossGenSymbolsArgs Include="-readytorun" /> <CrossGenSymbolsArgs Include="-readytorun" />
<CrossGenSymbolsArgs Include="-app_paths $(SharedFxPublishDirectory)" /> <CrossGenSymbolsArgs Include="-platform_assemblies_paths $(SharedFxPublishDirectory)$(PathSeparator)$(SharedFxCrossGenToolDirectory)" />
<CrossGenSymbolsArgs Include="-platform_assemblies_paths $(SharedFxCrossGenToolDirectory)" />
<CrossGenSymbolsArgs Include="-$(CrossGenSymbolsType)" /> <CrossGenSymbolsArgs Include="-$(CrossGenSymbolsType)" />
<CrossGenSymbolsArgs Include="%(AssembliesToCrossgen.Symbols)" /> <CrossGenSymbolsArgs Include="%(AssembliesToCrossgen.Symbols)" />
<CrossGenSymbolsArgs Include="%(AssembliesToCrossgen.Destination)" /> <CrossGenSymbolsArgs Include="%(AssembliesToCrossgen.Destination)" />