From 73103bd05a97840f2f2f78e93da11e993da4883b Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 6 Mar 2024 09:57:28 -0800 Subject: [PATCH 1/3] Update GH script --- .github/workflows/main-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index a20104fd..6fbd9716 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -25,6 +25,11 @@ jobs: with: dotnet-version: 7.0.x + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 7.0.x + - name: Workload Restore Meadow.Core run: dotnet workload restore Meadow.Core/source/Meadow.Core.sln From c47ffea22dedfd1765eb3b2cccd8933f3c765236 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 6 Mar 2024 10:01:31 -0800 Subject: [PATCH 2/3] Update GH script --- .github/workflows/main-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 6fbd9716..b0cc894f 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -18,7 +18,6 @@ jobs: uses: actions/checkout@v3 with: path: Meadow.Core - ref: main - name: Setup .NET uses: actions/setup-dotnet@v1 @@ -28,7 +27,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Workload Restore Meadow.Core run: dotnet workload restore Meadow.Core/source/Meadow.Core.sln From 1f35a83d6fb6be6ff2d9353d9170cbc18add8ef4 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Wed, 6 Mar 2024 10:25:46 -0800 Subject: [PATCH 3/3] Build fixes --- .../desktop/Meadow.Desktop/Meadow.Desktop.csproj | 2 +- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj b/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj index 02be13af..fb4b4516 100644 --- a/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj +++ b/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj @@ -15,7 +15,7 @@ - + diff --git a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj index dcd1d64f..46cd69ef 100644 --- a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj +++ b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj @@ -25,7 +25,7 @@ - + diff --git a/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj b/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj index fee51b4e..81906b1f 100644 --- a/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj +++ b/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj @@ -21,7 +21,7 @@ - + diff --git a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj index 277d521c..5e3d411f 100644 --- a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj +++ b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj @@ -23,7 +23,7 @@ - +