Use separate projects for x86 builds instead of alternate configuration

xunit · Mar 15, 2024 · 4e1033d · 4e1033d
1 parent fdac60e
commit 4e1033d
Show file tree

Hide file tree

Showing 29 changed files with 388 additions and 256 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -14,6 +14,7 @@
     <LangVersion>12.0</LangVersion>
     <MSBuildCopyContentTransitively>false</MSBuildCopyContentTransitively>
     <NoWarn>$(NoWarn);NU5105;CS0436</NoWarn>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>Xunit</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -76,10 +77,6 @@
   <!-- All test projects -->
   <Choose>
     <When Condition=" $(MSBuildProjectName.EndsWith('.tests')) ">
-      <PropertyGroup>
-        <Configurations>Debug;Debug_x86;Release;Release_x86</Configurations>
-      </PropertyGroup>
-
       <ItemGroup>
         <Content Include="$(MSBuildThisFileDirectory)xunit.runner.json" Link="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
       </ItemGroup>
@@ -119,11 +116,9 @@
   <!-- ============= -->
   <!-- 32-bit builds -->
 
-  <PropertyGroup Condition="$(Configuration.EndsWith('_x86'))">
-    <AssemblyName>$(AssemblyName).x86</AssemblyName>
+  <PropertyGroup Condition=" $(MSBuildProjectName.Contains('.x86')) ">
     <DefineConstants>$(DefineConstants);BUILD_X86</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
-    <RunCommand Condition=" '$(OS)' == 'Windows_NT' ">$(MSBuildProgramFiles32)\dotnet\dotnet</RunCommand>
   </PropertyGroup>
 
 </Project>
diff --git a/src/xunit.v3.assert.x86.tests/xunit.v3.assert.x86.tests.csproj b/src/xunit.v3.assert.x86.tests/xunit.v3.assert.x86.tests.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.assert.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+  <!-- Reduce to minimal feature set for .NET Framework tests so we know all paths get covered -->
+  <Choose>
+    <When Condition=" '$(TargetFramework)' == 'net472' ">
+      <PropertyGroup>
+        <DefineConstants>XUNIT_NULLABLE</DefineConstants>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <ProjectReference Remove="..\xunit.v3.assert\xunit.v3.assert.csproj" />
+        <ProjectReference Include="..\xunit.v3.assert.compat\xunit.v3.assert.nullable\xunit.v3.assert.nullable.csproj" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.runner.utility.tests\Compilation\AcceptanceTestAssembly.cs" LinkBase="AcceptanceTesting" />
+    <Compile Include="..\xunit.v3.runner.utility.tests\Compilation\CSharpAcceptanceTestAssembly.cs" LinkBase="AcceptanceTesting" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.common.tests/Extensions/ReflectionExtensionsTests.cs b/src/xunit.v3.common.tests/Extensions/ReflectionExtensionsTests.cs
@@ -168,7 +168,7 @@ public static void WhenUsingReflectionMethodInfo_ReturnsExistingMethodInfo()
 		public static void WhenUsingNonReflectionMethodInfo_MethodExists_ReturnsMethodInfo()
 		{
 #if BUILD_X86
-			var typeInfo = Mocks.TypeInfo("ReflectionExtensionsTests+ToRuntimeMethod", assemblyFileName: "xunit.v3.common.tests.x86.exe");
+			var typeInfo = Mocks.TypeInfo("ReflectionExtensionsTests+ToRuntimeMethod", assemblyFileName: "xunit.v3.common.x86.tests.exe");
 #else
 			var typeInfo = Mocks.TypeInfo("ReflectionExtensionsTests+ToRuntimeMethod", assemblyFileName: "xunit.v3.common.tests.exe");
 #endif
@@ -209,7 +209,7 @@ public static void WhenUsingReflectionTypeInfo_ReturnsExistingType()
 		public static void WhenUsingNonReflectionTypeInfo_TypeExists_ReturnsType()
 		{
 #if BUILD_X86
-			var typeInfo = Mocks.TypeInfo("ReflectionExtensionsTests+ToRuntimeType", assemblyFileName: "xunit.v3.common.tests.x86.exe");
+			var typeInfo = Mocks.TypeInfo("ReflectionExtensionsTests+ToRuntimeType", assemblyFileName: "xunit.v3.common.x86.tests.exe");
 #else
 			var typeInfo = Mocks.TypeInfo("ReflectionExtensionsTests+ToRuntimeType", assemblyFileName: "xunit.v3.common.tests.exe");
 #endif

diff --git a/src/xunit.v3.common.tests/Serialization/SerializationHelperTests.cs b/src/xunit.v3.common.tests/Serialization/SerializationHelperTests.cs
@@ -47,12 +47,12 @@ public class SerializationHelperTests
 
 		// IXunitSerializable and enums contain embedded type information in addition to a type index
 #if BUILD_X86
-		{ new MySerializable(1, "2", 3.4m), $"-4:{ToBase64("SerializationHelperTests+MySerializable,xunit.v3.common.tests.x86")}:{ToBase64($"p1:6:1\np2:0:{ToBase64("2")}\np3:12:3.4")}" },
-		{ MyEnum.MyValue, $"-3:{ToBase64("SerializationHelperTests+MyEnum,xunit.v3.common.tests.x86")}:123" },
-		{ (MyEnum)int.MinValue, $"-3:{ToBase64("SerializationHelperTests+MyEnum,xunit.v3.common.tests.x86")}:-2147483648" },
-		{ (MyEnum)int.MaxValue, $"-3:{ToBase64("SerializationHelperTests+MyEnum,xunit.v3.common.tests.x86")}:2147483647" },
-		{ (MyUnsignedEnum)ulong.MinValue, $"-3:{ToBase64("SerializationHelperTests+MyUnsignedEnum,xunit.v3.common.tests.x86")}:0" },
-		{ (MyUnsignedEnum)ulong.MaxValue, $"-3:{ToBase64("SerializationHelperTests+MyUnsignedEnum,xunit.v3.common.tests.x86")}:18446744073709551615" },
+		{ new MySerializable(1, "2", 3.4m), $"-4:{ToBase64("SerializationHelperTests+MySerializable,xunit.v3.common.x86.tests")}:{ToBase64($"p1:6:1\np2:0:{ToBase64("2")}\np3:12:3.4")}" },
+		{ MyEnum.MyValue, $"-3:{ToBase64("SerializationHelperTests+MyEnum,xunit.v3.common.x86.tests")}:123" },
+		{ (MyEnum)int.MinValue, $"-3:{ToBase64("SerializationHelperTests+MyEnum,xunit.v3.common.x86.tests")}:-2147483648" },
+		{ (MyEnum)int.MaxValue, $"-3:{ToBase64("SerializationHelperTests+MyEnum,xunit.v3.common.x86.tests")}:2147483647" },
+		{ (MyUnsignedEnum)ulong.MinValue, $"-3:{ToBase64("SerializationHelperTests+MyUnsignedEnum,xunit.v3.common.x86.tests")}:0" },
+		{ (MyUnsignedEnum)ulong.MaxValue, $"-3:{ToBase64("SerializationHelperTests+MyUnsignedEnum,xunit.v3.common.x86.tests")}:18446744073709551615" },
 #else
 		{ new MySerializable(1, "2", 3.4m), $"-4:{ToBase64("SerializationHelperTests+MySerializable,xunit.v3.common.tests")}:{ToBase64($"p1:6:1\np2:0:{ToBase64("2")}\np3:12:3.4")}" },
 		{ MyEnum.MyValue, $"-3:{ToBase64("SerializationHelperTests+MyEnum,xunit.v3.common.tests")}:123" },

diff --git a/src/xunit.v3.common.x86.tests/xunit.v3.common.x86.tests.csproj b/src/xunit.v3.common.x86.tests/xunit.v3.common.x86.tests.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.common.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.core.tests/Acceptance/Xunit3AcceptanceTests.cs b/src/xunit.v3.core.tests/Acceptance/Xunit3AcceptanceTests.cs
@@ -55,7 +55,7 @@ public async ValueTask SinglePassingTest()
 					var collectionStarting = Assert.IsType<_TestCollectionStarting>(message);
 					Assert.Null(collectionStarting.TestCollectionClass);
 #if BUILD_X86  // Assembly name changes for x86 testing, so that changes the ID
-					Assert.Equal("Test collection for Xunit3AcceptanceTests+SinglePassingTestClass (id: 6cb828656c4e7792b51bed8fcd2dd9b7579d18c130f061fa24d71af90ebd9147)", collectionStarting.TestCollectionDisplayName);
+					Assert.Equal("Test collection for Xunit3AcceptanceTests+SinglePassingTestClass (id: 1ea89e28059c4fd4c4319dac4a5c86ce432cef0cf1ec83ed22553dec40043256)", collectionStarting.TestCollectionDisplayName);
 #else
 					Assert.Equal("Test collection for Xunit3AcceptanceTests+SinglePassingTestClass (id: 94b6e27b61c59f331879032bb51a9e812c13b2574e286aece991d833e6f52127)", collectionStarting.TestCollectionDisplayName);
 #endif

diff --git a/src/xunit.v3.core.tests/Sdk/ExtensibilityPointFactoryTests.cs b/src/xunit.v3.core.tests/Sdk/ExtensibilityPointFactoryTests.cs
@@ -250,8 +250,8 @@ public void IncompatibleOrInvalidTypesGetDefaultBehavior(string factoryTypeName,
 			TestContext.Current!.DiagnosticMessageSink = spy;
 
 #if BUILD_X86
-			expectedMessage = expectedMessage.Replace("xunit.v3.core.tests", "xunit.v3.core.tests.x86");
-			var attr = Mocks.CollectionBehaviorAttribute(factoryTypeName, "xunit.v3.core.tests.x86");
+			expectedMessage = expectedMessage.Replace("xunit.v3.core.tests", "xunit.v3.core.x86.tests");
+			var attr = Mocks.CollectionBehaviorAttribute(factoryTypeName, "xunit.v3.core.x86.tests");
 #else
 			var attr = Mocks.CollectionBehaviorAttribute(factoryTypeName, "xunit.v3.core.tests");
 #endif

diff --git a/src/xunit.v3.core.tests/Sdk/Frameworks/InProcessFrontControllerTests.cs b/src/xunit.v3.core.tests/Sdk/Frameworks/InProcessFrontControllerTests.cs
@@ -64,10 +64,11 @@ public async ValueTask SendsStartingAndCompleteMessages()
 				msg =>
 				{
 					var starting = Assert.IsType<_DiscoveryStarting>(msg);
-					Assert.StartsWith("xunit.v3.core.tests", starting.AssemblyName);
 #if BUILD_X86
-					Assert.Equal("xunit.v3.core.tests.x86", Path.GetFileNameWithoutExtension(starting.AssemblyPath));
+					Assert.StartsWith("xunit.v3.core.x86.tests", starting.AssemblyName);
+					Assert.Equal("xunit.v3.core.x86.tests", Path.GetFileNameWithoutExtension(starting.AssemblyPath));
 #else
+					Assert.StartsWith("xunit.v3.core.tests", starting.AssemblyName);
 					Assert.Equal("xunit.v3.core.tests", Path.GetFileNameWithoutExtension(starting.AssemblyPath));
 #endif
 					Assert.Equal(frontController.TestAssemblyUniqueID, starting.AssemblyUniqueID);

diff --git a/src/xunit.v3.core.tests/Sdk/v3/Framework/XunitTestFrameworkDiscovererTests.cs b/src/xunit.v3.core.tests/Sdk/v3/Framework/XunitTestFrameworkDiscovererTests.cs
@@ -37,7 +37,7 @@ public static async ValueTask DefaultTestCollection()
 
 			Assert.NotNull(testClass.TestCollection);
 #if BUILD_X86  // Assembly name changes for x86 testing, so that changes the ID
-			Assert.Equal("Test collection for XunitTestFrameworkDiscovererTests+CreateTestClass+ClassWithNoCollection (id: 853344980e07288ef3b081579c76a63aa6e7004c01cf1f0263810d65e8a7e70d)", testClass.TestCollection.DisplayName);
+			Assert.Equal("Test collection for XunitTestFrameworkDiscovererTests+CreateTestClass+ClassWithNoCollection (id: 4653a9b0bd6b7d2f1bfb61e805d4c3cf1f14088c7038b1b37d116f53aa1ed1de)", testClass.TestCollection.DisplayName);
 #else
 			Assert.Equal("Test collection for XunitTestFrameworkDiscovererTests+CreateTestClass+ClassWithNoCollection (id: 7be14f736e0a0af8d59cc61a320451b57131f8826d997a67c0e0445ac2d717c6)", testClass.TestCollection.DisplayName);
 #endif

diff --git a/src/xunit.v3.core.tests/Sdk/v3/Utility/CollectionPerAssemblyTestCollectionFactoryTests.cs b/src/xunit.v3.core.tests/Sdk/v3/Utility/CollectionPerAssemblyTestCollectionFactoryTests.cs
@@ -52,7 +52,7 @@ public static void ClassesDecoratedWithGenericAndNonGenericTypesAreInSameTestCol
 
 		Assert.Same(result1, result2);
 #if BUILD_X86  // Assembly name changes for x86 testing, so that changes the ID
-		Assert.Equal("Test collection for CollectionPerAssemblyTestCollectionFactoryTests (id: 22336a3d94850ba9355fc27682274c3e9ebd23bb90eb5846e8ec0b7ddeedd6a3)", result1.DisplayName);
+		Assert.Equal("Test collection for CollectionPerAssemblyTestCollectionFactoryTests (id: d5994bda26a1b215813f25e9d6483ae3298ccb833477c96762ffdc9c628b7b7c)", result1.DisplayName);
 #else
 		Assert.Equal("Test collection for CollectionPerAssemblyTestCollectionFactoryTests (id: f9ce1cf58a26feb461fdb1787661228ce240a5bf2c097a61653810ecd199889d)", result1.DisplayName);
 #endif

diff --git a/src/xunit.v3.core.tests/Sdk/v3/Utility/CollectionPerClassTestCollectionFactoryTests.cs b/src/xunit.v3.core.tests/Sdk/v3/Utility/CollectionPerClassTestCollectionFactoryTests.cs
@@ -53,7 +53,7 @@ public static void ClassesDecoratedWithGenericAndNonGenericTypesAreInSameTestCol
 
 		Assert.Same(result1, result2);
 #if BUILD_X86  // Assembly name changes for x86 testing, so that changes the ID
-		Assert.Equal("Test collection for CollectionPerClassTestCollectionFactoryTests (id: e0794f9880b46b7533c7a566f31daf93a41ccc36dbcded410e220c3baeed3db8)", result1.DisplayName);
+		Assert.Equal("Test collection for CollectionPerClassTestCollectionFactoryTests (id: 36a55ea3c49ec419d0230eab6c42dea1d3d096335b208e0db3ebde22bf0e29ca)", result1.DisplayName);
 #else
 		Assert.Equal("Test collection for CollectionPerClassTestCollectionFactoryTests (id: d1936ba589221979a4e4e9615b63539ba00aee3b6e13bf29ac1777c784a1ad01)", result1.DisplayName);
 #endif

diff --git a/src/xunit.v3.core.x86.tests/xunit.v3.core.x86.tests.csproj b/src/xunit.v3.core.x86.tests/xunit.v3.core.x86.tests.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.core.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.core/Properties/AssemblyProperties.cs b/src/xunit.v3.core/Properties/AssemblyProperties.cs
@@ -1,4 +1,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("xunit.v3.core.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100252e049addea87f30f99d6ed8ebc189bc05b8c9168765df08f86e0214471dc89844f1f4b9c4a26894d029465848771bc758fed20371280eda223a9f64ae05f48b320e4f0e20c4282dd701e985711bc33b5b9e6ab3fafab6cb78e220ee2b8e1550573e03f8ad665c051c63fbc5359d495d4b1c61024ef76ed9c1ebb471fed59c9")]
-[assembly: InternalsVisibleTo("xunit.v3.core.tests.x86, PublicKey=0024000004800000940000000602000000240000525341310004000001000100252e049addea87f30f99d6ed8ebc189bc05b8c9168765df08f86e0214471dc89844f1f4b9c4a26894d029465848771bc758fed20371280eda223a9f64ae05f48b320e4f0e20c4282dd701e985711bc33b5b9e6ab3fafab6cb78e220ee2b8e1550573e03f8ad665c051c63fbc5359d495d4b1c61024ef76ed9c1ebb471fed59c9")]
+[assembly: InternalsVisibleTo("xunit.v3.core.x86.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100252e049addea87f30f99d6ed8ebc189bc05b8c9168765df08f86e0214471dc89844f1f4b9c4a26894d029465848771bc758fed20371280eda223a9f64ae05f48b320e4f0e20c4282dd701e985711bc33b5b9e6ab3fafab6cb78e220ee2b8e1550573e03f8ad665c051c63fbc5359d495d4b1c61024ef76ed9c1ebb471fed59c9")]
diff --git a/src/xunit.v3.runner.common.x86.tests/xunit.v3.runner.common.x86.tests.csproj b/src/xunit.v3.runner.common.x86.tests/xunit.v3.runner.common.x86.tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.runner.common.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\xunit.v3.runner.common\xunit.v3.runner.common.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.runner.common/xunit.v3.runner.common.csproj b/src/xunit.v3.runner.common/xunit.v3.runner.common.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Transforms\templates\*.xslt" />
     <InternalsVisibleTo Include="xunit.v3.runner.common.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100252e049addea87f30f99d6ed8ebc189bc05b8c9168765df08f86e0214471dc89844f1f4b9c4a26894d029465848771bc758fed20371280eda223a9f64ae05f48b320e4f0e20c4282dd701e985711bc33b5b9e6ab3fafab6cb78e220ee2b8e1550573e03f8ad665c051c63fbc5359d495d4b1c61024ef76ed9c1ebb471fed59c9" />
-    <InternalsVisibleTo Include="xunit.v3.runner.common.tests.x86, PublicKey=0024000004800000940000000602000000240000525341310004000001000100252e049addea87f30f99d6ed8ebc189bc05b8c9168765df08f86e0214471dc89844f1f4b9c4a26894d029465848771bc758fed20371280eda223a9f64ae05f48b320e4f0e20c4282dd701e985711bc33b5b9e6ab3fafab6cb78e220ee2b8e1550573e03f8ad665c051c63fbc5359d495d4b1c61024ef76ed9c1ebb471fed59c9" />
+    <InternalsVisibleTo Include="xunit.v3.runner.common.x86.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100252e049addea87f30f99d6ed8ebc189bc05b8c9168765df08f86e0214471dc89844f1f4b9c4a26894d029465848771bc758fed20371280eda223a9f64ae05f48b320e4f0e20c4282dd701e985711bc33b5b9e6ab3fafab6cb78e220ee2b8e1550573e03f8ad665c051c63fbc5359d495d4b1c61024ef76ed9c1ebb471fed59c9" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">

diff --git a/src/xunit.v3.runner.console.x86.tests/xunit.v3.runner.console.x86.tests.csproj b/src/xunit.v3.runner.console.x86.tests/xunit.v3.runner.console.x86.tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.runner.console.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\xunit.v3.runner.console.x86\xunit.v3.runner.console.x86.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.runner.console.x86/xunit.v3.runner.console.x86.csproj b/src/xunit.v3.runner.console.x86/xunit.v3.runner.console.x86.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ApplicationManifest>..\xunit.v3.runner.console\app.manifest</ApplicationManifest>
+    <OutputType>Exe</OutputType>
+    <RunILRepack>true</RunILRepack>
+    <TargetFrameworks>net472;net48;net481</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.runner.console\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ILRepackExclusions Include="$(OutputPath)xunit.abstractions.dll" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\xunit.v3.runner.utility\xunit.v3.runner.utility.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.runner.console/xunit.v3.runner.console.csproj b/src/xunit.v3.runner.console/xunit.v3.runner.console.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Configurations>Debug;Debug_x86;Release;Release_x86</Configurations>
     <OutputType>Exe</OutputType>
     <RunILRepack>true</RunILRepack>
     <TargetFrameworks>net472;net48;net481</TargetFrameworks>

diff --git a/src/xunit.v3.runner.console/xunit.v3.runner.console.nuspec b/src/xunit.v3.runner.console/xunit.v3.runner.console.nuspec
@@ -26,19 +26,19 @@
 		<file target="tools\net472\" src="bin\$Configuration$\net472\merged\xunit.abstractions.dll" />
 		<file target="tools\net472\" src="bin\$Configuration$\net472\merged\$SignedPath$xunit.v3.runner.console.exe" />
 		<file target="tools\net472\" src="bin\$Configuration$\net472\merged\xunit.v3.runner.console.exe.config" />
-		<file target="tools\net472\" src="bin\$Configuration$_x86\net472\merged\$SignedPath$xunit.v3.runner.console.x86.exe" />
-		<file target="tools\net472\" src="bin\$Configuration$_x86\net472\merged\xunit.v3.runner.console.x86.exe.config" />
+		<file target="tools\net472\" src="..\xunit.v3.runner.console.x86\bin\$Configuration$\net472\merged\$SignedPath$xunit.v3.runner.console.x86.exe" />
+		<file target="tools\net472\" src="..\xunit.v3.runner.console.x86\bin\$Configuration$\net472\merged\xunit.v3.runner.console.x86.exe.config" />
 
 		<file target="tools\net48\" src="bin\$Configuration$\net48\merged\xunit.abstractions.dll" />
 		<file target="tools\net48\" src="bin\$Configuration$\net48\merged\$SignedPath$xunit.v3.runner.console.exe" />
 		<file target="tools\net48\" src="bin\$Configuration$\net48\merged\xunit.v3.runner.console.exe.config" />
-		<file target="tools\net48\" src="bin\$Configuration$_x86\net48\merged\$SignedPath$xunit.v3.runner.console.x86.exe" />
-		<file target="tools\net48\" src="bin\$Configuration$_x86\net48\merged\xunit.v3.runner.console.x86.exe.config" />
+		<file target="tools\net48\" src="..\xunit.v3.runner.console.x86\bin\$Configuration$\net48\merged\$SignedPath$xunit.v3.runner.console.x86.exe" />
+		<file target="tools\net48\" src="..\xunit.v3.runner.console.x86\bin\$Configuration$\net48\merged\xunit.v3.runner.console.x86.exe.config" />
 
 		<file target="tools\net481\" src="bin\$Configuration$\net481\merged\xunit.abstractions.dll" />
 		<file target="tools\net481\" src="bin\$Configuration$\net481\merged\$SignedPath$xunit.v3.runner.console.exe" />
 		<file target="tools\net481\" src="bin\$Configuration$\net481\merged\xunit.v3.runner.console.exe.config" />
-		<file target="tools\net481\" src="bin\$Configuration$_x86\net481\merged\$SignedPath$xunit.v3.runner.console.x86.exe" />
-		<file target="tools\net481\" src="bin\$Configuration$_x86\net481\merged\xunit.v3.runner.console.x86.exe.config" />
+		<file target="tools\net481\" src="..\xunit.v3.runner.console.x86\bin\$Configuration$\net481\merged\$SignedPath$xunit.v3.runner.console.x86.exe" />
+		<file target="tools\net481\" src="..\xunit.v3.runner.console.x86\bin\$Configuration$\net481\merged\xunit.v3.runner.console.x86.exe.config" />
 	</files>
 </package>
diff --git a/src/xunit.v3.runner.inproc.console.x86.tests/xunit.v3.runner.inproc.console.x86.tests.csproj b/src/xunit.v3.runner.inproc.console.x86.tests/xunit.v3.runner.inproc.console.x86.tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.runner.inproc.console.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\xunit.v3.runner.inproc.console\xunit.v3.runner.inproc.console.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.runner.msbuild.x86.tests/xunit.v3.runner.msbuild.x86.tests.csproj b/src/xunit.v3.runner.msbuild.x86.tests/xunit.v3.runner.msbuild.x86.tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.runner.msbuild.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\xunit.v3.runner.msbuild\xunit.v3.runner.msbuild.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/xunit.v3.runner.tdnet.x86.tests/xunit.v3.runner.tdnet.x86.tests.csproj b/src/xunit.v3.runner.tdnet.x86.tests/xunit.v3.runner.tdnet.x86.tests.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\xunit.v3.runner.tdnet.tests\**\*.cs" Exclude="**\obj\**\*.cs" />
+  </ItemGroup>
+
+</Project>