From 5a167917242ff25f242fa7195ca47df26f872bba Mon Sep 17 00:00:00 2001
From: Miguel Beltran <m@beltran.work>
Date: Sun, 24 Nov 2024 21:42:27 +0100
Subject: [PATCH] ci: Improvements in CI workflow (#60)

---
 .github/workflows/dotnet-format.yml           |  2 +-
 .github/workflows/dotnet.yml                  | 71 +++++++++++++++++--
 .../Raygun.Samples.Blazor.Maui.csproj         |  4 +-
 src/global.json                               |  2 +-
 4 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
index 2271787..e91e226 100644
--- a/.github/workflows/dotnet-format.yml
+++ b/.github/workflows/dotnet-format.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
           
       - name: Format
         working-directory: ./src
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 00d5659..086f502 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Setup JDK
       uses: actions/setup-java@v4
       with:
@@ -27,15 +27,72 @@ jobs:
         java-version: '17'
     - name: Setup Android SDK
       uses: android-actions/setup-android@v3
+    
+    # Pre-build setup
     - name: Restore workloads
       working-directory: ./src
       run: dotnet workload restore
-    - name: Restore dependencies
+
+    # Raygun.Blazor
+    - name: Build Raygun.Blazor
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet build Raygun.Blazor/Raygun.Blazor.csproj
+    # Raygun.Blazor tests
+    - name: Test Raygun.Blazor
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet test Raygun.Tests.Blazor/Raygun.Tests.Blazor.csproj
+      
+    # Raygun.Blazor.Server
+    - name: Build Raygun.Blazor.Server
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet build Raygun.Blazor.Server/Raygun.Blazor.Server.csproj
+    # Raygun.Blazor.Server tests
+    - name: Test Raygun.Blazor.Server
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet test Raygun.Tests.Blazor.Server/Raygun.Tests.Blazor.Server.csproj
+    # Raygun.Blazor.Server sample
+    - name: Build Raygun.Samples.Blazor.Server
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet build Raygun.Samples.Blazor.Server/Raygun.Samples.Blazor.Server.csproj
+
+    # Raygun.Blazor.WebAssembly
+    - name: Build Raygun.Blazor.WebAssembly
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet build Raygun.Blazor.WebAssembly/Raygun.Blazor.WebAssembly.csproj
+    # Raygun.Blazor.WebAssembly sample
+    - name: Build Raygun.Samples.Blazor.WebAssembly
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet build Raygun.Samples.Blazor.Server/Raygun.Samples.Blazor.Server.csproj
+
+    # Raygun.Blazor.Maui
+    - name: Build Raygun.Blazor.Maui
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet build Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj
+    # Raygun.Blazor.Maui Windows sample
+    - name: Build Raygun.Samples.Blazor.Maui Windows
+      continue-on-error: true
+      working-directory: ./src
+      run: dotnet build Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj -f net8.0-windows10.0.19041.0
+    # Raygun.Blazor.Maui Android sample
+    - name: Build Raygun.Samples.Blazor.Maui Android
+      continue-on-error: true
       working-directory: ./src
-      run: dotnet restore
-    - name: Build
+      run: dotnet build Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj -f net8.0-android
+    # Raygun.Blazor.Maui iOS sample
+    - name: Build Raygun.Samples.Blazor.Maui ios
+      continue-on-error: true
       working-directory: ./src
-      run: dotnet build --no-restore
-    - name: Test
+      run: dotnet build Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj -f net8.0-ios
+    # Raygun.Blazor.Maui macOS sample
+    - name: Build Raygun.Samples.Blazor.Maui maccatalyst
+      continue-on-error: true
       working-directory: ./src
-      run: dotnet test
+      run: dotnet build Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj -f net8.0-maccatalyst
diff --git a/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj b/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj
index 7efaf6b..d2de8bd 100644
--- a/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj
+++ b/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj
@@ -74,8 +74,8 @@
 
     <!-- For appsettings.json -->
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/global.json b/src/global.json
index 11c26ad..3e07ae0 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,6 +1,6 @@
 {
 	"sdk": {
-		"version": "8.0.300",
+		"version": "9.0.100",
 		"rollForward": "latestFeature"
 	}
 }
\ No newline at end of file