Skip to content

Commit

Permalink
Use separate projects for x86 builds instead of alternate configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@bradwilson
bradwilson committed Mar 17, 2024
1 parent 4b2b9fa commit 9f7e7e7
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 582 deletions.
1 change: 1 addition & 0 deletions src/Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<MSBuildCopyContentTransitively>false</MSBuildCopyContentTransitively>
<NoWarn>$(NoWarn);NU1603;NU1903;NU5128;NU5131;CS0436;CS1701</NoWarn>
<PackageId>$(MSBuildProjectName)</PackageId>
<PlatformTarget>AnyCPU</PlatformTarget>
<RootNamespace>Xunit</RootNamespace>
<SignAssembly>true</SignAssembly>
<WarningsAsErrors>true</WarningsAsErrors>
Expand Down
32 changes: 32 additions & 0 deletions src/xunit.console.x86/xunit.console.x86.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputType>Exe</OutputType>
<PlatformTarget>x86</PlatformTarget>
<RootNamespace>Xunit.ConsoleClient</RootNamespace>
<TargetFrameworks>net452;net46;net461;net462;net47;net471;net472;net48;net481;netcoreapp1.0;netcoreapp2.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\common\AssemblyExtensions.cs" LinkBase="Common" />
<Compile Include="..\common\ConsoleHelper.cs" LinkBase="Common" />
<Compile Include="..\common\DictionaryExtensions.cs" LinkBase="Common" />
<Compile Include="..\common\Guard.cs" LinkBase="Common" />
<Compile Include="..\common\Json.cs" LinkBase="Common" />
<Compile Include="..\common\AssemblyResolution\**\*.cs" LinkBase="Common\AssemblyResolution" />
<Compile Include="..\xunit.console\**\*.cs" Exclude="**\obj\**\*.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="..\xunit.console\HTML.xslt" />
<EmbeddedResource Include="..\xunit.console\NUnitXml.xslt" />
<EmbeddedResource Include="..\xunit.console\xUnit1.xslt" />
<EmbeddedResource Include="..\xunit.console\JUnitXml.xslt" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\xunit.runner.reporters\xunit.runner.reporters.csproj" />
</ItemGroup>

</Project>
5 changes: 0 additions & 5 deletions src/xunit.console/xunit.console.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,4 @@
<ProjectReference Include="..\xunit.runner.reporters\xunit.runner.reporters.csproj" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug_x86' OR '$(Configuration)' == 'Release_x86' ">
<AssemblyName>xunit.console.x86</AssemblyName>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

</Project>
36 changes: 18 additions & 18 deletions src/xunit.runner.console.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,72 +26,72 @@
<file target="tools\net452\" src="xunit.console\bin\$Configuration$\net452\xunit.abstractions.dll" />
<file target="tools\net452\" src="xunit.console\bin\$Configuration$\net452\$SignedPath$xunit.console.exe" />
<file target="tools\net452\" src="xunit.console\bin\$Configuration$\net452\xunit.console.exe.config" />
<file target="tools\net452\" src="xunit.console\bin\$Configuration$_x86\net452\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net452\" src="xunit.console\bin\$Configuration$_x86\net452\xunit.console.x86.exe.config" />
<file target="tools\net452\" src="xunit.console.x86\bin\$Configuration$\net452\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net452\" src="xunit.console.x86\bin\$Configuration$\net452\xunit.console.x86.exe.config" />
<file target="tools\net452\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net452\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net46\" src="xunit.console\bin\$Configuration$\net46\xunit.abstractions.dll" />
<file target="tools\net46\" src="xunit.console\bin\$Configuration$\net46\$SignedPath$xunit.console.exe" />
<file target="tools\net46\" src="xunit.console\bin\$Configuration$\net46\xunit.console.exe.config" />
<file target="tools\net46\" src="xunit.console\bin\$Configuration$_x86\net46\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net46\" src="xunit.console\bin\$Configuration$_x86\net46\xunit.console.x86.exe.config" />
<file target="tools\net46\" src="xunit.console.x86\bin\$Configuration$\net46\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net46\" src="xunit.console.x86\bin\$Configuration$\net46\xunit.console.x86.exe.config" />
<file target="tools\net46\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net46\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net461\" src="xunit.console\bin\$Configuration$\net461\xunit.abstractions.dll" />
<file target="tools\net461\" src="xunit.console\bin\$Configuration$\net461\$SignedPath$xunit.console.exe" />
<file target="tools\net461\" src="xunit.console\bin\$Configuration$\net461\xunit.console.exe.config" />
<file target="tools\net461\" src="xunit.console\bin\$Configuration$_x86\net461\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net461\" src="xunit.console\bin\$Configuration$_x86\net461\xunit.console.x86.exe.config" />
<file target="tools\net461\" src="xunit.console.x86\bin\$Configuration$\net461\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net461\" src="xunit.console.x86\bin\$Configuration$\net461\xunit.console.x86.exe.config" />
<file target="tools\net461\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net461\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net462\" src="xunit.console\bin\$Configuration$\net462\xunit.abstractions.dll" />
<file target="tools\net462\" src="xunit.console\bin\$Configuration$\net462\$SignedPath$xunit.console.exe" />
<file target="tools\net462\" src="xunit.console\bin\$Configuration$\net462\xunit.console.exe.config" />
<file target="tools\net462\" src="xunit.console\bin\$Configuration$_x86\net462\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net462\" src="xunit.console\bin\$Configuration$_x86\net462\xunit.console.x86.exe.config" />
<file target="tools\net462\" src="xunit.console.x86\bin\$Configuration$\net462\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net462\" src="xunit.console.x86\bin\$Configuration$\net462\xunit.console.x86.exe.config" />
<file target="tools\net462\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net462\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net47\" src="xunit.console\bin\$Configuration$\net47\xunit.abstractions.dll" />
<file target="tools\net47\" src="xunit.console\bin\$Configuration$\net47\$SignedPath$xunit.console.exe" />
<file target="tools\net47\" src="xunit.console\bin\$Configuration$\net47\xunit.console.exe.config" />
<file target="tools\net47\" src="xunit.console\bin\$Configuration$_x86\net47\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net47\" src="xunit.console\bin\$Configuration$_x86\net47\xunit.console.x86.exe.config" />
<file target="tools\net47\" src="xunit.console.x86\bin\$Configuration$\net47\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net47\" src="xunit.console.x86\bin\$Configuration$\net47\xunit.console.x86.exe.config" />
<file target="tools\net47\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net47\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net471\" src="xunit.console\bin\$Configuration$\net471\xunit.abstractions.dll" />
<file target="tools\net471\" src="xunit.console\bin\$Configuration$\net471\$SignedPath$xunit.console.exe" />
<file target="tools\net471\" src="xunit.console\bin\$Configuration$\net471\xunit.console.exe.config" />
<file target="tools\net471\" src="xunit.console\bin\$Configuration$_x86\net471\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net471\" src="xunit.console\bin\$Configuration$_x86\net471\xunit.console.x86.exe.config" />
<file target="tools\net471\" src="xunit.console.x86\bin\$Configuration$\net471\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net471\" src="xunit.console.x86\bin\$Configuration$\net471\xunit.console.x86.exe.config" />
<file target="tools\net471\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net471\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net472\" src="xunit.console\bin\$Configuration$\net472\xunit.abstractions.dll" />
<file target="tools\net472\" src="xunit.console\bin\$Configuration$\net472\$SignedPath$xunit.console.exe" />
<file target="tools\net472\" src="xunit.console\bin\$Configuration$\net472\xunit.console.exe.config" />
<file target="tools\net472\" src="xunit.console\bin\$Configuration$_x86\net472\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net472\" src="xunit.console\bin\$Configuration$_x86\net472\xunit.console.x86.exe.config" />
<file target="tools\net472\" src="xunit.console.x86\bin\$Configuration$\net472\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net472\" src="xunit.console.x86\bin\$Configuration$\net472\xunit.console.x86.exe.config" />
<file target="tools\net472\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net472\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net48\" src="xunit.console\bin\$Configuration$\net48\xunit.abstractions.dll" />
<file target="tools\net48\" src="xunit.console\bin\$Configuration$\net48\$SignedPath$xunit.console.exe" />
<file target="tools\net48\" src="xunit.console\bin\$Configuration$\net48\xunit.console.exe.config" />
<file target="tools\net48\" src="xunit.console\bin\$Configuration$_x86\net48\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net48\" src="xunit.console\bin\$Configuration$_x86\net48\xunit.console.x86.exe.config" />
<file target="tools\net48\" src="xunit.console.x86\bin\$Configuration$\net48\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net48\" src="xunit.console.x86\bin\$Configuration$\net48\xunit.console.x86.exe.config" />
<file target="tools\net48\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net48\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

<file target="tools\net481\" src="xunit.console\bin\$Configuration$\net481\xunit.abstractions.dll" />
<file target="tools\net481\" src="xunit.console\bin\$Configuration$\net481\$SignedPath$xunit.console.exe" />
<file target="tools\net481\" src="xunit.console\bin\$Configuration$\net481\xunit.console.exe.config" />
<file target="tools\net481\" src="xunit.console\bin\$Configuration$_x86\net481\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net481\" src="xunit.console\bin\$Configuration$_x86\net481\xunit.console.x86.exe.config" />
<file target="tools\net481\" src="xunit.console.x86\bin\$Configuration$\net481\$SignedPath$xunit.console.x86.exe" />
<file target="tools\net481\" src="xunit.console.x86\bin\$Configuration$\net481\xunit.console.x86.exe.config" />
<file target="tools\net481\" src="xunit.runner.reporters\bin\$Configuration$\net452\$SignedPath$xunit.runner.reporters.net452.dll" />
<file target="tools\net481\" src="xunit.runner.utility\bin\$Configuration$\net452\$SignedPath$xunit.runner.utility.net452.dll" />

Expand Down
2 changes: 1 addition & 1 deletion tools/builder/models/BuildContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public string TestFlagsParallel
partial void Initialize()
{
ConsoleRunnerExe = Path.Combine(BaseFolder, "src", "xunit.console", "bin", ConfigurationText, "net462", "xunit.console.exe");
ConsoleRunner32Exe = Path.Combine(BaseFolder, "src", "xunit.console", "bin", ConfigurationText + "_x86", "net462", "xunit.console.x86.exe");
ConsoleRunner32Exe = Path.Combine(BaseFolder, "src", "xunit.console.x86", "bin", ConfigurationText, "net462", "xunit.console.x86.exe");

TestFlagsNonParallel = "-parallel collections";
TestFlagsParallel = "-parallel all";
Expand Down
1 change: 0 additions & 1 deletion tools/builder/targets/Build.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ public static partial class Build
context.BuildStep("Compiling binaries");

await context.Exec("msbuild", $"xunit.sln /t:build /p:Configuration={context.ConfigurationText} /v:{context.Verbosity} /m");
await context.Exec("msbuild", $"src/xunit.console/xunit.console.csproj /t:build /p:Configuration={context.ConfigurationText}_x86 /v:{context.Verbosity} /m");
}
}
Loading

0 comments on commit 9f7e7e7

Please sign in to comment.