Merge branch 'dev' into feature/footer

.github/workflows/cd.yml

@@ -42,9 +42,9 @@ jobs:
       working-directory: src/Cropper.Blazor/Cropper.Blazor.UnitTests    
 
     - name: Coverage
-      uses: codecov/[email protected].1
+      uses: codecov/[email protected].4
       with:
-        file: coverage.net6.0.cobertura.xml
+        files: coverage.net6.0.cobertura.xml, coverage.net7.0.cobertura.xml
         fail_ci_if_error: true
         verbose: true
 
@@ -107,9 +107,25 @@ jobs:
         folder: release/wwwroot
         repository-name: CropperBlazor/CropperBlazor.github.io
 
+  install-maui-workloads:
+    name: Install MAUI Workloads
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install MAUI Workloads
+      run: |
+          dotnet workload install maui --ignore-failed-sources
+
   demo-projects-build:
     name: Build Demo Projects
     runs-on: windows-latest
+    needs: install-maui-workloads
+
+    strategy:
+      matrix:
+        dotnet-version: ['6.0.x', '7.0.x']
 
     steps:
     - uses: actions/checkout@v3
@@ -118,34 +134,33 @@ jobs:
     - name: Setup .NET 7, 6
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: |
-            6.0.x
-            7.0.x
-
-    - name: Install MAUI Workloads
-      run: |
-          dotnet workload install maui --ignore-failed-sources
+        dotnet-version: ${{ matrix.dotnet-version }}
 
     - name: Restore dependencies for Cropper.Blazor.Demo
       run: dotnet restore
       working-directory: examples
 
-    - name: DotNet Build MVC with Blazor Server Demo Project for .net 7
+    - name: DotNet Build MVC with Blazor Server Demo Project
       run: dotnet build --no-restore
       working-directory: examples\Cropper.MVC.With.Blazor.Server.Net7
+      if: matrix.dotnet-version == '7.0.x'
 
-    - name: DotNet Build Blazor Server Demo Project for .net 7
+    - name: DotNet Build Blazor Server Demo Project
       run: dotnet build --no-restore
       working-directory: examples\Cropper.Blazor.Server.Net7
+      if: matrix.dotnet-version == '7.0.x'
 
-    - name: DotNet Build Blazor MAUI Demo Project for .net 7
+    - name: DotNet Build Blazor MAUI Demo Project
       run: dotnet build --no-restore
       working-directory: examples\Cropper.Blazor.MAUI.Net7
+      if: matrix.dotnet-version == '7.0.x'
 
-    - name: DotNet Build Blazor Server Demo Project for .net 6
+    - name: DotNet Build Blazor Server Demo Project
       run: dotnet build --no-restore
       working-directory: examples\Cropper.Blazor.Server.Net6
+      if: matrix.dotnet-version == '6.0.x'
 
-    - name: DotNet Build Blazor MAUI Demo Project for .net 6
+    - name: DotNet Build Blazor MAUI Demo Project
       run: dotnet build --no-restore
       working-directory: examples\Cropper.Blazor.MAUI.Net6
+      if: matrix.dotnet-version == '6.0.x'

.github/workflows/ci.yml

@@ -43,9 +43,9 @@ jobs:
       working-directory: src/Cropper.Blazor/Cropper.Blazor.UnitTests    
 
     - name: Coverage
-      uses: codecov/[email protected].1
+      uses: codecov/[email protected].4
       with:
-        file: coverage.net6.0.cobertura.xml
+        files: coverage.net6.0.cobertura.xml, coverage.net7.0.cobertura.xml
         fail_ci_if_error: true
         verbose: true