Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update main-ci.yml #532

Merged
merged 5 commits into from
May 29, 2024
Merged

Update main-ci.yml #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bc1023
Update main-ci.yml
jorgedevs May 29, 2024
69880ed
Try targeting .NET 8
jorgedevs May 29, 2024
f8fd406
Revert "Try targeting .NET 8"
jorgedevs May 29, 2024
7406067
Nugetize Displays.Silk for Meadow.Deskop projects
jorgedevs May 29, 2024
3cbe362
More nugets
jorgedevs May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/main-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion source/Meadow.Core/Meadow.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion source/implementations/desktop/Meadow.Desktop/Meadow.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading