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.

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

Update GH script #451

Merged
merged 3 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .github/workflows/main-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,17 @@ jobs:
uses: actions/checkout@v3
with:
path: Meadow.Core
ref: main

- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x

- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.x

- name: Workload Restore Meadow.Core
run: dotnet workload restore Meadow.Core/source/Meadow.Core.sln

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ItemGroup>
<PackageReference Include="System.IO.Ports" Version="7.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.9.0" />
<PackageReference Include="Meadow.Linux" Version="1.9.0" />
<PackageReference Include="Meadow.Mac" Version="1.9.0" />
<PackageReference Include="Meadow.Windows" Version="1.9.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ItemGroup>
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
<PackageReference Include="Meadow" Version="1.9.0" />
<ProjectReference Condition=" '$(TargetFramework)' == 'net7.0'" Include="..\..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Gtk\Driver\Displays.Gtk.csproj" />
<PackageReference Condition=" '$(TargetFramework)' == 'net7.0'" Include="Meadow.Foundation.Displays.Gtk" Version="1.9.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
Expand Down
2 changes: 1 addition & 1 deletion source/implementations/mac/Meadow.Mac/Meadow.Mac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
<PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
<ProjectReference Include="..\..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Gtk\Driver\Displays.Gtk.csproj" />
<PackageReference Condition=" '$(TargetFramework)' == 'net7.0'" Include="Meadow.Foundation.Displays.Gtk" Version="1.9.0" />
<PackageReference Include="Meadow" Version="1.9.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
<PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
<PackageReference Include="Meadow" Version="1.9.0" />
<ProjectReference Condition=" '$(TargetFramework)' == 'net7.0-windows'" Include="..\..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.WinForms\Driver\Displays.WinForms.csproj" />
<PackageReference Condition=" '$(TargetFramework)' == 'net7.0-windows'" Include="Meadow.Foundation.Displays.WinForms" Version="1.9.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
Expand Down
Loading