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

Update to EFCore 9 #292

Merged
merged 18 commits into from
Nov 18, 2024
Merged

Update to EFCore 9 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3a0a492
Update global.json to use .NET SDK 9.0.100
Smalls1652 Nov 13, 2024
d758e3f
Change target framework to net9.0
Smalls1652 Nov 13, 2024
4ea293b
Update the majority of packages
Smalls1652 Nov 13, 2024
b5cdf75
Update to EFCore 9
Smalls1652 Nov 13, 2024
84b30e0
Update container builds to use .NET 9 images
Smalls1652 Nov 13, 2024
dd241a0
Merge branch 'main' into update/container-images-dotnet-9
Smalls1652 Nov 13, 2024
f56ec87
Merge branch 'update/container-images-dotnet-9' into update/efcore-9
Smalls1652 Nov 13, 2024
3442f53
Merge branch 'main' into update/efcore-9
Smalls1652 Nov 13, 2024
f00f26c
Merge branch 'main' into update/efcore-9
Smalls1652 Nov 13, 2024
0770305
Merge branch 'main' into update/efcore-9
Smalls1652 Nov 13, 2024
23ae8b9
Merge branch 'main' into update/efcore-9
Smalls1652 Nov 13, 2024
ab90dd2
Merge branch 'main' into update/efcore-9
Smalls1652 Nov 14, 2024
117abfc
Update Entity Framework Core packages to version 9.0.0
Smalls1652 Nov 14, 2024
d0019f8
Update dotnet-ef tool version to 9.0.0
Smalls1652 Nov 14, 2024
d477653
Merge branch 'main' into update/efcore-9
Smalls1652 Nov 15, 2024
7fa296f
Merge branch 'main' into update/efcore-9
Smalls1652 Nov 15, 2024
2eec05d
Remove CosmosDB (#303)
Smalls1652 Nov 15, 2024
ab9f219
Update Npgsql EFCore provider to 9.0.0
Smalls1652 Nov 18, 2024
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"rollForward": false
},
"dotnet-ef": {
"version": "8.0.10",
"version": "9.0.0",
"commands": [
"dotnet-ef"
],
Expand Down
16 changes: 7 additions & 9 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="MarkDig" Version="0.38.0" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.45.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Cosmos" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Analyzers" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
Expand All @@ -36,7 +34,7 @@
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
Expand Down
1 change: 0 additions & 1 deletion src/App/App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<PackageReference Include="Azure.Storage.Queues" />
<PackageReference Include="Discord.Net" />
<PackageReference Include="GitVersion.MsBuild" PrivateAssets="all" />
<PackageReference Include="Microsoft.Azure.Cosmos" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Configuration" />
Expand Down
24 changes: 0 additions & 24 deletions src/App/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using MuzakBot.Database.Extensions;
using MuzakBot.Database.Models;
using MuzakBot.Hosting.Extensions;
using MuzakBot.Lib.Services;
using MuzakBot.Lib.Services.Extensions;

DateTimeOffset startTime = DateTimeOffset.UtcNow;
Expand Down Expand Up @@ -100,23 +99,6 @@
builder.Services
.AddMuzakBotDbContextFactory(databaseConfig);

bool shouldMigrateCosmosDbToPostgres = builder.Configuration.GetValue<bool>("MIGRATE_COSMOSDB_TO_POSTGRES");
if (shouldMigrateCosmosDbToPostgres)
{
DatabaseConfig cosmosDbConfig = new()
{
DatabaseType = DatabaseType.CosmosDb,
CosmosDbConfig = new()
{
ConnectionString = builder.Configuration.GetValue<string>("COSMOSDB_CONNECTION_STRING") ?? throw new("COSMOSDB_CONNECTION_STRING is not set."),
}
};

builder.Services
.AddAlbumReleaseDbContextFactory(cosmosDbConfig)
.AddLyricsAnalyzerDbContextFactory(cosmosDbConfig);
}

builder.Services
.AddOpenAiService(options =>
{
Expand All @@ -142,10 +124,4 @@

await host.ApplyMuzakBotDbContextMigrations();

if (shouldMigrateCosmosDbToPostgres)
{
await host.MigrateCosmosDbDataToPostgresAsync();
return;
}

await host.RunAsync();
2 changes: 0 additions & 2 deletions src/Database/Database.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@
<PackageReference Include="Azure.Core" />
<PackageReference Include="Discord.Net" PrivateAssets="all" />
<PackageReference Include="GitVersion.MsBuild" PrivateAssets="all" />
<PackageReference Include="Microsoft.Azure.Cosmos" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
31 changes: 0 additions & 31 deletions src/Database/DbContexts/AlbumReleaseDbContext/AlbumReleaseDbContext.cs
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions src/Database/DbContexts/LyricsAnalyzerDbContext/LyricsAnalyzerDbContext.cs
View file
Open in desktop

This file was deleted.

Loading