Merge pull request #2950 from PrismLibrary/dev/ds/fix-ci

PrismLibrary · Sep 5, 2023 · 2ff1836 · 2ff1836
2 parents 29c0356 + 2bbadb8
commit 2ff1836
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 63 deletions.
diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
@@ -25,7 +25,7 @@ jobs:
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
-      dotnet-version: 7.0.102
+      dotnet-version: 7.0.400
       windows-sdk-version: 18362
       uno-check: true
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
-      dotnet-version: 7.0.102
+      dotnet-version: 7.0.400
       windows-sdk-version: 18362
       uno-check: true
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'
@@ -82,6 +82,8 @@ jobs:
     with:
       name: Build Prism.Maui
       solution-path: PrismLibrary_Maui.slnf
+      dotnet-version: 8.0.x
+      install-workload: maui maui-tizen
       code-sign: true
       artifact-name: Maui
     secrets:

diff --git a/.github/workflows/dotnet-format-daily.yml b/.github/workflows/dotnet-format-daily.yml
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
@@ -0,0 +1,30 @@
+name: dotnet_format
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'e2e/**'
+      - 'src/**'
+      - 'tests/**'
+
+jobs:
+  dotnet_format:
+    runs-on: windows-latest
+    steps:
+      - name: Install dotnet-format
+        run: dotnet tool install -g dotnet-format
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Run dotnet format
+        id: format
+        uses: jfversluis/[email protected]
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          only-changed-files: true
+          workspace: "PrismLibrary.sln"
diff --git a/.github/workflows/start-release.yml b/.github/workflows/start-release.yml
@@ -51,7 +51,7 @@ jobs:
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
-      dotnet-version: 7.0.102
+      dotnet-version: 7.0.400
       windows-sdk-version: 18362
       uno-check: true
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'
@@ -70,6 +70,8 @@ jobs:
     with:
       name: Build Prism.Maui
       solution-path: PrismLibrary_Maui.slnf
+      dotnet-version: 8.0.x
+      install-workload: maui maui-tizen
       code-sign: true
       artifact-name: Maui
     secrets: