Add cross-platform build/test config

ironfede · Dec 1, 2024 · d3a3d5d · d3a3d5d
1 parent 08c0844
commit d3a3d5d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -34,10 +34,10 @@ jobs:
 
     # Execute all unit tests in the solution
     - name: Execute unit tests
-      run: dotnet test --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
+      run: dotnet test --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" $env:Solution_Name
 
     # Restore the application to populate the obj folder with RuntimeIdentifiers
     - name: Restore the application
-      run: dotnet build -c $env:Configuration /p:ContinuousIntegrationBuild=true
+      run: dotnet build -c $env:Configuration /p:ContinuousIntegrationBuild=true $env:Solution_Name
       env:
         Configuration: ${{ matrix.configuration }}
diff --git a/OpenMcdf.Benchmarks/OpenMcdf.Benchmarks.csproj b/OpenMcdf.Benchmarks/OpenMcdf.Benchmarks.csproj
@@ -1,17 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) == 'false'">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net8.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
   </ItemGroup>
 
+  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) == 'false'">
+    <Compile Remove="StructuredStorageBenchmarks.cs" />
+    <None Include="StructuredStorageBenchmarks.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\OpenMcdf\OpenMcdf.csproj" />
-    <ProjectReference Include="..\StructuredStorage\StructuredStorage.csproj" />
+    <ProjectReference Include="..\StructuredStorage\StructuredStorage.csproj" Condition="$([MSBuild]::IsOSPlatform('windows'))" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenMcdf.CrossPlatform.slnf b/OpenMcdf.CrossPlatform.slnf
@@ -0,0 +1,13 @@
+{
+  "solution": {
+    "path": "OpenMcdf.sln",
+    "projects": [
+      "OpenMcdf/OpenMcdf.csproj",
+      "OpenMcdf.Benchmarks/OpenMcdf.Benchmarks.csproj",
+      "OpenMcdf.Ole/OpenMcdf.Ole.csproj",
+      "OpenMcdf.Ole.Tests/OpenMcdf.Ole.Tests.csproj",
+      "OpenMcdf.Perf/OpenMcdf.Perf.csproj",
+      "OpenMcdf.Tests/OpenMcdf.Tests.csproj"
+    ]
+  }
+}
diff --git a/OpenMcdf.Tests/OpenMcdf.Tests.csproj b/OpenMcdf.Tests/OpenMcdf.Tests.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) == false">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net48;net8.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
 
     <IsPackable>false</IsPackable>