Skip to content

Commit a3d4b77

Browse files
standleypgstandleypg
authored
Merge pull request #90 from standleypg-dev/Task/version-upgrade
Upgrade .NET 9 -> .NET 10, upgrade packages version.
2 parents 5ac5403 + 410fe46 commit a3d4b77

9 files changed

Lines changed: 35 additions & 27 deletions

File tree

‎deployment/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Keep your original structure but optimize base image
2-
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS lib-build
2+
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS lib-build
33

44
WORKDIR /deps
55

@@ -43,7 +43,7 @@ RUN dotnet publish "$PROJECT_PATH" \
4343
--self-contained false \
4444
--no-restore
4545

46-
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS final
46+
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS final
4747

4848
RUN apk add --no-cache \
4949
ffmpeg \

‎src/Application/Application.csproj‎

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

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
5-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
6-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
7-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
4+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
5+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
6+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
7+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.3" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎src/Directory.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
6-
<LangVersion>preview</LangVersion>
76
</PropertyGroup>
87
</Project>

‎src/Infrastructure/CompiledModels/DiscordBotContextModelBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Infrastructure.CompiledModels
1212
public partial class DiscordBotContextModel
1313
{
1414
private DiscordBotContextModel()
15-
: base(skipDetectChanges: false, modelId: new Guid("45b6d6a4-d2e0-417d-aa8d-8364881d57ae"), entityTypeCount: 4)
15+
: base(skipDetectChanges: false, modelId: new Guid("77a85d27-fb4f-48e5-a120-f0aad4b87f25"), entityTypeCount: 4)
1616
{
1717
}
1818

@@ -32,7 +32,7 @@ partial void Initialize()
3232
UserEntityType.CreateAnnotations(user);
3333

3434
AddAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
35-
AddAnnotation("ProductVersion", "9.0.6");
35+
AddAnnotation("ProductVersion", "10.0.3");
3636
AddAnnotation("Relational:MaxIdentifierLength", 63);
3737
}
3838
}

‎src/Infrastructure/Infrastructure.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
</ItemGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9"/>
13+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3"/>
1414
<PackageReference Include="NetCord" Version="1.0.0-alpha.427" />
1515
<PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.427" />
1616
<PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.427" />
17-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4"/>
17+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0"/>
1818
<PackageReference Include="NAudio" Version="2.2.1"/>
1919
<PackageReference Include="SoundCloudExplode" Version="1.6.7" />
2020
<PackageReference Include="SoundTouch.Net.NAudioSupport" Version="2.3.2"/>
21-
<PackageReference Include="YoutubeDLSharp" Version="1.1.2"/>
22-
<PackageReference Include="YoutubeExplode" Version="6.5.5" />
21+
<PackageReference Include="YoutubeDLSharp" Version="1.2.0"/>
22+
<PackageReference Include="YoutubeExplode" Version="6.5.7" />
2323
</ItemGroup>
2424

2525
</Project>

‎src/Infrastructure/Services/YoutubeService.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public async Task<string> GetAudioStreamUrlAsync(string url, CancellationToken c
7979
{
8080
var ytdl = new YoutubeDL { YoutubeDLPath = "yt-dlp" };
8181
var result = await ytdl.RunVideoDataFetch(url);
82+
8283
result.EnsureSuccess();
8384

8485
var httpsFormats = result.Data.Formats
@@ -97,9 +98,9 @@ public async Task<string> GetAudioStreamUrlAsync(string url, CancellationToken c
9798
}
9899

99100
// Verify URL is accessible
100-
// using var httpClient = new HttpClient();
101-
// var response = await httpClient.GetAsync(bestAudio.Url);
102-
// response.EnsureSuccessStatusCode();
101+
using var httpClient = new HttpClient();
102+
var response = await httpClient.GetAsync(bestAudio.Url);
103+
response.EnsureSuccessStatusCode();
103104

104105
return (true, bestAudio.Url);
105106
}

‎src/UI/Api/Api.csproj‎

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

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.9" />
5-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />
6-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
4+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
5+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
6+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
77
</ItemGroup>
88

99
<ItemGroup>

‎src/UI/App/package-lock.json‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Worker/Worker.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
</None>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.6"/>
15-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
17-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
18-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3"/>
15+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
17+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<ProjectReference Include="..\Application\Application.csproj" />

0 commit comments

Comments
 (0)