Address build/test issues in CI/CD (#717)

viceroypenguin · Jan 11, 2025 · c8dcf95 · c8dcf95
1 parent 42e4c5d
commit c8dcf95
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,8 +12,11 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v4
@@ -22,8 +25,6 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          3.1.x
-          6.0.x
           8.0.x
           9.0.x
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -30,8 +30,6 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          3.1.x
-          6.0.x
           8.0.x
           9.0.x
 
@@ -41,7 +39,7 @@ jobs:
       run: dotnet build -c Release --no-restore
 
     - name: Build documentation
-      run: dotnet run -f net8.0 -c Release --no-build
+      run: dotnet run -f net9.0 -c Release --no-build
       working-directory: Docs/SuperLinq.Docs
 
     - name: Setup Pages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,8 +21,6 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          3.1.x
-          6.0.x
           8.0.x
           9.0.x
 

diff --git a/Tests/SuperLinq.Async.Tests/SuperLinq.Async.Tests.csproj b/Tests/SuperLinq.Async.Tests/SuperLinq.Async.Tests.csproj
@@ -1,14 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net47;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
 
 	<PolySharpExcludeGeneratedTypes>System.Runtime.CompilerServices.ModuleInitializerAttribute</PolySharpExcludeGeneratedTypes>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([System.OperatingSystem]::IsWindows())">
+	<TargetFrameworks>net47;$(TargetFrameworks)</TargetFrameworks>
+	<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Source\SuperLinq\SuperLinq.csproj" />
     <ProjectReference Include="..\..\Source\SuperLinq.Async\SuperLinq.Async.csproj" />

diff --git a/Tests/SuperLinq.Tests/SuperLinq.Tests.csproj b/Tests/SuperLinq.Tests/SuperLinq.Tests.csproj
@@ -1,14 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net47;net8.0;net9.0</TargetFrameworks>
+	<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
 	<IsPackable>false</IsPackable>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
 
 	<PolySharpExcludeGeneratedTypes>System.Runtime.CompilerServices.ModuleInitializerAttribute</PolySharpExcludeGeneratedTypes>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([System.OperatingSystem]::IsWindows())">
+	<TargetFrameworks>net47;$(TargetFrameworks)</TargetFrameworks>
+	<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Source\SuperLinq\SuperLinq.csproj" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,6 @@ jobs: @@
           uses: actions/setup-dotnet@v4
           with:
             dotnet-version: |
-.1.x
-.0.x
 .0.x
 .0.x
@@ Expand Down @@