From f00996e33c53966bb4f39a6c557406e888739135 Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 09:42:04 +0100 Subject: [PATCH 1/8] Pin workload version to older version for .NET6 --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 752a380c..78d96952 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: dotnet-version: 6.x - name: Install .NET Android and iOS workload - run: dotnet workload install android ios + run: dotnet workload install android ios --sdk-version=6.0.416 --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/6.0.553.json - name: Setup NuGet uses: nuget/setup-nuget@v1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7689ff67..277ab4f3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ jobs: dotnet-version: 6.x - name: Install .NET Android and iOS workload - run: dotnet workload install android ios + run: dotnet workload install android ios --sdk-version=6.0.416 --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/6.0.553.json - name: Setup NuGet uses: nuget/setup-nuget@v1 From 884d905483658d5528c98ca02790cf4fecb97e0f Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 09:56:02 +0100 Subject: [PATCH 2/8] Add global.json file --- global.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 00000000..0e340014 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "6.0.417", + "rollForward": "latestFeature" + } + } \ No newline at end of file From 8efc2a31a73eacdbefe12eda7e768a1edf43a5c0 Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 09:57:57 +0100 Subject: [PATCH 3/8] Revert changes --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78d96952..752a380c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: dotnet-version: 6.x - name: Install .NET Android and iOS workload - run: dotnet workload install android ios --sdk-version=6.0.416 --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/6.0.553.json + run: dotnet workload install android ios - name: Setup NuGet uses: nuget/setup-nuget@v1 From 4fbf9670e3acb489654531d85e4f0b5f89ec414e Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 10:00:45 +0100 Subject: [PATCH 4/8] Revert changes --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 277ab4f3..7689ff67 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ jobs: dotnet-version: 6.x - name: Install .NET Android and iOS workload - run: dotnet workload install android ios --sdk-version=6.0.416 --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/6.0.553.json + run: dotnet workload install android ios - name: Setup NuGet uses: nuget/setup-nuget@v1 From 64155d379b672bbdbb2faffba923d388315bc200 Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 10:05:57 +0100 Subject: [PATCH 5/8] Remove dotnet version from actions/setup-dotnet --- .github/workflows/build.yml | 2 -- .github/workflows/publish.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 752a380c..e1caf417 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,6 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v3 - with: - dotnet-version: 6.x - name: Install .NET Android and iOS workload run: dotnet workload install android ios diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7689ff67..5902c8f2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,8 +26,6 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v3 - with: - dotnet-version: 6.x - name: Install .NET Android and iOS workload run: dotnet workload install android ios From 72ea57175799e153b598a3e04cb7c1e7ecb8800b Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 10:23:06 +0100 Subject: [PATCH 6/8] Install Java --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1caf417..595156d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,12 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install Java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + - name: Install .NET uses: actions/setup-dotnet@v3 From 0bee4d4111e85a45ef64cd0382c91278d8f4cad9 Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 10:29:43 +0100 Subject: [PATCH 7/8] Use Java 11 for Xamarin instead of 17 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 595156d5..e4f70906 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '17' + java-version: '11' - name: Install .NET uses: actions/setup-dotnet@v3 From afbaf8802413ecd862f7d402e7fdf1b1e3391020 Mon Sep 17 00:00:00 2001 From: Frederik Prijck Date: Mon, 27 Nov 2023 10:34:36 +0100 Subject: [PATCH 8/8] Also install Java on publish --- .github/workflows/publish.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5902c8f2..92216bf0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -24,6 +24,12 @@ jobs: fetch-depth: 0 ref: ${{ github.event.inputs.branch }} + - name: Install Java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + - name: Install .NET uses: actions/setup-dotnet@v3