Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 8209fbd

Browse files
ericstjericstj
committed
Fix Ref:Def mismatch in partial facade test projects
Partial facades build against the live implementation assemblies for their dependencies, via project references. As a result they reference the latest version of the dependency. This is causing a problem because we haven't yet built and published that version as a package. For now, we'll let the tests bring in the implementation assembly via a project reference. In the future we'll need to investigate if we can get these building on package references so that they don't require this workaround. https://github.com/dotnet/corefx/issues/2817
1 parent 45f4ffb commit 8209fbd

File tree

5 files changed

+42
-0
lines changed

5 files changed

+42
-0
lines changed

‎src/System.Collections/tests/System.Collections.Tests.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
2424
</ProjectReference>
25+
<ProjectReference Include="..\..\System.Runtime\src\System.Runtime.CoreCLR.csproj">
26+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
27+
<OutputItemType>Content</OutputItemType>
28+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
29+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
30+
</ProjectReference>
31+
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
32+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
33+
<OutputItemType>Content</OutputItemType>
34+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
36+
</ProjectReference>
2537
</ItemGroup>
2638
<ItemGroup>
2739
<Compile Include="BitArray\BitArray_CtorTests.cs" />

‎src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@
6565
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6666
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
6767
</ProjectReference>
68+
<ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.CoreCLR.csproj">
69+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
70+
<OutputItemType>Content</OutputItemType>
71+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
73+
</ProjectReference>
74+
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
75+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
76+
<OutputItemType>Content</OutputItemType>
77+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
78+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
79+
</ProjectReference>
6880
</ItemGroup>
6981
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
7082
</Project>

‎src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3737
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
3838
</ProjectReference>
39+
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
40+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
41+
<OutputItemType>Content</OutputItemType>
42+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
44+
</ProjectReference>
3945
</ItemGroup>
4046
<ItemGroup>
4147
<None Include="project.json" />

‎src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2626
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
2727
</ProjectReference>
28+
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
29+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
30+
<OutputItemType>Content</OutputItemType>
31+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
32+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
33+
</ProjectReference>
2834
</ItemGroup>
2935
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
3036
</Project>

‎src/System.Threading/tests/System.Threading.Tests.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4747
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
4848
</ProjectReference>
49+
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
50+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
51+
<OutputItemType>Content</OutputItemType>
52+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
53+
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
54+
</ProjectReference>
4955
</ItemGroup>
5056
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
5157
</Project>

0 commit comments

Comments
 (0)