From b1bb30ac9d557bf615a99a1e0a20f8800f37eae1 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Tue, 13 Feb 2024 06:40:18 -0600 Subject: [PATCH 1/4] ci: update uno-check --- .github/workflows/build_uno.yml | 6 ++---- .github/workflows/ci.yml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml index c378f25ff0..3ec83a7e92 100644 --- a/.github/workflows/build_uno.yml +++ b/.github/workflows/build_uno.yml @@ -25,10 +25,8 @@ jobs: with: name: Build Prism.Uno solution-path: PrismLibrary_Uno.slnf - dotnet-version: 8.0.100 windows-sdk-version: 18362 - install-workload: maui maui-tizen macos maui-windows maui-maccatalyst maccatalyst maui-ios ios android maui-android wasm-tools tvos - uno-check: false - uno-check-version: 1.19.0 + dotnet-version: 8.0.x + uno-check: true uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac' run-tests: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a8f759973..4d569dcd65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,11 +65,9 @@ jobs: with: name: Build Prism.Uno solution-path: PrismLibrary_Uno.slnf - dotnet-version: 8.0.100 windows-sdk-version: 18362 - install-workload: maui maui-tizen macos maui-windows maui-maccatalyst maccatalyst maui-ios ios android maui-android wasm-tools tvos - uno-check: false - uno-check-version: 1.19.0 + dotnet-version: 8.0.x + uno-check: true uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac' run-tests: false code-sign: true From a8a010b8422809b75e959d4c300fd282124a82b0 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Tue, 13 Feb 2024 13:40:26 -0600 Subject: [PATCH 2/4] ci: install net6 and net8 --- .github/workflows/build_core.yml | 3 +++ .github/workflows/build_forms.yml | 3 +++ .github/workflows/build_wpf.yml | 3 +++ .github/workflows/ci.yml | 9 +++++++++ 4 files changed, 18 insertions(+) diff --git a/.github/workflows/build_core.yml b/.github/workflows/build_core.yml index 7b2a3a22e3..a2f7c0c3d4 100644 --- a/.github/workflows/build_core.yml +++ b/.github/workflows/build_core.yml @@ -21,3 +21,6 @@ jobs: with: name: Build Prism.Core solution-path: PrismLibrary_Core.slnf + dotnet-version: | + 6.0.x + 8.0.x diff --git a/.github/workflows/build_forms.yml b/.github/workflows/build_forms.yml index dd325f37e0..3af2524059 100644 --- a/.github/workflows/build_forms.yml +++ b/.github/workflows/build_forms.yml @@ -24,3 +24,6 @@ jobs: name: Build Prism.Forms solution-path: PrismLibrary_Forms.slnf jdk-version: 13 + dotnet-version: | + 6.0.x + 8.0.x diff --git a/.github/workflows/build_wpf.yml b/.github/workflows/build_wpf.yml index 1399ea5b64..dba0a8dabb 100644 --- a/.github/workflows/build_wpf.yml +++ b/.github/workflows/build_wpf.yml @@ -23,3 +23,6 @@ jobs: with: name: Build Prism.Wpf solution-path: PrismLibrary_Wpf.slnf + dotnet-version: | + 6.0.x + 8.0.x diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d569dcd65..1865a1fe6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,9 @@ jobs: with: name: Build Prism.Core solution-path: PrismLibrary_Core.slnf + dotnet-version: | + 6.0.x + 8.0.x code-sign: true artifact-name: Core secrets: @@ -36,6 +39,9 @@ jobs: with: name: Build Prism.Wpf solution-path: PrismLibrary_Wpf.slnf + dotnet-version: | + 6.0.x + 8.0.x code-sign: true artifact-name: Wpf secrets: @@ -53,6 +59,9 @@ jobs: code-sign: true artifact-name: Forms jdk-version: 13 + dotnet-version: | + 6.0.x + 8.0.x secrets: codeSignKeyVault: ${{ secrets.CodeSignKeyVault }} codeSignClientId: ${{ secrets.CodeSignClientId }} From 766019ab6c4947cc5932132a2cbc7d8d68caa1ff Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Wed, 14 Feb 2024 06:26:48 -0600 Subject: [PATCH 3/4] ci: bump uno check version --- .github/workflows/build_uno.yml | 1 + .github/workflows/ci.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml index 3ec83a7e92..a29e25bf29 100644 --- a/.github/workflows/build_uno.yml +++ b/.github/workflows/build_uno.yml @@ -29,4 +29,5 @@ jobs: dotnet-version: 8.0.x uno-check: true uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac' + uno-check-version: 1.20.0-dev.7 run-tests: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1865a1fe6a..8f5677177b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,6 +78,7 @@ jobs: dotnet-version: 8.0.x uno-check: true uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac' + uno-check-version: 1.20.0-dev.7 run-tests: false code-sign: true artifact-name: Uno From fd4b1cbab832913c22f8033f1ab62171f697738f Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Wed, 14 Feb 2024 06:53:09 -0600 Subject: [PATCH 4/4] ci: revert dotnet version changes --- .github/workflows/build_core.yml | 3 --- .github/workflows/build_forms.yml | 3 --- .github/workflows/build_maui.yml | 1 - .github/workflows/build_uno.yml | 1 - .github/workflows/build_wpf.yml | 3 --- .github/workflows/ci.yml | 12 ------------ 6 files changed, 23 deletions(-) diff --git a/.github/workflows/build_core.yml b/.github/workflows/build_core.yml index a2f7c0c3d4..7b2a3a22e3 100644 --- a/.github/workflows/build_core.yml +++ b/.github/workflows/build_core.yml @@ -21,6 +21,3 @@ jobs: with: name: Build Prism.Core solution-path: PrismLibrary_Core.slnf - dotnet-version: | - 6.0.x - 8.0.x diff --git a/.github/workflows/build_forms.yml b/.github/workflows/build_forms.yml index 3af2524059..dd325f37e0 100644 --- a/.github/workflows/build_forms.yml +++ b/.github/workflows/build_forms.yml @@ -24,6 +24,3 @@ jobs: name: Build Prism.Forms solution-path: PrismLibrary_Forms.slnf jdk-version: 13 - dotnet-version: | - 6.0.x - 8.0.x diff --git a/.github/workflows/build_maui.yml b/.github/workflows/build_maui.yml index 8198eb6279..3593548a70 100644 --- a/.github/workflows/build_maui.yml +++ b/.github/workflows/build_maui.yml @@ -24,5 +24,4 @@ jobs: with: name: Build Prism.Maui solution-path: PrismLibrary_Maui.slnf - dotnet-version: 8.0.x install-workload: maui maui-tizen diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml index a29e25bf29..3ec83a7e92 100644 --- a/.github/workflows/build_uno.yml +++ b/.github/workflows/build_uno.yml @@ -29,5 +29,4 @@ jobs: dotnet-version: 8.0.x uno-check: true uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac' - uno-check-version: 1.20.0-dev.7 run-tests: false diff --git a/.github/workflows/build_wpf.yml b/.github/workflows/build_wpf.yml index dba0a8dabb..1399ea5b64 100644 --- a/.github/workflows/build_wpf.yml +++ b/.github/workflows/build_wpf.yml @@ -23,6 +23,3 @@ jobs: with: name: Build Prism.Wpf solution-path: PrismLibrary_Wpf.slnf - dotnet-version: | - 6.0.x - 8.0.x diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f5677177b..6fa0686844 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,6 @@ jobs: with: name: Build Prism.Core solution-path: PrismLibrary_Core.slnf - dotnet-version: | - 6.0.x - 8.0.x code-sign: true artifact-name: Core secrets: @@ -39,9 +36,6 @@ jobs: with: name: Build Prism.Wpf solution-path: PrismLibrary_Wpf.slnf - dotnet-version: | - 6.0.x - 8.0.x code-sign: true artifact-name: Wpf secrets: @@ -59,9 +53,6 @@ jobs: code-sign: true artifact-name: Forms jdk-version: 13 - dotnet-version: | - 6.0.x - 8.0.x secrets: codeSignKeyVault: ${{ secrets.CodeSignKeyVault }} codeSignClientId: ${{ secrets.CodeSignClientId }} @@ -75,10 +66,8 @@ jobs: name: Build Prism.Uno solution-path: PrismLibrary_Uno.slnf windows-sdk-version: 18362 - dotnet-version: 8.0.x uno-check: true uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac' - uno-check-version: 1.20.0-dev.7 run-tests: false code-sign: true artifact-name: Uno @@ -94,7 +83,6 @@ 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