diff options
| author | Jim Cartlidge <jimcartlidge@yahoo.co.uk> | 2020-09-24 15:37:34 +0100 |
|---|---|---|
| committer | Jim Cartlidge <jimcartlidge@yahoo.co.uk> | 2020-09-24 15:37:34 +0100 |
| commit | fb1d452b593a5e016695ca0c412e83a25244850e (patch) | |
| tree | b112f6eeb41741896a778e9123400cffe14a56e1 | |
| parent | 37cb4dbca6dd42d004fa389dd2b6fbc07d56b7d4 (diff) | |
| parent | 89e67b2e7faf76abaa226f6df63f837a614f6f28 (diff) | |
fix conflict
| -rw-r--r-- | Emby.Server.Implementations/Emby.Server.Implementations.csproj | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 4d7919d8b..9a860f4d7 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -22,6 +22,7 @@ </ItemGroup> <ItemGroup> + <PackageReference Include="IPNetwork2" Version="2.5.224" /> <PackageReference Include="Jellyfin.XmlTv" Version="10.6.2" /> <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" /> <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" /> @@ -31,10 +32,6 @@ <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" /> - <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" /> - <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" /> - <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" /> - <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" /> <PackageReference Include="Mono.Nat" Version="3.0.0" /> <PackageReference Include="prometheus-net.DotNetRuntime" Version="3.4.0" /> <PackageReference Include="ServiceStack.Text.Core" Version="5.9.2" /> |