Skip to content

Commit f29afef

Browse files
authored
Merge branch 'master' into database-options
2 parents 21316aa + 5ea73e6 commit f29afef

12 files changed

Lines changed: 1885 additions & 23 deletions

.config/dotnet-tools.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-ef": {
6+
"version": "9.0.10",
7+
"commands": [
8+
"dotnet-ef"
9+
],
10+
"rollForward": false
11+
}
12+
}
13+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ obj/
55
artifacts
66

77
.devcontainer/pgsql/
8+
docker/jellyfin.PgsqlMigrator.dll

Jellyfin.Plugin.Pgsql/Jellyfin.Plugin.Pgsql.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Jellyfin.Controller" Version="10.11.0-rc5" PrivateAssets="all" />
15-
<PackageReference Include="Jellyfin.Model" Version="10.11.0-rc5" PrivateAssets="all" />
14+
<PackageReference Include="Jellyfin.Controller" Version="10.11.3" PrivateAssets="all" />
15+
<PackageReference Include="Jellyfin.Model" Version="10.11.3" PrivateAssets="all" />
1616
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
1717
<PackageReference Include="Npgsql" Version="9.0.4" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.10" PrivateAssets="all" />
@@ -29,11 +29,11 @@
2929
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" PrivateAssets="all" />
3030
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
3131
<PrivateAssets>all</PrivateAssets>
32-
<IncludeAssets>build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3333
</PackageReference>
3434
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
3535
<PrivateAssets>all</PrivateAssets>
36-
<IncludeAssets>build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
36+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>
3838
</ItemGroup>
3939

0 commit comments

Comments
 (0)