diff options
| author | aled <aled@wibblr.com> | 2020-06-16 19:30:00 +0100 |
|---|---|---|
| committer | aled <aled@wibblr.com> | 2020-06-16 19:30:23 +0100 |
| commit | 05f736defb9b045ace57262d19ec3691414f8bfc (patch) | |
| tree | add6734a2275aeaa887d459153c7bab4b18ff61a /Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj | |
| parent | c722ad22ece5ee7dd68b41521c2716a50364f42a (diff) | |
| parent | 100e9d586dff877610c488936aa035f61f6fedb5 (diff) | |
Merge branch 'master' into check-stored-password-exists
# Conflicts:
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
Diffstat (limited to 'Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj')
| -rw-r--r-- | Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj index 8486fc2df..dcac1b34b 100644 --- a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj +++ b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj @@ -21,16 +21,14 @@ <ItemGroup> <Compile Include="..\SharedVersion.cs" /> - <Compile Remove="Migrations\20200430214405_InitialSchema.cs" /> - <Compile Remove="Migrations\20200430214405_InitialSchema.Designer.cs" /> </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.4"> + <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.4"> + <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.5"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> |