Merge pull request #532 from WildernessLabs/jorge-build-fix

Update main-ci.yml
WildernessLabs · May 29, 2024 · cf22558 · cf22558
2 parents 3a0ee16 + 3cbe362
commit cf22558
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git 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

diff --git a/source/Meadow.Core/Meadow.Core.csproj b/source/Meadow.Core/Meadow.Core.csproj
@@ -29,7 +29,7 @@
     <None Include="..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
     <None Include="Cloud\MeadowCloudConnectionService.cs" />
     <PackageReference Include="Meadow.Contracts" Version="1.12.0" />
-	  <ProjectReference Include="..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Serialization.MicroJson\Driver\Serialization.MicroJson.csproj" />
+      <PackageReference Include="Meadow.Foundation.Serialization.MicroJson" Version="1.12.0" />
     <PackageReference Include="Meadow.Modbus" Version="1.12.0" />
     <PackageReference Include="Meadow.MQTT" Version="1.12.0" />
 	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />

diff --git a/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj b/source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj
@@ -23,7 +23,7 @@
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
-    <ProjectReference Include="..\..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
+    <PackageReference Include="Meadow.Foundation" Version="1.12.0" />
     <PackageReference Include="Meadow.Linux" Version="1.12.0" />
     <PackageReference Include="Meadow.Mac" Version="1.12.0" />
     <PackageReference Include="Meadow.Windows" Version="1.12.0" />

diff --git a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
-    <ProjectReference Include="..\..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Silk\Driver\Displays.Silk.csproj" />
+    <PackageReference Include="Meadow.Foundation.Displays.Silk" Version="1.12.0" />
     <PackageReference Include="Meadow" Version="1.12.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj b/source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
-    <ProjectReference Include="..\..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Silk\Driver\Displays.Silk.csproj" />
+    <PackageReference Include="Meadow.Foundation.Displays.Silk" Version="1.12.0" />
     <PackageReference Include="Meadow" Version="1.12.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="ManagedNativeWifi" Version="2.5.0" />
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
-    <ProjectReference Include="..\..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Silk\Driver\Displays.Silk.csproj" />
+    <PackageReference Include="Meadow.Foundation.Displays.Silk" Version="1.12.0" />
     <PackageReference Include="Meadow" Version="1.12.0" />
   </ItemGroup>
   <ItemGroup>