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

Upgrade to dotnet 9 #104

Merged
merged 4 commits into from
Feb 9, 2025
Merged

Upgrade to dotnet 9 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b6d1c2
TargetFramework changed
LTruijens Feb 8, 2025
c08d4f8
fix CA2022
LTruijens Feb 8, 2025
8c67961
updated (most) packages
LTruijens Feb 8, 2025
058d3d5
fix builds
LTruijens Feb 9, 2025
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: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Restore dependencies
run: dotnet restore
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Run device simulator
run: docker run --rm --name device-simulator -d -p 4403:4403 meshtastic/device-simulator
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Setup Python
uses: actions/setup-python@v4
Expand Down
30 changes: 15 additions & 15 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="FluentAssertions" Version="7.1.0" />
<PackageVersion Include="ILogger.Moq" Version="1.1.10" />
<PackageVersion Include="Google.Protobuf" Version="3.28.3" />
<PackageVersion Include="Google.Protobuf.Tools" Version="3.28.3" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="Google.Protobuf" Version="3.29.3" />
<PackageVersion Include="Google.Protobuf.Tools" Version="3.29.3" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NUnit" Version="4.1.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.0.1" />
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
<PackageVersion Include="MQTTnet" Version="4.3.7.1207" />
<PackageVersion Include="QRCoder" Version="1.6.0" />
<PackageVersion Include="SimpleExec" Version="12.0.0" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Json" Version="0.49.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.IO.Ports" Version="8.0.0" />
<PackageVersion Include="YamlDotNet" Version="15.1.2" />
<PackageVersion Include="System.IO.Ports" Version="9.0.1" />
<PackageVersion Include="YamlDotNet" Version="15.3.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Meshtastic.Cli/Meshtastic.Cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Meshtastic.Cli</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion Meshtastic.Test/Meshtastic.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
2 changes: 1 addition & 1 deletion Meshtastic/Connections/SerialConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public override async Task ReadFromRadio(Func<FromRadio, DeviceStateContainer, T
continue;
}
var buffer = new byte[1];
await serialPort.BaseStream.ReadAsync(buffer);
await serialPort.BaseStream.ReadExactlyAsync(buffer);
if (await ParsePackets(buffer.First(), isComplete))
return;
}
Expand Down
2 changes: 1 addition & 1 deletion Meshtastic/Connections/TcpConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public override async Task ReadFromRadio(Func<FromRadio, DeviceStateContainer, T
var buffer = new byte[DEFAULT_BUFFER_SIZE];
while (networkStream.CanRead)
{
await networkStream.ReadAsync(buffer);
await networkStream.ReadExactlyAsync(buffer);
foreach (var item in buffer)
{
if (await ParsePackets(item, isComplete))
Expand Down
2 changes: 1 addition & 1 deletion Meshtastic/Meshtastic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Meshtastic</RootNamespace>
Expand Down
Loading