From 8bc1023c05d8a77a48aae4c19661b67933acdec1 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 29 May 2024 11:21:13 -0700 Subject: [PATCH 1/5] Update main-ci.yml --- .github/workflows/main-ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index a20104fd..e575ed58 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -18,12 +18,15 @@ jobs: uses: actions/checkout@v3 with: path: Meadow.Core - ref: main - - name: Setup .NET - uses: actions/setup-dotnet@v1 + - name: Setup .NET SDK + uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: + 7.0.x + + - name: Install MAUI Workload + run: dotnet workload install maui --ignore-failed-sources - name: Workload Restore Meadow.Core run: dotnet workload restore Meadow.Core/source/Meadow.Core.sln From 69880ed00325613664e23738cf71807f7f51399a Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 29 May 2024 11:40:34 -0700 Subject: [PATCH 2/5] Try targeting .NET 8 --- .github/workflows/main-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index e575ed58..5112e943 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: - 7.0.x + 8.0.x - name: Install MAUI Workload run: dotnet workload install maui --ignore-failed-sources From f8fd40640dfb7ffc0255933010703001ae1a8c79 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 29 May 2024 11:50:48 -0700 Subject: [PATCH 3/5] Revert "Try targeting .NET 8" This reverts commit 69880ed00325613664e23738cf71807f7f51399a. --- .github/workflows/main-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 5112e943..e575ed58 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: - 8.0.x + 7.0.x - name: Install MAUI Workload run: dotnet workload install maui --ignore-failed-sources From 74060676a1e483f5e1890a8c48e6be713a25b2fc Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 29 May 2024 12:11:09 -0700 Subject: [PATCH 4/5] Nugetize Displays.Silk for Meadow.Deskop projects --- source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj | 2 +- source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj | 2 +- .../windows/Meadow.Windows/Meadow.Windows.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj index 9185e4ba..afbba857 100644 --- a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj +++ b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj @@ -22,7 +22,7 @@ - + diff --git a/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj b/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj index 2005793f..41d4d478 100644 --- a/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj +++ b/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj @@ -20,7 +20,7 @@ - + diff --git a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj index 7b82839d..c8b1caa5 100644 --- a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj +++ b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj @@ -22,7 +22,7 @@ - + From 3cbe3628b69b4d2c103d0b5410195265cf65cece Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 29 May 2024 12:23:40 -0700 Subject: [PATCH 5/5] More nugets --- source/Meadow.Core/Meadow.Core.csproj | 2 +- .../desktop/Meadow.Desktop/Meadow.Desktop.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Meadow.Core/Meadow.Core.csproj b/source/Meadow.Core/Meadow.Core.csproj index 98112f28..1a6293d5 100644 --- a/source/Meadow.Core/Meadow.Core.csproj +++ b/source/Meadow.Core/Meadow.Core.csproj @@ -29,7 +29,7 @@ - + diff --git a/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj b/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj index d6b8f836..14af0a16 100644 --- a/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj +++ b/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj @@ -23,7 +23,7 @@ - +