Skip to content

Commit 9427558

Browse files
authored
Merge pull request #104 from LTruijens/dotnet9
Upgrade to dotnet 9
2 parents 8f63d56 + 058d3d5 commit 9427558

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup .NET
3838
uses: actions/setup-dotnet@v3
3939
with:
40-
dotnet-version: 8.0.x
40+
dotnet-version: 9.0.x
4141

4242
- name: Run device simulator
4343
run: docker run --rm --name device-simulator -d -p 4403:4403 meshtastic/device-simulator
@@ -71,7 +71,7 @@ jobs:
7171
- name: Setup .NET
7272
uses: actions/setup-dotnet@v3
7373
with:
74-
dotnet-version: 8.0.x
74+
dotnet-version: 9.0.x
7575

7676
- name: Setup Python
7777
uses: actions/setup-python@v4

Directory.Packages.props

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="coverlet.collector" Version="6.0.1" />
7-
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
6+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
7+
<PackageVersion Include="FluentAssertions" Version="7.1.0" />
88
<PackageVersion Include="ILogger.Moq" Version="1.1.10" />
9-
<PackageVersion Include="Google.Protobuf" Version="3.28.3" />
10-
<PackageVersion Include="Google.Protobuf.Tools" Version="3.28.3" />
11-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
12-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
13-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
14-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
15-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
16-
<PackageVersion Include="Moq" Version="4.18.4" />
9+
<PackageVersion Include="Google.Protobuf" Version="3.29.3" />
10+
<PackageVersion Include="Google.Protobuf.Tools" Version="3.29.3" />
11+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
12+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
13+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
14+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageVersion Include="Moq" Version="4.20.72" />
1717
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
18-
<PackageVersion Include="NUnit" Version="4.1.0" />
19-
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
20-
<PackageVersion Include="NUnit.Analyzers" Version="4.0.1" />
18+
<PackageVersion Include="NUnit" Version="4.3.2" />
19+
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
20+
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
2121
<PackageVersion Include="MQTTnet" Version="4.3.7.1207" />
2222
<PackageVersion Include="QRCoder" Version="1.6.0" />
2323
<PackageVersion Include="SimpleExec" Version="12.0.0" />
2424
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
2525
<PackageVersion Include="Spectre.Console.Json" Version="0.49.1" />
2626
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
27-
<PackageVersion Include="System.IO.Ports" Version="8.0.0" />
28-
<PackageVersion Include="YamlDotNet" Version="15.1.2" />
27+
<PackageVersion Include="System.IO.Ports" Version="9.0.1" />
28+
<PackageVersion Include="YamlDotNet" Version="15.3.0" />
2929
</ItemGroup>
3030
</Project>

Meshtastic.Cli/Meshtastic.Cli.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RootNamespace>Meshtastic.Cli</RootNamespace>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>

Meshtastic.Test/Meshtastic.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66

Meshtastic/Connections/SerialConnection.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public override async Task ReadFromRadio(Func<FromRadio, DeviceStateContainer, T
108108
continue;
109109
}
110110
var buffer = new byte[1];
111-
await serialPort.BaseStream.ReadAsync(buffer);
111+
await serialPort.BaseStream.ReadExactlyAsync(buffer);
112112
if (await ParsePackets(buffer.First(), isComplete))
113113
return;
114114
}

Meshtastic/Connections/TcpConnection.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public override async Task ReadFromRadio(Func<FromRadio, DeviceStateContainer, T
6161
var buffer = new byte[DEFAULT_BUFFER_SIZE];
6262
while (networkStream.CanRead)
6363
{
64-
await networkStream.ReadAsync(buffer);
64+
await networkStream.ReadExactlyAsync(buffer);
6565
foreach (var item in buffer)
6666
{
6767
if (await ParsePackets(item, isComplete))

Meshtastic/Meshtastic.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<RootNamespace>Meshtastic</RootNamespace>

0 commit comments

Comments
 (0)