File tree Expand file tree Collapse file tree 3 files changed +9
-3
lines changed Expand file tree Collapse file tree 3 files changed +9
-3
lines changed Original file line number Diff line number Diff line change 527
527
variables is horribly slow (seeing 1.4 seconds on a 11th gen Intel Core i7) -->
528
528
<IlcUseEnvironmentalTools >true</IlcUseEnvironmentalTools >
529
529
530
- <!-- NativeAOT compiled output is placed into a 'native' subdirectory: we need to tweak
530
+ <!-- NativeAOT compiled output is placed into a 'native' subdirectory: we need to set
531
531
rpath so that the test can load its native library dependencies if there's any -->
532
- <IlcRPath Condition =" '$(TargetOS)' == 'osx' or '$(TargetsAppleMobile)' == 'true'" >@executable_path/..</IlcRPath >
533
- <IlcRPath Condition =" '$(IlcRPath)' == ''" >$ORIGIN/..</IlcRPath >
532
+ <IlcRPath Condition =" '$(SetIlcRPath)' != 'false' and ('$( TargetOS)' == 'osx' or '$(TargetsAppleMobile)' == 'true') " >@executable_path/..</IlcRPath >
533
+ <IlcRPath Condition =" '$(SetIlcRPath)' != 'false' and '$( IlcRPath)' == ''" >$ORIGIN/..</IlcRPath >
534
534
535
535
<!-- Works around "Error: Native compilation can run on x64 and arm64 hosts only" -->
536
536
<DisableUnsupportedError >true</DisableUnsupportedError >
Original file line number Diff line number Diff line change 4
4
<!-- in its output folder for the purpose of testing assembly loading. -->
5
5
<RequiresProcessIsolation >true</RequiresProcessIsolation >
6
6
<AllowUnsafeBlocks >true</AllowUnsafeBlocks >
7
+ <SetIlcRPath >false</SetIlcRPath >
7
8
</PropertyGroup >
8
9
<ItemGroup >
9
10
<Compile Include =" *.cs" />
Original file line number Diff line number Diff line change 6
6
<AllowUnsafeBlocks >true</AllowUnsafeBlocks >
7
7
<!-- Finalize in different assembly from Dispose, tries to load the assembly with Dispose after the ALC unload started -->
8
8
<UnloadabilityIncompatible >true</UnloadabilityIncompatible >
9
+ <SetIlcRPath >false</SetIlcRPath >
9
10
</PropertyGroup >
10
11
<ItemGroup >
11
12
<Compile Include =" *.cs" />
44
45
<ItemGroup >
45
46
<NativeLibrariesToCopyAOT Include =" $(OutDir)/libNativeLibrary.*" />
46
47
<NativeLibrariesToCopyAOT Include =" $(OutDir)/NativeLibrary.*" />
48
+ <GlobalLoadHelpersToCopy Include =" $(OutDir)/libGlobalLoadHelper.*" />
49
+ <GlobalLoadHelpersToCopy Include =" $(OutDir)/GlobalLoadHelper.*" />
47
50
</ItemGroup >
51
+ <Copy SourceFiles =" @(NativeLibrariesToCopyAOT)" DestinationFiles =" @(NativeLibrariesToCopyAOT -> '$(NativeOutputPath)/%(Filename)%(Extension)')" />
48
52
<Copy SourceFiles =" @(NativeLibrariesToCopyAOT)" DestinationFiles =" @(NativeLibrariesToCopyAOT -> '$(NativeOutputPath)/%(Filename)-in-native%(Extension)')" />
53
+ <Copy SourceFiles =" @(GlobalLoadHelpersToCopy)" DestinationFiles =" @(GlobalLoadHelpersToCopy -> '$(NativeOutputPath)/%(Filename)%(Extension)')" />
49
54
</Target >
50
55
</Project >
You can’t perform that action at this time.
0 commit comments