Skip to content

Commit 79232ca

Browse files
LucHeartLucHeart
committed
update to net10
1 parent 2fcb639 commit 79232ca

File tree

5 files changed

+46
-45
lines changed

5 files changed

+46
-45
lines changed

‎Desktop/Desktop.csproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<PropertyGroup Condition="'$(Configuration)' == 'Debug-Windows' Or '$(Configuration)' == 'Release-Windows'">
31-
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
31+
<TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
3232
<WindowsPackageType>None</WindowsPackageType>
3333
<UseMaui>true</UseMaui>
3434
<DefineConstants>MAUI</DefineConstants>
@@ -37,13 +37,13 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup Condition="'$(Configuration)' == 'Debug-Windows' Or '$(Configuration)' == 'Release-Windows'">
40-
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
41-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.110" />
42-
<PackageReference Update="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.110" />
40+
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.10" />
41+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.10" />
42+
<PackageReference Update="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.10" />
4343
</ItemGroup>
4444

4545
<PropertyGroup Condition="'$(Configuration)' == 'Debug-Photino' Or '$(Configuration)' == 'Release-Photino'">
46-
<TargetFramework>net9.0</TargetFramework>
46+
<TargetFramework>net10.0</TargetFramework>
4747
<StartupObject>OpenShock.Desktop.Platforms.Photino.PhotinoEntryPoint</StartupObject>
4848
<DefineConstants>PHOTINO</DefineConstants>
4949
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
@@ -54,26 +54,26 @@
5454
</ItemGroup>
5555

5656
<PropertyGroup Condition="'$(Configuration)' == 'Debug-Web' Or '$(Configuration)' == 'Release-Web' ">
57-
<TargetFramework>net9.0</TargetFramework>
57+
<TargetFramework>net10.0</TargetFramework>
5858
<StartupObject>OpenShock.Desktop.Platforms.Web.WebEntryPoint</StartupObject>
5959
<DefineConstants>WEB</DefineConstants>
6060
</PropertyGroup>
6161

6262
<ItemGroup>
63-
<PackageReference Update="Microsoft.AspNetCore.Components.Web" Version="9.0.9" />
64-
<PackageReference Include="AspNetCore.SassCompiler" Version="1.93.2" />
63+
<PackageReference Update="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
64+
<PackageReference Include="AspNetCore.SassCompiler" Version="1.94.0" />
6565
<PackageReference Include="CommandLineParser" Version="2.9.1"/>
6666
<PackageReference Include="dnlib" Version="4.5.0" />
67-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
68-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
69-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
70-
<PackageReference Include="MudBlazor" Version="8.13.0" />
67+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
68+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
69+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
70+
<PackageReference Include="MudBlazor" Version="8.14.0" />
7171
<PackageReference Include="Semver" Version="3.0.0" />
7272
<PackageReference Include="Serilog" Version="4.3.0" />
73-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.9" />
73+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
7474
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
7575
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
76-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
76+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
7777
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
7878
<PackageReference Include="OpenShock.SDK.CSharp" Version="0.0.39" />
7979
<PackageReference Include="OpenShock.SDK.CSharp.Hub" Version="0.0.39" />

‎Desktop/MauiProgram.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void HideOnFirstLaunch(object? sender, Microsoft.UI.Xaml.WindowActivatedEventArg
8888

8989
if (page == null) return;
9090

91-
var result = await page.DisplayAlert(
91+
var result = await page.DisplayAlertAsync(
9292
"Close?",
9393
"Do you want to close OpenShock?",
9494
"Yes",

‎Desktop/Services/Pipes/PipeServerService.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,14 @@ private async Task ServerLoop()
4545
_logger.LogInformation("[{Id}] Pipe connected!", id);
4646

4747
using var reader = new StreamReader(pipeServerStream);
48-
while (pipeServerStream.IsConnected && !reader.EndOfStream)
48+
while (pipeServerStream.IsConnected)
4949
{
5050
var line = await reader.ReadLineAsync();
51+
if (line is null)
52+
{
53+
_logger.LogInformation("[{Id}] Pipe receive end of stream!", id);
54+
break;
55+
}
5156
if (string.IsNullOrEmpty(line))
5257
{
5358
_logger.LogWarning("[{Id}] Received empty pipe message. Skipping...", id);

‎ExampleModule/ExampleModule.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<OutputType>Library</OutputType>
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="MudBlazor" Version="8.13.0" />
24+
<PackageReference Include="MudBlazor" Version="8.14.0" />
2525
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2626
</ItemGroup>
2727

‎ModuleBase/ModuleBase.csproj‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../Shared.props" />
3-
4-
<PropertyGroup>
5-
<TargetFramework>net9.0</TargetFramework>
6-
<Configurations>Debug;Release</Configurations>
7-
<AssemblyName>OpenShock.Desktop.ModuleBase</AssemblyName>
8-
<RootNamespace>OpenShock.Desktop.ModuleBase</RootNamespace>
9-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
10-
<Title>OpenShock ModuleBase</Title>
11-
<PackageIcon>Icon512.png</PackageIcon>
12-
<IncludeSymbols>true</IncludeSymbols>
13-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
14-
<Description>OpenShock Desktop Module Framework Base. Install to make a module for OpenShock Desktop</Description>
15-
</PropertyGroup>
16-
17-
<ItemGroup>
18-
<InternalsVisibleTo Include="OpenShock.Desktop" />
19-
<None Include=".\README.md" Pack="true" PackagePath="\"/>
20-
<None Include="..\Desktop\wwwroot\images\Icon512.png" Pack="true" PackagePath="$(PackageIcon)" />
21-
</ItemGroup>
22-
23-
<ItemGroup>
24-
<PackageReference Include="OpenShock.MinimalEvents" Version="0.0.1" />
25-
<PackageReference Update="Microsoft.AspNetCore.Components.Web" Version="9.0.9" />
26-
</ItemGroup>
27-
28-
</Project>
2+
<Import Project="../Shared.props" />
3+
<PropertyGroup>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<Configurations>Debug;Release</Configurations>
6+
<AssemblyName>OpenShock.Desktop.ModuleBase</AssemblyName>
7+
<RootNamespace>OpenShock.Desktop.ModuleBase</RootNamespace>
8+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9+
<Title>OpenShock ModuleBase</Title>
10+
<PackageIcon>Icon512.png</PackageIcon>
11+
<IncludeSymbols>true</IncludeSymbols>
12+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
13+
<Description>OpenShock Desktop Module Framework Base. Install to make a module for OpenShock Desktop</Description>
14+
</PropertyGroup>
15+
<ItemGroup>
16+
<InternalsVisibleTo Include="OpenShock.Desktop" />
17+
<None Include=".\README.md" Pack="true" PackagePath="\" />
18+
<None Include="..\Desktop\wwwroot\images\Icon512.png" Pack="true" PackagePath="$(PackageIcon)" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<PackageReference Include="OpenShock.MinimalEvents" Version="0.0.1" />
22+
<PackageReference Update="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
23+
</ItemGroup>
24+
</Project>

0 commit comments

Comments
 (0)