diff options
| author | Elinor Fung <elfung@microsoft.com> | 2022-11-10 07:27:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 07:27:30 +0300 |
| commit | 059285bab60a7cf75c92b48dcc2fcb7bdf6a8b8a (patch) | |
| tree | ac3cb89bb83460fc0a26a65192a90d2aeb201e90 | |
| parent | 1c5708e4bd50542f323b475ec48f1eefdb2d5ce0 (diff) | |
Don't copy coreclr version of coreclr and SPCL to core_root when targeting mono (#76890)
| -rw-r--r-- | src/tests/Common/Directory.Build.targets | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tests/Common/Directory.Build.targets b/src/tests/Common/Directory.Build.targets index 6cce4ae19af..b3d05df7e69 100644 --- a/src/tests/Common/Directory.Build.targets +++ b/src/tests/Common/Directory.Build.targets @@ -109,8 +109,6 @@ Include="$(CoreCLRArtifactsPath)%(RunTimeArtifactsIncludeFolders.Identity)**/*" Exclude="@(RunTimeArtifactsExcludeFiles -> '$(CoreCLRArtifactsPath)%(Identity)')" TargetDir="%(RunTimeArtifactsIncludeFolders.Identity)" /> - - </ItemGroup> <PropertyGroup> @@ -176,10 +174,13 @@ </ItemGroup> <ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(IsDesktopOS)' == 'true' " > - <RuntimeDependencyCopyLocal Condition="'$(TargetOS)' != 'windows'" Include="$(MonoArtifactsPath)/libcoreclr$(LibSuffix)" TargetDir="" /> - <RuntimeDependencyCopyLocal Condition="'$(TargetOS)' == 'windows'" Include="$(MonoArtifactsPath)coreclr$(LibSuffix)" TargetDir="" /> + <!-- Copy the mono version of the coreclr library and SPCL instead of the corceclr one --> + <RuntimeDependencyCopyLocal Remove="$(CoreCLRArtifactsPath)$(LibPrefix)coreclr$(LibSuffix)" /> + <RuntimeDependencyCopyLocal Remove="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll" /> + <RuntimeDependencyCopyLocal Include="$(MonoArtifactsPath)$(LibPrefix)coreclr$(LibSuffix)" TargetDir="" /> + <RuntimeDependencyCopyLocal Include="$(MonoArtifactsPath)/libmono-component-*" TargetDir="" /> - <RuntimeDependencyCopyLocal Include="$(MonoArtifactsPath)/*.dll" TargetDir="/" /> + <RuntimeDependencyCopyLocal Include="$(MonoArtifactsPath)/*.dll" TargetDir="" /> </ItemGroup> <Copy |