update project targets

BDInfo/BDInfo.nuget.targets

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
+    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
+  </Target>
+</Project>

BDInfo/project.json

@@ -1,7 +1,17 @@
 {
-  "supports": {},
+    "frameworks":{
-  "dependencies": {},
+        "netstandard1.6":{
-  "frameworks": {
+           "dependencies":{
-    ".NETPortable,Version=v4.5,Profile=Profile7": {}
+                "NETStandard.Library":"1.6.0",
-  }
+            }
+        },
+        ".NETPortable,Version=v4.5,Profile=Profile7":{
+            "buildOptions": {
+                "define": [  ]
+            },
+            "frameworkAssemblies":{
+                
+            }
+        }
+    }
 }

DvdLib/project.json

@@ -1,16 +1,17 @@
-{
+{
-  "frameworks": {
+    "frameworks":{
-    "netstandard1.6": {
+        "netstandard1.6":{
-      "dependencies": {
+           "dependencies":{
-        "NETStandard.Library": "1.6.0"
+                "NETStandard.Library":"1.6.0",
-      }
+            }
-    },
+        },
-    ".NETPortable,Version=v4.5,Profile=Profile7": {
+        ".NETPortable,Version=v4.5,Profile=Profile7":{
-      "buildOptions": {
+            "buildOptions": {
-        "define": []
+                "define": [  ]
-      },
+            },
-      "frameworkAssemblies": {}
+            "frameworkAssemblies":{
+                
+            }
+        }
     }
-  },
-  "dependencies": {}
 }

Emby.Common.Implementations/project.fragment.lock.json

@@ -5,23 +5,30 @@
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Release/MediaBrowser.Common.dll": {}
+        "bin/Debug/MediaBrowser.Common.dll": {}
       },
       "runtime": {
-        "bin/Release/MediaBrowser.Common.dll": {}
+        "bin/Debug/MediaBrowser.Common.dll": {}
+      },
+      "contentFiles": {
+        "bin/Debug/MediaBrowser.Common.pdb": {
+          "buildAction": "None",
+          "codeLanguage": "any",
+          "copyToOutput": true
+        }
       }
     },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Release/MediaBrowser.Model.dll": {}
+        "bin/Debug/MediaBrowser.Model.dll": {}
       },
       "runtime": {
-        "bin/Release/MediaBrowser.Model.dll": {}
+        "bin/Debug/MediaBrowser.Model.dll": {}
       },
       "contentFiles": {
-        "bin/Release/MediaBrowser.Model.pdb": {
+        "bin/Debug/MediaBrowser.Model.pdb": {
           "buildAction": "None",
           "codeLanguage": "any",
           "copyToOutput": true

Emby.Dlna/project.fragment.lock.json

@@ -5,33 +5,47 @@
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Release/MediaBrowser.Common.dll": {}
+        "bin/Debug/MediaBrowser.Common.dll": {}
       },
       "runtime": {
-        "bin/Release/MediaBrowser.Common.dll": {}
+        "bin/Debug/MediaBrowser.Common.dll": {}
+      },
+      "contentFiles": {
+        "bin/Debug/MediaBrowser.Common.pdb": {
+          "buildAction": "None",
+          "codeLanguage": "any",
+          "copyToOutput": true
+        }
       }
     },
     "MediaBrowser.Controller/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Release/MediaBrowser.Controller.dll": {}
+        "bin/Debug/MediaBrowser.Controller.dll": {}
       },
       "runtime": {
-        "bin/Release/MediaBrowser.Controller.dll": {}
+        "bin/Debug/MediaBrowser.Controller.dll": {}
+      },
+      "contentFiles": {
+        "bin/Debug/MediaBrowser.Controller.pdb": {
+          "buildAction": "None",
+          "codeLanguage": "any",
+          "copyToOutput": true
+        }
       }
     },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Release/MediaBrowser.Model.dll": {}
+        "bin/Debug/MediaBrowser.Model.dll": {}
       },
       "runtime": {
-        "bin/Release/MediaBrowser.Model.dll": {}
+        "bin/Debug/MediaBrowser.Model.dll": {}
       },
       "contentFiles": {
-        "bin/Release/MediaBrowser.Model.pdb": {
+        "bin/Debug/MediaBrowser.Model.pdb": {
           "buildAction": "None",
           "codeLanguage": "any",
           "copyToOutput": true

MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.nuget.targets

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
+    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
+  </Target>
+</Project>

MediaBrowser.LocalMetadata/project.json

@@ -1,7 +1,17 @@
 {
-  "supports": {},
+    "frameworks":{
-  "dependencies": {},
+        "netstandard1.6":{
-  "frameworks": {
+           "dependencies":{
-    ".NETPortable,Version=v4.5,Profile=Profile7": {}
+                "NETStandard.Library":"1.6.0",
-  }
+            }
+        },
+        ".NETPortable,Version=v4.5,Profile=Profile7":{
+            "buildOptions": {
+                "define": [  ]
+            },
+            "frameworkAssemblies":{
+                
+            }
+        }
+    }
 }

MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs

@@ -4,6 +4,8 @@ using MediaBrowser.Model.MediaInfo;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.TextEncoding;
 
 namespace MediaBrowser.MediaEncoding.BdInfo
 {
@@ -12,6 +14,15 @@ namespace MediaBrowser.MediaEncoding.BdInfo
     /// </summary>
     public class BdInfoExaminer : IBlurayExaminer
     {
+        private readonly IFileSystem _fileSystem;
+        private readonly IEncoding _textEncoding;
+
+        public BdInfoExaminer(IFileSystem fileSystem, IEncoding textEncoding)
+        {
+            _fileSystem = fileSystem;
+            _textEncoding = textEncoding;
+        }
+
         /// <summary>
         /// Gets the disc info.
         /// </summary>
@@ -19,7 +30,7 @@ namespace MediaBrowser.MediaEncoding.BdInfo
         /// <returns>BlurayDiscInfo.</returns>
         public BlurayDiscInfo GetDiscInfo(string path)
         {
-            var bdrom = new BDROM(path);
+            var bdrom = new BDROM(path, _fileSystem, _textEncoding);
 
             bdrom.Scan();
 

MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs

@@ -50,7 +50,7 @@ namespace MediaBrowser.MediaEncoding.Configuration
                 // Validate
                 if (!_fileSystem.DirectoryExists(newPath))
                 {
-                    throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newPath));
+                    throw new FileNotFoundException(string.Format("{0} does not exist.", newPath));
                 }
             }
         }

MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs

@@ -217,7 +217,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
                 try
                 {
-                    job.TaskCompletionSource.TrySetException(new ApplicationException("Encoding failed"));
+                    job.TaskCompletionSource.TrySetException(new Exception("Encoding failed"));
                 }
                 catch
                 {

MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -219,7 +219,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                     throw new ArgumentNullException("path");
                 }
 
-                if (!File.Exists(path) && !Directory.Exists(path))
+                if (!FileSystem.FileExists(path) && !FileSystem.DirectoryExists(path))
                 {
                     throw new ResourceNotFoundException();
                 }
@@ -288,12 +288,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             if (!string.IsNullOrWhiteSpace(appPath))
             {
-                if (Directory.Exists(appPath))
+                if (FileSystem.DirectoryExists(appPath))
                 {
                     return GetPathsFromDirectory(appPath);
                 }
 
-                if (File.Exists(appPath))
+                if (FileSystem.FileExists(appPath))
                 {
                     return new Tuple<string, string>(appPath, GetProbePathFromEncoderPath(appPath));
                 }
@@ -329,16 +329,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             // Since we can't predict the file extension, first try directly within the folder 
             // If that doesn't pan out, then do a recursive search
-            var files = Directory.GetFiles(path);
+            var files = FileSystem.GetFilePaths(path);
 
             var excludeExtensions = new[] { ".c" };
 
             var ffmpegPath = files.FirstOrDefault(i => string.Equals(Path.GetFileNameWithoutExtension(i), "ffmpeg", StringComparison.OrdinalIgnoreCase) && !excludeExtensions.Contains(Path.GetExtension(i) ?? string.Empty));
             var ffprobePath = files.FirstOrDefault(i => string.Equals(Path.GetFileNameWithoutExtension(i), "ffprobe", StringComparison.OrdinalIgnoreCase) && !excludeExtensions.Contains(Path.GetExtension(i) ?? string.Empty));
 
-            if (string.IsNullOrWhiteSpace(ffmpegPath) || !File.Exists(ffmpegPath))
+            if (string.IsNullOrWhiteSpace(ffmpegPath) || !FileSystem.FileExists(ffmpegPath))
             {
-                files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
+                files = FileSystem.GetFilePaths(path, true);
 
                 ffmpegPath = files.FirstOrDefault(i => string.Equals(Path.GetFileNameWithoutExtension(i), "ffmpeg", StringComparison.OrdinalIgnoreCase) && !excludeExtensions.Contains(Path.GetExtension(i) ?? string.Empty));
 
@@ -353,7 +353,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private string GetProbePathFromEncoderPath(string appPath)
         {
-            return Directory.GetFiles(Path.GetDirectoryName(appPath))
+            return FileSystem.GetFilePaths(Path.GetDirectoryName(appPath))
                 .FirstOrDefault(i => string.Equals(Path.GetFileNameWithoutExtension(i), "ffprobe", StringComparison.OrdinalIgnoreCase));
         }
 
@@ -496,7 +496,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// <param name="videoType">Type of the video.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{MediaInfoResult}.</returns>
-        /// <exception cref="System.ApplicationException">ffprobe failed - streams and format are both null.</exception>
         private async Task<MediaInfo> GetMediaInfoInternal(string inputPath,
             string primaryPath,
             MediaProtocol protocol,
@@ -559,7 +558,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                     if (result.streams == null && result.format == null)
                     {
-                        throw new ApplicationException("ffprobe failed - streams and format are both null.");
+                        throw new Exception("ffprobe failed - streams and format are both null.");
                     }
 
                     if (result.streams != null)
@@ -865,7 +864,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
 
             var tempExtractPath = Path.Combine(ConfigurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".jpg");
-            Directory.CreateDirectory(Path.GetDirectoryName(tempExtractPath));
+            FileSystem.CreateDirectory(Path.GetDirectoryName(tempExtractPath));
 
             // apply some filters to thumbnail extracted below (below) crop any black lines that we made and get the correct ar then scale to width 600. 
             // This filter chain may have adverse effects on recorded tv thumbnails if ar changes during presentation ex. commercials @ diff ar
@@ -962,7 +961,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
 
                 var exitCode = ranToCompletion ? processWrapper.ExitCode ?? 0 : -1;
-                var file = new FileInfo(tempExtractPath);
+                var file = FileSystem.GetFileInfo(tempExtractPath);
 
                 if (exitCode == -1 || !file.Exists || file.Length == 0)
                 {
@@ -970,7 +969,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                     _logger.Error(msg);
 
-                    throw new ApplicationException(msg);
+                    throw new Exception(msg);
                 }
 
                 return tempExtractPath;
@@ -1066,7 +1065,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                         cancellationToken.ThrowIfCancellationRequested();
 
-                        var jpegCount = Directory.GetFiles(targetDirectory)
+                        var jpegCount = FileSystem.GetFilePaths(targetDirectory)
                             .Count(i => string.Equals(Path.GetExtension(i), ".jpg", StringComparison.OrdinalIgnoreCase));
 
                         isResponsive = (jpegCount > lastCount);
@@ -1091,7 +1090,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                     _logger.Error(msg);
 
-                    throw new ApplicationException(msg);
+                    throw new Exception(msg);
                 }
             }
         }

MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj

@@ -105,9 +105,6 @@
       <Name>OpenSubtitlesHandler</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Probing\whitelist.txt" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs

@@ -973,27 +973,10 @@ namespace MediaBrowser.MediaEncoding.Probing
         {
             if (_splitWhiteList == null)
             {
-                var file = GetType().Namespace + ".whitelist.txt";
+                _splitWhiteList = new List<string>
-
-                using (var stream = GetType().Assembly.GetManifestResourceStream(file))
-                {
-                    using (var reader = new StreamReader(stream))
-                    {
-                        var list = new List<string>();
-
-                        while (!reader.EndOfStream)
                         {
-                            var val = reader.ReadLine();
+                            "AC/DV"
-
+                        };
-                            if (!string.IsNullOrWhiteSpace(val))
-                            {
-                                list.Add(val);
-                            }
-                        }
-
-                        _splitWhiteList = list;
-                    }
-                }
             }
 
             return _splitWhiteList;

MediaBrowser.MediaEncoding/Probing/whitelist.txt

@@ -1 +0,0 @@
-AC/DC

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -135,6 +135,7 @@
     <Compile Include="Dto\MetadataEditorInfo.cs" />
     <Compile Include="Dto\NameIdPair.cs" />
     <Compile Include="Dto\NameValuePair.cs" />
+    <Compile Include="TextEncoding\IEncoding.cs" />
     <Compile Include="Extensions\LinqExtensions.cs" />
     <Compile Include="FileOrganization\SmartMatchInfo.cs" />
     <Compile Include="Health\IHealthMonitor.cs" />

MediaBrowser.Model/TextEncoding/IEncoding.cs

@@ -0,0 +1,9 @@
+
+namespace MediaBrowser.Model.TextEncoding
+{
+    public interface IEncoding
+    {
+        byte[] GetASCIIBytes(string text);
+        string GetASCIIString(byte[] bytes, int startIndex, int length);
+    }
+}

MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj

@@ -294,6 +294,7 @@
     <Compile Include="Sync\SyncHelper.cs" />
     <Compile Include="Sync\SyncJobOptions.cs" />
     <Compile Include="Sync\SyncNotificationEntryPoint.cs" />
+    <Compile Include="TextEncoding\TextEncoding.cs" />
     <Compile Include="Threading\PeriodicTimer.cs" />
     <Compile Include="TV\SeriesPostScanTask.cs" />
     <Compile Include="Updates\InstallationManager.cs" />

MediaBrowser.Server.Implementations/TextEncoding/TextEncoding.cs

@@ -0,0 +1,18 @@
+using System.Text;
+using MediaBrowser.Model.TextEncoding;
+
+namespace MediaBrowser.Server.Implementations.TextEncoding
+{
+    public  class TextEncoding : IEncoding
+    {
+        public byte[] GetASCIIBytes(string text)
+        {
+            return Encoding.ASCII.GetBytes(text);
+        }
+
+        public string GetASCIIString(byte[] bytes, int startIndex, int length)
+        {
+            return Encoding.ASCII.GetString(bytes, 0, bytes.Length);
+        }
+    }
+}

MediaBrowser.Server.Startup.Common/ApplicationHost.cs

@@ -117,10 +117,12 @@ using MediaBrowser.Model.Reflection;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Social;
+using MediaBrowser.Model.TextEncoding;
 using MediaBrowser.Model.Xml;
 using MediaBrowser.Server.Implementations.Archiving;
 using MediaBrowser.Server.Implementations.Reflection;
 using MediaBrowser.Server.Implementations.Serialization;
+using MediaBrowser.Server.Implementations.TextEncoding;
 using MediaBrowser.Server.Implementations.Updates;
 using MediaBrowser.Server.Implementations.Xml;
 using OpenSubtitlesHandler;
@@ -692,7 +694,10 @@ namespace MediaBrowser.Server.Startup.Common
             StringExtensions.LocalizationManager = LocalizationManager;
             RegisterSingleInstance(LocalizationManager);
 
-            RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer());
+            IEncoding textEncoding = new TextEncoding();
+            RegisterSingleInstance(textEncoding);
+            Utilities.EncodingHelper = textEncoding;
+            RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer(FileSystemManager, textEncoding));
 
             RegisterSingleInstance<IXmlReaderSettingsFactory>(new XmlReaderSettingsFactory());
             RegisterSingleInstance<IAssemblyInfo>(new AssemblyInfo());

Mono.Nat/project.fragment.lock.json

@@ -5,23 +5,30 @@
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Release/MediaBrowser.Common.dll": {}
+        "bin/Debug/MediaBrowser.Common.dll": {}
       },
       "runtime": {
-        "bin/Release/MediaBrowser.Common.dll": {}
+        "bin/Debug/MediaBrowser.Common.dll": {}
+      },
+      "contentFiles": {
+        "bin/Debug/MediaBrowser.Common.pdb": {
+          "buildAction": "None",
+          "codeLanguage": "any",
+          "copyToOutput": true
+        }
       }
     },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Release/MediaBrowser.Model.dll": {}
+        "bin/Debug/MediaBrowser.Model.dll": {}
       },
       "runtime": {
-        "bin/Release/MediaBrowser.Model.dll": {}
+        "bin/Debug/MediaBrowser.Model.dll": {}
       },
       "contentFiles": {
-        "bin/Release/MediaBrowser.Model.pdb": {
+        "bin/Debug/MediaBrowser.Model.pdb": {
           "buildAction": "None",
           "codeLanguage": "any",
           "copyToOutput": true

OpenSubtitlesHandler/OpenSubtitlesHandler.nuget.targets

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
+    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
+  </Target>
+</Project>

OpenSubtitlesHandler/project.json

@@ -1,7 +1,17 @@
 {
-  "supports": {},
+    "frameworks":{
-  "dependencies": {},
+        "netstandard1.6":{
-  "frameworks": {
+           "dependencies":{
-    ".NETPortable,Version=v4.5,Profile=Profile7": {}
+                "NETStandard.Library":"1.6.0",
-  }
+            }
+        },
+        ".NETPortable,Version=v4.5,Profile=Profile7":{
+            "buildOptions": {
+                "define": [  ]
+            },
+            "frameworkAssemblies":{
+                
+            }
+        }
+    }
 }

src/Emby.Server/Emby.Server.xproj

@@ -20,6 +20,7 @@
     <ProjectReference Include="..\..\DvdLib\DvdLib.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Providers\MediaBrowser.Providers.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj" />

src/Emby.Server/project.fragment.lock.json

@@ -3,7 +3,7 @@
   "exports": {
     "BDInfo/1.0.0": {
       "type": "project",
-      "framework": ".NETFramework,Version=v4.6",
+      "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
         "bin/Debug/BDInfo.dll": {}
       },
@@ -69,6 +69,23 @@
         }
       }
     },
+    "MediaBrowser.LocalMetadata/1.0.0": {
+      "type": "project",
+      "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
+      "compile": {
+        "bin/Debug/MediaBrowser.LocalMetadata.dll": {}
+      },
+      "runtime": {
+        "bin/Debug/MediaBrowser.LocalMetadata.dll": {}
+      },
+      "contentFiles": {
+        "bin/Debug/MediaBrowser.LocalMetadata.pdb": {
+          "buildAction": "None",
+          "codeLanguage": "any",
+          "copyToOutput": true
+        }
+      }
+    },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
@@ -7034,7 +7051,7 @@
     },
     "OpenSubtitlesHandler/1.0.0": {
       "type": "project",
-      "framework": ".NETFramework,Version=v4.6",
+      "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
         "bin/Debug/OpenSubtitlesHandler.dll": {}
       },

src/Emby.Server/project.json

@@ -6,10 +6,13 @@
 
   "dependencies": {
     "Emby.Common.Implementations": "1.0.0-*",
+    "Emby.Dlna": "1.0.0-*",
     "Microsoft.NETCore.App": {
       "type": "platform",
       "version": "1.0.1"
-    }
+    },
+    "Mono.Nat": "1.0.0-*",
+    "RSSDP": "1.0.0-*"
   },
 
   "frameworks": {
@@ -28,6 +31,9 @@
         "MediaBrowser.Controller": {
           "target": "project"
         },
+        "MediaBrowser.LocalMetadata": {
+          "target": "project"
+        },
         "MediaBrowser.Model": {
           "target": "project"
         },

src/Emby.Server/project.lock.json

@@ -116,7 +116,7 @@
           "ref/netstandard1.0/Microsoft.CSharp.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/Microsoft.CSharp.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "Microsoft.Extensions.PlatformAbstractions/1.0.0": {
@@ -136,66 +136,6 @@
           "lib/netstandard1.3/Microsoft.Extensions.PlatformAbstractions.dll": {}
         }
       },
-      "Microsoft.NETCore/5.0.0": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.CSharp": "4.0.0",
-          "Microsoft.NETCore.Targets": "1.0.0",
-          "Microsoft.VisualBasic": "10.0.0",
-          "System.AppContext": "4.0.0",
-          "System.Collections": "4.0.10",
-          "System.Collections.Concurrent": "4.0.10",
-          "System.Collections.Immutable": "1.1.37",
-          "System.ComponentModel": "4.0.0",
-          "System.ComponentModel.Annotations": "4.0.10",
-          "System.Diagnostics.Debug": "4.0.10",
-          "System.Diagnostics.Tools": "4.0.0",
-          "System.Diagnostics.Tracing": "4.0.20",
-          "System.Dynamic.Runtime": "4.0.10",
-          "System.Globalization": "4.0.10",
-          "System.Globalization.Calendars": "4.0.0",
-          "System.Globalization.Extensions": "4.0.0",
-          "System.IO": "4.0.10",
-          "System.IO.Compression": "4.0.0",
-          "System.IO.Compression.ZipFile": "4.0.0",
-          "System.IO.FileSystem": "4.0.0",
-          "System.IO.FileSystem.Primitives": "4.0.0",
-          "System.IO.UnmanagedMemoryStream": "4.0.0",
-          "System.Linq": "4.0.0",
-          "System.Linq.Expressions": "4.0.10",
-          "System.Linq.Parallel": "4.0.0",
-          "System.Linq.Queryable": "4.0.0",
-          "System.Net.Http": "4.0.0",
-          "System.Net.NetworkInformation": "4.0.0",
-          "System.Net.Primitives": "4.0.10",
-          "System.Numerics.Vectors": "4.1.0",
-          "System.ObjectModel": "4.0.10",
-          "System.Reflection": "4.0.10",
-          "System.Reflection.DispatchProxy": "4.0.0",
-          "System.Reflection.Extensions": "4.0.0",
-          "System.Reflection.Metadata": "1.0.22",
-          "System.Reflection.Primitives": "4.0.0",
-          "System.Reflection.TypeExtensions": "4.0.0",
-          "System.Resources.ResourceManager": "4.0.0",
-          "System.Runtime": "4.0.20",
-          "System.Runtime.Extensions": "4.0.10",
-          "System.Runtime.Handles": "4.0.0",
-          "System.Runtime.InteropServices": "4.0.20",
-          "System.Runtime.Numerics": "4.0.0",
-          "System.Security.Claims": "4.0.0",
-          "System.Security.Principal": "4.0.0",
-          "System.Text.Encoding": "4.0.10",
-          "System.Text.Encoding.Extensions": "4.0.10",
-          "System.Text.RegularExpressions": "4.0.10",
-          "System.Threading": "4.0.10",
-          "System.Threading.Tasks": "4.0.10",
-          "System.Threading.Tasks.Dataflow": "4.5.25",
-          "System.Threading.Tasks.Parallel": "4.0.0",
-          "System.Threading.Timer": "4.0.0",
-          "System.Xml.ReaderWriter": "4.0.10",
-          "System.Xml.XDocument": "4.0.10"
-        }
-      },
       "Microsoft.NETCore.App/1.0.1": {
         "type": "package",
         "dependencies": {
@@ -275,41 +215,6 @@
           "lib/netstandard1.0/_._": {}
         }
       },
-      "Microsoft.NETCore.Portable.Compatibility/1.0.1": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2"
-        },
-        "compile": {
-          "ref/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {},
-          "ref/netstandard1.0/System.Core.dll": {},
-          "ref/netstandard1.0/System.Net.dll": {},
-          "ref/netstandard1.0/System.Numerics.dll": {},
-          "ref/netstandard1.0/System.Runtime.Serialization.dll": {},
-          "ref/netstandard1.0/System.ServiceModel.Web.dll": {},
-          "ref/netstandard1.0/System.ServiceModel.dll": {},
-          "ref/netstandard1.0/System.Windows.dll": {},
-          "ref/netstandard1.0/System.Xml.Linq.dll": {},
-          "ref/netstandard1.0/System.Xml.Serialization.dll": {},
-          "ref/netstandard1.0/System.Xml.dll": {},
-          "ref/netstandard1.0/System.dll": {},
-          "ref/netstandard1.0/mscorlib.dll": {}
-        },
-        "runtime": {
-          "lib/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {},
-          "lib/netstandard1.0/System.Core.dll": {},
-          "lib/netstandard1.0/System.Net.dll": {},
-          "lib/netstandard1.0/System.Numerics.dll": {},
-          "lib/netstandard1.0/System.Runtime.Serialization.dll": {},
-          "lib/netstandard1.0/System.ServiceModel.Web.dll": {},
-          "lib/netstandard1.0/System.ServiceModel.dll": {},
-          "lib/netstandard1.0/System.Windows.dll": {},
-          "lib/netstandard1.0/System.Xml.Linq.dll": {},
-          "lib/netstandard1.0/System.Xml.Serialization.dll": {},
-          "lib/netstandard1.0/System.Xml.dll": {},
-          "lib/netstandard1.0/System.dll": {}
-        }
-      },
       "Microsoft.NETCore.Runtime.CoreCLR/1.0.4": {
         "type": "package",
         "dependencies": {
@@ -353,7 +258,7 @@
           "ref/netstandard1.1/Microsoft.VisualBasic.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/Microsoft.VisualBasic.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "Microsoft.Win32.Primitives/4.0.1": {
@@ -698,7 +603,7 @@
           "ref/netstandard1.4/System.ComponentModel.Annotations.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.4/System.ComponentModel.Annotations.dll": {}
+          "lib/netstandard1.4/_._": {}
         }
       },
       "System.ComponentModel.Primitives/4.1.0": {
@@ -959,7 +864,7 @@
           "ref/netstandard1.3/System.Dynamic.Runtime.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/System.Dynamic.Runtime.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "System.Globalization/4.0.11": {
@@ -1182,7 +1087,7 @@
           "ref/netstandard1.3/System.IO.UnmanagedMemoryStream.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/System.IO.UnmanagedMemoryStream.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "System.Linq/4.1.0": {
@@ -1247,7 +1152,7 @@
           "ref/netstandard1.1/System.Linq.Parallel.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/System.Linq.Parallel.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "System.Linq.Queryable/4.0.1": {
@@ -1266,7 +1171,7 @@
           "ref/netstandard1.0/System.Linq.Queryable.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/System.Linq.Queryable.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "System.Net.Http/4.1.0": {
@@ -1516,7 +1421,7 @@
           "ref/netstandard1.0/System.Numerics.Vectors.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.0/System.Numerics.Vectors.dll": {}
+          "lib/netstandard1.0/_._": {}
         }
       },
       "System.ObjectModel/4.0.12": {
@@ -1566,7 +1471,7 @@
           "ref/netstandard1.3/System.Reflection.DispatchProxy.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/System.Reflection.DispatchProxy.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "System.Reflection.Emit/4.0.1": {
@@ -1830,7 +1735,7 @@
           "System.Security.Principal": "4.0.1"
         },
         "compile": {
-          "ref/netstandard1.3/System.Security.Claims.dll": {}
+          "ref/netstandard1.3/_._": {}
         },
         "runtime": {
           "lib/netstandard1.3/System.Security.Claims.dll": {}
@@ -2223,7 +2128,7 @@
           "lib/netstandard1.1/System.Threading.Tasks.Dataflow.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.1/System.Threading.Tasks.Dataflow.dll": {}
+          "lib/netstandard1.1/_._": {}
         }
       },
       "System.Threading.Tasks.Extensions/4.0.0": {
@@ -2256,7 +2161,7 @@
           "ref/netstandard1.1/System.Threading.Tasks.Parallel.dll": {}
         },
         "runtime": {
-          "lib/netstandard1.3/System.Threading.Tasks.Parallel.dll": {}
+          "lib/netstandard1.3/_._": {}
         }
       },
       "System.Threading.Thread/4.0.0": {
@@ -2435,10 +2340,10 @@
       },
       "BDInfo/1.0.0": {
         "type": "project",
-        "framework": ".NETPlatform,Version=v5.0",
+        "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
-          "Microsoft.NETCore": "5.0.0",
+          "MediaBrowser.Model": "1.0.0",
-          "Microsoft.NETCore.Portable.Compatibility": "1.0.0"
+          "NETStandard.Library": "1.6.0"
         }
       },
       "DvdLib/1.0.0": {
@@ -2477,6 +2382,29 @@
           "netstandard1.6/Emby.Common.Implementations.dll": {}
         }
       },
+      "Emby.Dlna/1.0.0": {
+        "type": "project",
+        "framework": ".NETStandard,Version=v1.6",
+        "dependencies": {
+          "MediaBrowser.Common": "1.0.0",
+          "MediaBrowser.Controller": "1.0.0",
+          "MediaBrowser.Model": "1.0.0",
+          "NETStandard.Library": "1.6.0",
+          "RSSDP": "1.0.0",
+          "System.Reflection": "4.1.0",
+          "System.Reflection.Primitives": "4.0.1",
+          "System.Runtime.Loader": "4.0.0",
+          "System.Xml.XDocument": "4.0.11",
+          "System.Xml.XmlDocument": "4.0.1",
+          "System.Xml.XmlSerializer": "4.0.11"
+        },
+        "compile": {
+          "netstandard1.6/Emby.Dlna.dll": {}
+        },
+        "runtime": {
+          "netstandard1.6/Emby.Dlna.dll": {}
+        }
+      },
       "MediaBrowser.Common/1.0.0": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
@@ -2494,6 +2422,16 @@
           "NETStandard.Library": "1.6.0"
         }
       },
+      "MediaBrowser.LocalMetadata/1.0.0": {
+        "type": "project",
+        "framework": ".NETStandard,Version=v1.6",
+        "dependencies": {
+          "MediaBrowser.Common": "1.0.0",
+          "MediaBrowser.Controller": "1.0.0",
+          "MediaBrowser.Model": "1.0.0",
+          "NETStandard.Library": "1.6.0"
+        }
+      },
       "MediaBrowser.Model/1.0.0": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
@@ -2532,14 +2470,60 @@
           "NETStandard.Library": "1.6.0"
         }
       },
-      "OpenSubtitlesHandler/1.0.0": {
+      "Mono.Nat/1.0.0": {
         "type": "project",
-        "framework": ".NETPlatform,Version=v5.0",
+        "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
           "MediaBrowser.Common": "1.0.0",
           "MediaBrowser.Model": "1.0.0",
-          "Microsoft.NETCore": "5.0.0",
+          "NETStandard.Library": "1.6.0",
-          "Microsoft.NETCore.Portable.Compatibility": "1.0.1"
+          "System.Net.NetworkInformation": "4.1.0"
+        },
+        "compile": {
+          "netstandard1.6/Mono.Nat.dll": {}
+        },
+        "runtime": {
+          "netstandard1.6/Mono.Nat.dll": {}
+        }
+      },
+      "OpenSubtitlesHandler/1.0.0": {
+        "type": "project",
+        "framework": ".NETStandard,Version=v1.6",
+        "dependencies": {
+          "MediaBrowser.Common": "1.0.0",
+          "MediaBrowser.Model": "1.0.0",
+          "NETStandard.Library": "1.6.0"
+        }
+      },
+      "RSSDP/1.0.0": {
+        "type": "project",
+        "framework": ".NETStandard,Version=v1.6",
+        "dependencies": {
+          "NETStandard.Library": "1.6.0",
+          "System.Collections": "4.0.11",
+          "System.Diagnostics.Debug": "4.0.11",
+          "System.Diagnostics.Tools": "4.0.1",
+          "System.IO": "4.1.0",
+          "System.Linq": "4.1.0",
+          "System.Net.Http": "4.1.0",
+          "System.Net.Primitives": "4.0.11",
+          "System.Net.Sockets": "4.1.0",
+          "System.Resources.ResourceManager": "4.0.1",
+          "System.Runtime": "4.1.0",
+          "System.Runtime.Extensions": "4.1.0",
+          "System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
+          "System.Text.Encoding": "4.0.11",
+          "System.Text.Encoding.Extensions": "4.0.11",
+          "System.Threading": "4.0.11",
+          "System.Threading.Tasks": "4.0.11",
+          "System.Threading.Timer": "4.0.1",
+          "System.Xml.ReaderWriter": "4.0.11"
+        },
+        "compile": {
+          "netstandard1.6/RSSDP.dll": {}
+        },
+        "runtime": {
+          "netstandard1.6/RSSDP.dll": {}
         }
       }
     }
@@ -2697,16 +2681,6 @@
         "lib/netstandard1.3/Microsoft.Extensions.PlatformAbstractions.xml"
       ]
     },
-    "Microsoft.NETCore/5.0.0": {
-      "sha512": "QQMp0yYQbIdfkKhdEE6Umh2Xonau7tasG36Trw/YlHoWgYQLp7T9L+ZD8EPvdj5ubRhtOuKEKwM7HMpkagB9ZA==",
-      "type": "package",
-      "path": "Microsoft.NETCore/5.0.0",
-      "files": [
-        "Microsoft.NETCore.5.0.0.nupkg.sha512",
-        "Microsoft.NETCore.nuspec",
-        "_._"
-      ]
-    },
     "Microsoft.NETCore.App/1.0.1": {
       "sha512": "RGtG5CcDtBryJbYa6dgkzx63tTypr4+cJYwkm4dws33m7UjL5JuR9UMsfnbwnMiytyHVFCtgwH5ElPD/BKkhXA==",
       "type": "package",
@@ -2780,88 +2754,6 @@
         "runtime.json"
       ]
     },
-    "Microsoft.NETCore.Portable.Compatibility/1.0.1": {
-      "sha512": "Vd+lvLcGwvkedxtKn0U8s9uR4p0Lm+0U2QvDsLaw7g4S1W4KfPDbaW+ROhhLCSOx/gMYC72/b+z+o4fqS/oxVg==",
-      "type": "package",
-      "path": "Microsoft.NETCore.Portable.Compatibility/1.0.1",
-      "files": [
-        "Microsoft.NETCore.Portable.Compatibility.1.0.1.nupkg.sha512",
-        "Microsoft.NETCore.Portable.Compatibility.nuspec",
-        "ThirdPartyNotices.txt",
-        "dotnet_library_license.txt",
-        "lib/net45/_._",
-        "lib/netcore50/System.ComponentModel.DataAnnotations.dll",
-        "lib/netcore50/System.Core.dll",
-        "lib/netcore50/System.Net.dll",
-        "lib/netcore50/System.Numerics.dll",
-        "lib/netcore50/System.Runtime.Serialization.dll",
-        "lib/netcore50/System.ServiceModel.Web.dll",
-        "lib/netcore50/System.ServiceModel.dll",
-        "lib/netcore50/System.Windows.dll",
-        "lib/netcore50/System.Xml.Linq.dll",
-        "lib/netcore50/System.Xml.Serialization.dll",
-        "lib/netcore50/System.Xml.dll",
-        "lib/netcore50/System.dll",
-        "lib/netstandard1.0/System.ComponentModel.DataAnnotations.dll",
-        "lib/netstandard1.0/System.Core.dll",
-        "lib/netstandard1.0/System.Net.dll",
-        "lib/netstandard1.0/System.Numerics.dll",
-        "lib/netstandard1.0/System.Runtime.Serialization.dll",
-        "lib/netstandard1.0/System.ServiceModel.Web.dll",
-        "lib/netstandard1.0/System.ServiceModel.dll",
-        "lib/netstandard1.0/System.Windows.dll",
-        "lib/netstandard1.0/System.Xml.Linq.dll",
-        "lib/netstandard1.0/System.Xml.Serialization.dll",
-        "lib/netstandard1.0/System.Xml.dll",
-        "lib/netstandard1.0/System.dll",
-        "lib/win8/_._",
-        "lib/wp80/_._",
-        "lib/wpa81/_._",
-        "ref/net45/_._",
-        "ref/netcore50/System.ComponentModel.DataAnnotations.dll",
-        "ref/netcore50/System.Core.dll",
-        "ref/netcore50/System.Net.dll",
-        "ref/netcore50/System.Numerics.dll",
-        "ref/netcore50/System.Runtime.Serialization.dll",
-        "ref/netcore50/System.ServiceModel.Web.dll",
-        "ref/netcore50/System.ServiceModel.dll",
-        "ref/netcore50/System.Windows.dll",
-        "ref/netcore50/System.Xml.Linq.dll",
-        "ref/netcore50/System.Xml.Serialization.dll",
-        "ref/netcore50/System.Xml.dll",
-        "ref/netcore50/System.dll",
-        "ref/netcore50/mscorlib.dll",
-        "ref/netstandard1.0/System.ComponentModel.DataAnnotations.dll",
-        "ref/netstandard1.0/System.Core.dll",
-        "ref/netstandard1.0/System.Net.dll",
-        "ref/netstandard1.0/System.Numerics.dll",
-        "ref/netstandard1.0/System.Runtime.Serialization.dll",
-        "ref/netstandard1.0/System.ServiceModel.Web.dll",
-        "ref/netstandard1.0/System.ServiceModel.dll",
-        "ref/netstandard1.0/System.Windows.dll",
-        "ref/netstandard1.0/System.Xml.Linq.dll",
-        "ref/netstandard1.0/System.Xml.Serialization.dll",
-        "ref/netstandard1.0/System.Xml.dll",
-        "ref/netstandard1.0/System.dll",
-        "ref/netstandard1.0/mscorlib.dll",
-        "ref/win8/_._",
-        "ref/wp80/_._",
-        "ref/wpa81/_._",
-        "runtimes/aot/lib/netcore50/System.ComponentModel.DataAnnotations.dll",
-        "runtimes/aot/lib/netcore50/System.Core.dll",
-        "runtimes/aot/lib/netcore50/System.Net.dll",
-        "runtimes/aot/lib/netcore50/System.Numerics.dll",
-        "runtimes/aot/lib/netcore50/System.Runtime.Serialization.dll",
-        "runtimes/aot/lib/netcore50/System.ServiceModel.Web.dll",
-        "runtimes/aot/lib/netcore50/System.ServiceModel.dll",
-        "runtimes/aot/lib/netcore50/System.Windows.dll",
-        "runtimes/aot/lib/netcore50/System.Xml.Linq.dll",
-        "runtimes/aot/lib/netcore50/System.Xml.Serialization.dll",
-        "runtimes/aot/lib/netcore50/System.Xml.dll",
-        "runtimes/aot/lib/netcore50/System.dll",
-        "runtimes/aot/lib/netcore50/mscorlib.dll"
-      ]
-    },
     "Microsoft.NETCore.Runtime.CoreCLR/1.0.4": {
       "sha512": "KSyygLUH9AbiXs+NHaQdouxX0TXby30Pxh95/M2PyPdDENmgpNpvSA7MEgOmSWqAV0f1RUaoWtFhMd1KA5Xr+w==",
       "type": "package",
@@ -7823,6 +7715,11 @@
       "path": "../../Emby.Common.Implementations/project.json",
       "msbuildProject": "../../Emby.Common.Implementations/Emby.Common.Implementations.xproj"
     },
+    "Emby.Dlna/1.0.0": {
+      "type": "project",
+      "path": "../../Emby.Dlna/project.json",
+      "msbuildProject": "../../Emby.Dlna/Emby.Dlna.xproj"
+    },
     "MediaBrowser.Common/1.0.0": {
       "type": "project",
       "path": "../../MediaBrowser.Common/project.json",
@@ -7833,6 +7730,11 @@
       "path": "../../MediaBrowser.Controller/project.json",
       "msbuildProject": "../../MediaBrowser.Controller/MediaBrowser.Controller.csproj"
     },
+    "MediaBrowser.LocalMetadata/1.0.0": {
+      "type": "project",
+      "path": "../../MediaBrowser.LocalMetadata/project.json",
+      "msbuildProject": "../../MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj"
+    },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "path": "../../MediaBrowser.Model/project.json",
@@ -7853,22 +7755,36 @@
       "path": "../../MediaBrowser.XbmcMetadata/project.json",
       "msbuildProject": "../../MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj"
     },
+    "Mono.Nat/1.0.0": {
+      "type": "project",
+      "path": "../../Mono.Nat/project.json",
+      "msbuildProject": "../../Mono.Nat/Mono.Nat.xproj"
+    },
     "OpenSubtitlesHandler/1.0.0": {
       "type": "project",
       "path": "../../OpenSubtitlesHandler/project.json",
       "msbuildProject": "../../OpenSubtitlesHandler/OpenSubtitlesHandler.csproj"
+    },
+    "RSSDP/1.0.0": {
+      "type": "project",
+      "path": "../../RSSDP/project.json",
+      "msbuildProject": "../../RSSDP/RSSDP.xproj"
     }
   },
   "projectFileDependencyGroups": {
     "": [
       "Emby.Common.Implementations >= 1.0.0-*",
-      "Microsoft.NETCore.App >= 1.0.1"
+      "Emby.Dlna >= 1.0.0-*",
+      "Microsoft.NETCore.App >= 1.0.1",
+      "Mono.Nat >= 1.0.0-*",
+      "RSSDP >= 1.0.0-*"
     ],
     ".NETCoreApp,Version=v1.0": [
       "BDInfo",
       "DvdLib",
       "MediaBrowser.Common",
       "MediaBrowser.Controller",
+      "MediaBrowser.LocalMetadata",
       "MediaBrowser.Model",
       "MediaBrowser.Providers",
       "MediaBrowser.WebDashboard",