Skip to content

Commit c45b03a

Browse files
authored
Fix BinderTracingTest (non-clean) build on Linux (#55225)
1 parent d4b98b9 commit c45b03a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/tests/Loader/binding/tracing/BinderTracingTest.targets

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@
3838
<Target Name="MoveDependentAssembliesToSubdirectory" AfterTargets="CopyFilesToOutputDirectory">
3939
<PropertyGroup>
4040
<AssemblyToLoadResourceCulture>fr-FR</AssemblyToLoadResourceCulture>
41+
<DependentAssembliesDirectory>$(OutDir)/DependentAssemblies</DependentAssembliesDirectory>
4142
</PropertyGroup>
4243
<ItemGroup>
43-
<SatelliteAssembliesToMove Include="$(OutDir)/**/AssemblyToLoad_*.resources.*" />
44+
<SatelliteAssembliesToMove Include="$(OutDir)/**/AssemblyToLoad_*.resources.*" Exclude="$(DependentAssembliesDirectory)/**" />
4445
<AssembliesToCopy Include="$(OutDir)/AssemblyToLoad.dll" />
4546
<AssembliesToMove Include="$(OutDir)/AssemblyToLoad_*.*" />
4647
<AssembliesToMove Include="$(OutDir)/AssemblyToLoadDependency.*" />
4748
</ItemGroup>
48-
<Copy SourceFiles="@(AssembliesToCopy)" DestinationFolder="$(OutDir)/DependentAssemblies" />
49-
<Move SourceFiles="@(AssembliesToMove)" DestinationFolder="$(OutDir)/DependentAssemblies" />
50-
<Move SourceFiles="@(SatelliteAssembliesToMove)" DestinationFolder="$(OutDir)/DependentAssemblies/$(AssemblyToLoadResourceCulture)" />
49+
<Copy SourceFiles="@(AssembliesToCopy)" DestinationFolder="$(DependentAssembliesDirectory)" />
50+
<Move SourceFiles="@(AssembliesToMove)" DestinationFolder="$(DependentAssembliesDirectory)" />
51+
<Move SourceFiles="@(SatelliteAssembliesToMove)" DestinationFolder="$(DependentAssembliesDirectory)/$(AssemblyToLoadResourceCulture)" />
5152
</Target>
5253
</Project>

0 commit comments

Comments
 (0)