aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Emby.Dlna/Emby.Dlna.csproj6
-rw-r--r--Emby.Drawing.Skia/Emby.Drawing.Skia.csproj2
-rw-r--r--Emby.Server.Implementations/Emby.Server.Implementations.csproj35
-rw-r--r--MediaBrowser.Server.Mono/EmbyServer.csproj9
4 files changed, 7 insertions, 45 deletions
diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
index f71d54422..b671f114a 100644
--- a/Emby.Dlna/Emby.Dlna.csproj
+++ b/Emby.Dlna/Emby.Dlna.csproj
@@ -33,6 +33,7 @@
<EmbeddedResource Include="Profiles\Xml\foobar2000.xml" />
<EmbeddedResource Include="Profiles\Xml\LG Smart TV.xml" />
<EmbeddedResource Include="Profiles\Xml\Linksys DMA2100.xml" />
+ <EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
<EmbeddedResource Include="Profiles\Xml\MediaMonkey.xml" />
<EmbeddedResource Include="Profiles\Xml\Panasonic Viera.xml" />
<EmbeddedResource Include="Profiles\Xml\Popcorn Hour.xml" />
@@ -52,8 +53,5 @@
<EmbeddedResource Include="Profiles\Xml\WDTV Live.xml" />
<EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
</ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
- </ItemGroup>
-
+
</Project>
diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
index 55dbf876a..3b0aca366 100644
--- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
+++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="SkiaSharp" Version="1.60.3" />
+ <PackageReference Include="SkiaSharp" Version="1.68.0" />
</ItemGroup>
<ItemGroup>
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 24a230166..081238399 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -21,10 +21,9 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
- <PackageReference Include="ServiceStack.Text.Core" Version="5.2.0" />
+ <PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
<PackageReference Include="sharpcompress" Version="0.22.0" />
- <PackageReference Include="SimpleInjector" Version="4.3.0" />
+ <PackageReference Include="SimpleInjector" Version="4.4.2" />
<PackageReference Include="SQLitePCL.pretty.core" Version="1.1.8" />
<PackageReference Include="SQLitePCLRaw.core" Version="1.1.11" />
</ItemGroup>
@@ -133,50 +132,20 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Localization\Ratings\br.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\ca.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\co.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\dk.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\fr.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\gb.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\ie.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\jp.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\kz.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\mx.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\nl.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\nz.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\us.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\uk.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\es.txt" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Localization\Ratings\ro.txt" />
</ItemGroup>
<ItemGroup>
diff --git a/MediaBrowser.Server.Mono/EmbyServer.csproj b/MediaBrowser.Server.Mono/EmbyServer.csproj
index 1cc08450c..cafee872b 100644
--- a/MediaBrowser.Server.Mono/EmbyServer.csproj
+++ b/MediaBrowser.Server.Mono/EmbyServer.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
+ <AssemblyName>jellyfin</AssemblyName>
<TargetFramework>netcoreapp2.1</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
@@ -17,17 +18,11 @@
<ItemGroup>
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
- <PackageReference Include="ServiceStack.Text.Core" Version="5.2.0" />
- <PackageReference Include="sharpcompress" Version="0.22.0" />
- <PackageReference Include="SimpleInjector" Version="4.3.0" />
- <PackageReference Include="SkiaSharp" Version="1.60.3" />
+ <PackageReference Include="SkiaSharp" Version="1.68.0" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.11" />
<PackageReference Include="SQLitePCLRaw.core" Version="1.1.11" />
<PackageReference Include="SQLitePCLRaw.provider.sqlite3.netstandard11" Version="1.1.11" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
- <Reference Include="Emby.Server.MediaEncoding">
- <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>