Skip to content

Commit b04152e

Browse files
authored
Merge pull request #24 from snow-jallen/copilot/update-net-to-version-10
Update to .NET 10 LTS
2 parents af40568 + 697f2a1 commit b04152e

6 files changed

Lines changed: 14 additions & 15 deletions

File tree

HomeSpeaker.Server2/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

33
# This stage is used when running from VS in fast mode (Default for Debug configuration)
4-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
4+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
55
RUN apt update && apt install --yes sox libsox-fmt-mp3 alsa-utils vlc ffmpeg
66
WORKDIR /app
77
EXPOSE 8080
88
EXPOSE 8081
99

1010
# This stage is used to build the service project
11-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
11+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
1212
ARG BUILD_CONFIGURATION=Release
1313
WORKDIR /src
1414
COPY ["HomeSpeaker.Server2/HomeSpeaker.Server2.csproj", "HomeSpeaker.Server2/"]

HomeSpeaker.Server2/HomeSpeaker.Server2.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<UserSecretsId>2bc8685f-1b2d-405a-b0d1-899806a7a151</UserSecretsId>
@@ -13,23 +13,23 @@
1313
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
1414
<WarningsAsErrors />
1515
<WarningsNotAsErrors />
16-
<NoWarn>$(NoWarn);CS0169;CS0414;CS8618;CS8604;CS8600;CS8602;CS8603;CS4014;CS1998;SYSLIB0051;IDE0009;IDE0044;IDE0005;IDE0161;IDE0130;IDE1006;IDE2001;IDE2000;IDE0055;IDE0040;IDE2003;IDE0007;IDE0011;IDE0004;IDE2002;IDE0059;SA1649;CA1003;CA1063;CA1065;CA1725;CA1727;CA1805;CA1816;CA1823;CA1826;CA1835;CA1836;CA1849;CA1852;CA1854;CA1861;CA1869;CA2012;CA2016;CA2052;CA2254;MA0134;RS0030</NoWarn>
16+
<NoWarn>$(NoWarn);CS0169;CS0414;CS8618;CS8604;CS8600;CS8602;CS8603;CS4014;CS1998;SYSLIB0051;IDE0009;IDE0031;IDE0044;IDE0005;IDE0161;IDE0130;IDE1006;IDE2001;IDE2000;IDE0055;IDE0040;IDE2003;IDE0007;IDE0011;IDE0004;IDE2002;IDE0059;SA1649;CA1003;CA1063;CA1065;CA1725;CA1727;CA1805;CA1816;CA1823;CA1826;CA1835;CA1836;CA1849;CA1852;CA1854;CA1861;CA1869;CA2012;CA2016;CA2052;CA2254;MA0134;RS0030</NoWarn>
1717
</PropertyGroup>
1818
<ItemGroup>
1919
<Protobuf Include="Protos\greet.proto" GrpcServices="Server" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<PackageReference Include="CliWrap" Version="3.8.2" />
2323
<PackageReference Include="JsonExtensions" Version="1.2.0" />
24-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.5" />
24+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" />
2525
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
2626
<PackageReference Include="Grpc.AspNetCore.Web" Version="2.67.0" />
2727
<PackageReference Include="ID3" Version="0.6.0" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5">
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
3333
<PackageReference Include="Microsoft.Fast.Components.FluentUI" Version="3.8.0" />
3434
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
3535
<PackageReference Include="OpenTelemetry.Api" Version="1.12.0" />

HomeSpeaker.Server2/Services/PlaylistService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public async Task ReorderPlaylistSongsAsync(string playlistName, IEnumerable<str
155155
{
156156
var songPath = songPathsList[i];
157157
var playlistItem = playlist.Songs.FirstOrDefault(s => s.SongPath == songPath);
158-
if (playlistItem != null)
158+
if (playlistItem is not null)
159159
{
160160
playlistItem.Order = i;
161161
}

HomeSpeaker.Shared/HomeSpeaker.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
</PropertyGroup>
55

66
<!-- Allow warnings in Release builds for CI/CD -->

HomeSpeaker.WebAssembly/HomeSpeaker.WebAssembly.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -15,16 +15,15 @@
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Grpc.Net.Client.Web" Version="2.71.0" />
18-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
19-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" PrivateAssets="all" />
20-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.5" />
18+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
19+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all" />
20+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
2121
<PackageReference Include="Microsoft.Fast.Components.FluentUI" Version="3.8.0" />
2222
<PackageReference Include="MudBlazor" Version="8.7.0" />
2323
<PackageReference Include="OpenTelemetry" Version="1.12.0" />
2424
<PackageReference Include="OpenTelemetry.Api" Version="1.12.0" />
2525
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
2626
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
27-
<PackageReference Include="System.Text.Json" Version="9.0.5" />
2827
<PackageReference Include="Workleap.DotNet.CodingStandards" Version="1.1.23">
2928
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3029
<PrivateAssets>all</PrivateAssets>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "9.0.304"
3+
"version": "10.0.100"
44
}
55
}

0 commit comments

Comments
 (0)