diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index e4e380f0e6..dba48c78b8 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -61,9 +61,6 @@ ..\packages\Microsoft.IO.RecyclableMemoryStream.1.1.0.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll True - - ..\ThirdParty\emby\Mono.Nat.dll - ..\packages\Patterns.Logging.1.0.0.5\lib\netstandard1.0\Patterns.Logging.dll True @@ -284,6 +281,10 @@ {442b5058-dcaf-4263-bb6a-f21e31120a1b} MediaBrowser.Providers + + {e9db21d4-05e8-4883-b161-c55071166579} + Mono.Nat + diff --git a/MediaBrowser.sln b/MediaBrowser.sln index c288a8b010..daa5d417cd 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -62,13 +62,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DvdLib", "DvdLib\DvdLib.csp EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Emby.Common.Implementations", "Emby.Common.Implementations\Emby.Common.Implementations.xproj", "{5A27010A-09C6-4E86-93EA-437484C10917}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mono.Nat", "Mono.Nat\Mono.Nat.xproj", "{0A82260B-4C22-4FD2-869A-E510044E3502}" - ProjectSection(ProjectDependencies) = postProject - {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B} = {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B} - {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2} = {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2} - {9142EEFA-7570-41E1-BFCC-468BB571AF2F} = {9142EEFA-7570-41E1-BFCC-468BB571AF2F} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BDInfo", "BDInfo\BDInfo.csproj", "{88AE38DF-19D7-406F-A6A9-09527719A21E}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RSSDP", "RSSDP\RSSDP.xproj", "{C227ADB7-E256-4E70-A8B9-22B9E0CF4F55}" @@ -77,6 +70,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Server.Implementations EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Emby.Dlna", "Emby.Dlna\Emby.Dlna.xproj", "{F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Nat", "Mono.Nat\Mono.Nat.csproj", "{E9DB21D4-05E8-4883-B161-C55071166579}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -541,36 +536,6 @@ Global {5A27010A-09C6-4E86-93EA-437484C10917}.Release|x64.Build.0 = Release|Any CPU {5A27010A-09C6-4E86-93EA-437484C10917}.Release|x86.ActiveCfg = Release|Any CPU {5A27010A-09C6-4E86-93EA-437484C10917}.Release|x86.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|Win32.ActiveCfg = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|Win32.Build.0 = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|x64.Build.0 = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|x86.ActiveCfg = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Debug|x86.Build.0 = Debug|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|Any CPU.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|Mixed Platforms.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|Mixed Platforms.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|Win32.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|Win32.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|x64.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|x64.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|x86.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release Mono|x86.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Any CPU.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Win32.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|Win32.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|x64.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|x64.Build.0 = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|x86.ActiveCfg = Release|Any CPU - {0A82260B-4C22-4FD2-869A-E510044E3502}.Release|x86.Build.0 = Release|Any CPU {88AE38DF-19D7-406F-A6A9-09527719A21E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {88AE38DF-19D7-406F-A6A9-09527719A21E}.Debug|Any CPU.Build.0 = Debug|Any CPU {88AE38DF-19D7-406F-A6A9-09527719A21E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -691,6 +656,36 @@ Global {F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Release|x64.Build.0 = Release|Any CPU {F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Release|x86.ActiveCfg = Release|Any CPU {F40E364D-01D9-4BBF-B82C-5D6C55E0A1F5}.Release|x86.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|Win32.ActiveCfg = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|Win32.Build.0 = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|x64.ActiveCfg = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|x64.Build.0 = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|x86.ActiveCfg = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Debug|x86.Build.0 = Debug|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|Any CPU.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|Mixed Platforms.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|Mixed Platforms.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|Win32.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|Win32.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|x64.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|x64.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|x86.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release Mono|x86.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|Any CPU.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|Win32.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|Win32.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|x64.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|x64.Build.0 = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|x86.ActiveCfg = Release|Any CPU + {E9DB21D4-05E8-4883-B161-C55071166579}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Mono.Nat/Mono.Nat.csproj b/Mono.Nat/Mono.Nat.csproj new file mode 100644 index 0000000000..09e3baffae --- /dev/null +++ b/Mono.Nat/Mono.Nat.csproj @@ -0,0 +1,89 @@ + + + + + 14.0 + Debug + AnyCPU + {E9DB21D4-05E8-4883-B161-C55071166579} + Library + Properties + Mono.Nat + Mono.Nat + en-US + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + v5.0 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {9142eefa-7570-41e1-bfcc-468bb571af2f} + MediaBrowser.Common + + + {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b} + MediaBrowser.Model + + + + + \ No newline at end of file diff --git a/Mono.Nat/Mono.Nat.xproj b/Mono.Nat/Mono.Nat.xproj deleted file mode 100644 index f460bec580..0000000000 --- a/Mono.Nat/Mono.Nat.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0a82260b-4c22-4fd2-869a-e510044e3502 - Mono.Nat - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - - - - - \ No newline at end of file diff --git a/Mono.Nat/Properties/AssemblyInfo.cs b/Mono.Nat/Properties/AssemblyInfo.cs index f8fe5c3ea2..2ad8adf6f4 100644 --- a/Mono.Nat/Properties/AssemblyInfo.cs +++ b/Mono.Nat/Properties/AssemblyInfo.cs @@ -1,19 +1,30 @@ -using System.Reflection; +using System.Resources; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. +[assembly: AssemblyTitle("Mono.Nat")] +[assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Mono.Nat")] +[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: NeutralResourcesLanguage("en")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0a82260b-4c22-4fd2-869a-e510044e3502")] +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mono.Nat/project.json b/Mono.Nat/project.json index 259fca4898..7d5dc48747 100644 --- a/Mono.Nat/project.json +++ b/Mono.Nat/project.json @@ -1,39 +1,11 @@ -{ - "version": "1.0.0-*", - +{ + "supports": {}, "dependencies": { - + "Microsoft.NETCore.Portable.Compatibility": "1.0.1", + "NETStandard.Library": "1.6.0", + "System.Net.NetworkInformation": "4.1.0" }, - "frameworks": { - "net46": { - "frameworkAssemblies": { - "System.Collections": "4.0.0.0", - "System.Net": "4.0.0.0", - "System.Runtime": "4.0.0.0", - "System.Threading": "4.0.0.0", - "System.Threading.Tasks": "4.0.0.0", - "System.Xml": "4.0.0.0" - }, - "dependencies": { - "MediaBrowser.Common": { - "target": "project" - }, - "MediaBrowser.Model": { - "target": "project" - } } - }, - "netstandard1.6": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Net.NetworkInformation": "4.1.0", - "MediaBrowser.Model": { - "target": "project" - }, - "MediaBrowser.Common": { - "target": "project" - } } - } + "netstandard1.3": {} } -} +} \ No newline at end of file