Skip to content

Commit 6172c98

Browse files
authored
chore: Refactor test related project references (#10488)
* chore: refactor Docfx.Tests.Common project references * chore: apply `dotnet format` command
1 parent 6f2755f commit 6172c98

File tree

12 files changed

+11
-15
lines changed

12 files changed

+11
-15
lines changed

test/Directory.Build.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@
2424
<VSTestLogger>$(VSTestLogger);html%3BLogFileName=TestResults-$(MSBuildProjectName)-$(TargetFramework)-$(RUNNER_OS).html</VSTestLogger>
2525
</PropertyGroup>
2626

27+
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
28+
<ProjectReference Include="$(MSBuildThisFileDirectory)Docfx.Tests.Common/Docfx.Tests.Common.csproj" />
29+
</ItemGroup>
30+
31+
<!-- Set additional PackagesReferences to suppress warning MSB3277 (Assembly version conflict) -->
32+
<ItemGroup>
33+
<PackageReference Include="System.Collections.Immutable" />
34+
<PackageReference Include="System.Text.Json" />
35+
</ItemGroup>
36+
2737
<ItemGroup>
2838
<PackageReference Include="FluentAssertions" />
2939
<PackageReference Include="Microsoft.NET.Test.Sdk" />

test/Docfx.Build.ManagedReference.Tests/Docfx.Build.ManagedReference.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<ItemGroup>
33
<ProjectReference Include="..\..\src\Docfx.Build\Docfx.Build.csproj" />
44
<ProjectReference Include="..\..\src\Docfx.Build.ManagedReference\Docfx.Build.ManagedReference.csproj" />
5-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
65
</ItemGroup>
76
</Project>

test/Docfx.Build.OverwriteDocuments.Tests/Docfx.Build.OverwriteDocuments.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
</ItemGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\..\src\Docfx.Build.OverwriteDocuments\Docfx.Build.OverwriteDocuments.csproj" />
7-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
87
</ItemGroup>
98
</Project>

test/Docfx.Build.RestApi.Tests/Docfx.Build.RestApi.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
<ProjectReference Include="..\..\src\Docfx.Build\Docfx.Build.csproj" />
1212
<ProjectReference Include="..\..\src\Docfx.Build.ManagedReference\Docfx.Build.ManagedReference.csproj" />
1313
<ProjectReference Include="..\..\src\Docfx.Common\Docfx.Common.csproj" />
14-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
1514
</ItemGroup>
1615
</Project>

test/Docfx.Build.RestApi.WithPlugins.Tests/Docfx.Build.RestApi.WithPlugins.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
<ProjectReference Include="..\..\src\Docfx.Build.RestApi\Docfx.Build.RestApi.csproj" />
88
<ProjectReference Include="..\..\src\Docfx.DataContracts.Common\Docfx.DataContracts.Common.csproj" />
99
<ProjectReference Include="..\..\src\Docfx.DataContracts.RestApi\Docfx.DataContracts.RestApi.csproj" />
10-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
1110
</ItemGroup>
1211
</Project>

test/Docfx.Build.SchemaDriven.Tests/Docfx.Build.SchemaDriven.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
<ProjectReference Include="..\..\src\Docfx.DataContracts.Common\Docfx.DataContracts.Common.csproj" />
77
<ProjectReference Include="..\..\src\Docfx.Plugins\Docfx.Plugins.csproj" />
88
<ProjectReference Include="..\..\src\Docfx.YamlSerialization\Docfx.YamlSerialization.csproj" />
9-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
109
</ItemGroup>
1110
</Project>

test/Docfx.Build.Tests/Docfx.Build.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
<ItemGroup>
1111
<ProjectReference Include="..\..\src\Docfx.Build.Common\Docfx.Build.Common.csproj" />
1212
<ProjectReference Include="..\..\src\Docfx.Build.ManagedReference\Docfx.Build.ManagedReference.csproj" />
13-
<ProjectReference Include="..\..\src\Docfx.Build.RestApi\Docfx.Build.RestApi.csproj" />
1413
<ProjectReference Include="..\..\src\Docfx.Build.SchemaDriven\Docfx.Build.SchemaDriven.csproj" />
1514
<ProjectReference Include="..\..\src\Docfx.Build\Docfx.Build.csproj" />
1615
<ProjectReference Include="..\..\src\Docfx.Common\Docfx.Common.csproj" />
1716
<ProjectReference Include="..\..\src\Docfx.DataContracts.Common\Docfx.DataContracts.Common.csproj" />
1817
<ProjectReference Include="..\..\src\Docfx.Plugins\Docfx.Plugins.csproj" />
1918
<ProjectReference Include="..\..\src\Docfx.YamlSerialization\Docfx.YamlSerialization.csproj" />
20-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
2119
</ItemGroup>
2220
</Project>

test/Docfx.Build.UniversalReference.Tests/Docfx.Build.UniversalReference.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
<ItemGroup>
77
<ProjectReference Include="..\..\src\Docfx.Build\Docfx.Build.csproj" />
88
<ProjectReference Include="..\..\src\Docfx.Build.UniversalReference\Docfx.Build.UniversalReference.csproj" />
9-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
109
</ItemGroup>
11-
</Project>
10+
</Project>

test/Docfx.Common.Tests/Docfx.Common.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<ProjectReference Include="..\..\src\Docfx.YamlSerialization\Docfx.YamlSerialization.csproj" />
44
<ProjectReference Include="..\..\src\Docfx.Plugins\Docfx.Plugins.csproj" />
55
<ProjectReference Include="..\..\src\Docfx.Common\Docfx.Common.csproj" />
6-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
76
</ItemGroup>
87
</Project>
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<ProjectReference Include="..\..\src\Docfx.Glob\Docfx.Glob.csproj" />
4-
<ProjectReference Include="..\Docfx.Tests.Common\Docfx.Tests.Common.csproj" />
54
</ItemGroup>
65
</Project>

0 commit comments

Comments
 (0)