diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 4de29857494251..c9711aff2d5bfb 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -183,10 +183,8 @@ - + - - diff --git a/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets b/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets index e94f759abc4f69..b0d74340c6c7d9 100644 --- a/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets +++ b/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets @@ -178,6 +178,122 @@ '$(WasmBuildingForNestedPublish)' != 'true' and '$(UsingBrowserRuntimeWorkload)' != 'true'" /> + + + + + + + + <_CoreCLRRuntimePackDir>$(MicrosoftNetCoreAppRuntimePackDir) + <_CoreCLRRuntimePackDir Condition="'$(_CoreCLRRuntimePackDir)' == ''">%(ResolvedRuntimePack.PackageDirectory) + <_CoreCLRRuntimePackDir Condition="'$(_CoreCLRRuntimePackDir)' != ''">$([MSBuild]::NormalizeDirectory('$(_CoreCLRRuntimePackDir)')) + + + + <_CoreCLRAppLocalAssembly Include="@(ReferenceCopyLocalPaths)" + Condition="'%(Extension)' == '.dll' and '%(ReferenceCopyLocalPaths.DestinationSubDirectory)' == '' and '%(ReferenceCopyLocalPaths.Culture)' == '' and !$([System.String]::Copy('%(FullPath)').StartsWith('$(_CoreCLRRuntimePackDir)', System.StringComparison.OrdinalIgnoreCase))" /> + <_CoreCLRRuntimePackAssembly Include="@(ReferenceCopyLocalPaths)" + Condition="'%(Extension)' == '.dll' and '%(ReferenceCopyLocalPaths.DestinationSubDirectory)' == '' and '%(ReferenceCopyLocalPaths.Culture)' == '' and $([System.String]::Copy('%(FullPath)').StartsWith('$(_CoreCLRRuntimePackDir)', System.StringComparison.OrdinalIgnoreCase))" /> + + + + <_CoreCLRAppLocalAssemblyNames>;@(_CoreCLRAppLocalAssembly->'%(FileName)%(Extension)'); + <_CoreCLRRuntimePackAssemblyNames>;@(_CoreCLRRuntimePackAssembly->'%(FileName)%(Extension)'); + + + + <_CoreCLRConflictCandidate Include="@(_CoreCLRRuntimePackAssembly)" + Condition="$(_CoreCLRAppLocalAssemblyNames.IndexOf(';%(FileName)%(Extension);', System.StringComparison.OrdinalIgnoreCase)) != -1" /> + <_CoreCLRConflictCandidate Include="@(_CoreCLRAppLocalAssembly)" + Condition="$(_CoreCLRRuntimePackAssemblyNames.IndexOf(';%(FileName)%(Extension);', System.StringComparison.OrdinalIgnoreCase)) != -1" /> + + + + + + + + + + + + + + + + + +