Merge pull request #2677 from MediaBrowser/beta

Beta

16 files changed, 853 insertions, 415 deletions

diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs
index d3d8672be..d16afbce3 100644
--- a/Emby.Common.Implementations/BaseApplicationHost.cs
+++ b/Emby.Common.Implementations/BaseApplicationHost.cs
@@ -31,7 +31,6 @@ using Emby.Common.Implementations.Net;
 using Emby.Common.Implementations.EnvironmentInfo;
 using Emby.Common.Implementations.Threading;
 using MediaBrowser.Common;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Model.Cryptography;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Net;
@@ -39,10 +38,6 @@ using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Threading;
 
-#if NETSTANDARD1_6
-using System.Runtime.Loader;
-#endif
-
 namespace Emby.Common.Implementations
 {
     /// <summary>
@@ -179,9 +174,15 @@ namespace Emby.Common.Implementations
             }
         }
 
-        public virtual PackageVersionClass SystemUpdateLevel
+        public PackageVersionClass SystemUpdateLevel
         {
-            get { return PackageVersionClass.Release; }
+            get {
+
+#if BETA
+                return PackageVersionClass.Beta;
+#endif
+                return PackageVersionClass.Release;
+            }
         }
 
         public virtual string OperatingSystemDisplayName
@@ -306,7 +307,6 @@ namespace Emby.Common.Implementations
 
             builder.AppendLine(string.Format("Command line: {0}", string.Join(" ", Environment.GetCommandLineArgs())));
 
-#if NET46
             builder.AppendLine(string.Format("Operating system: {0}", Environment.OSVersion));
             builder.AppendLine(string.Format("64-Bit OS: {0}", Environment.Is64BitOperatingSystem));
             builder.AppendLine(string.Format("64-Bit Process: {0}", Environment.Is64BitProcess));
@@ -320,7 +320,6 @@ namespace Emby.Common.Implementations
                     builder.AppendLine("Mono: " + displayName.Invoke(null, null));
                 }
             }
-#endif    
 
             builder.AppendLine(string.Format("Processor count: {0}", Environment.ProcessorCount));
             builder.AppendLine(string.Format("Program data path: {0}", appPaths.ProgramDataPath));
@@ -336,9 +335,7 @@ namespace Emby.Common.Implementations
             try
             {
                 // Increase the max http request limit
-#if NET46
                 ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit);
-#endif    
             }
             catch (Exception ex)
             {
@@ -436,7 +433,6 @@ namespace Emby.Common.Implementations
 
                 if (assemblyPlugin != null)
                 {
-#if NET46
                     var assembly = plugin.GetType().Assembly;
                     var assemblyName = assembly.GetName();
 
@@ -447,21 +443,6 @@ namespace Emby.Common.Implementations
                     var assemblyFilePath = Path.Combine(ApplicationPaths.PluginsPath, assemblyFileName);
 
                     assemblyPlugin.SetAttributes(assemblyFilePath, assemblyFileName, assemblyName.Version, assemblyId);
-#elif NETSTANDARD1_6
-                    var typeInfo = plugin.GetType().GetTypeInfo();
-                    var assembly = typeInfo.Assembly;
-                    var assemblyName = assembly.GetName();
-
-                    var attribute = (GuidAttribute)assembly.GetCustomAttribute(typeof(GuidAttribute));
-                    var assemblyId = new Guid(attribute.Value);
-
-                    var assemblyFileName = assemblyName.Name + ".dll";
-                    var assemblyFilePath = Path.Combine(ApplicationPaths.PluginsPath, assemblyFileName);
-
-                    assemblyPlugin.SetAttributes(assemblyFilePath, assemblyFileName, assemblyName.Version, assemblyId);
-#else
-return null;
-#endif
                 }
 
                 var isFirstRun = !File.Exists(plugin.ConfigurationFilePath);
@@ -492,17 +473,7 @@ return null;
 
             AllConcreteTypes = assemblies
                 .SelectMany(GetTypes)
-                .Where(t =>
-                {
-#if NET46
-                    return t.IsClass && !t.IsAbstract && !t.IsInterface && !t.IsGenericType;
-#endif    
-#if NETSTANDARD1_6
-                    var typeInfo = t.GetTypeInfo();
-                    return typeInfo.IsClass && !typeInfo.IsAbstract && !typeInfo.IsInterface && !typeInfo.IsGenericType;
-#endif
-                    return false;
-                })
+                .Where(t => t.IsClass && !t.IsAbstract && !t.IsInterface && !t.IsGenericType)
                 .ToArray();
         }
 
@@ -717,13 +688,7 @@ return null;
         {
             try
             {
-#if NET46
                 return Assembly.Load(File.ReadAllBytes(file));
-#elif NETSTANDARD1_6
-                
-                return AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(file)));
-#endif
-                return null;
             }
             catch (Exception ex)
             {
@@ -742,14 +707,7 @@ return null;
         {
             var currentType = typeof(T);
 
-#if NET46
             return AllConcreteTypes.Where(currentType.IsAssignableFrom);
-#elif NETSTANDARD1_6
-            var currentTypeInfo = currentType.GetTypeInfo();
-
-            return AllConcreteTypes.Where(currentTypeInfo.IsAssignableFrom);
-#endif
-            return new List<Type>();
         }
 
         /// <summary>
diff --git a/Emby.Common.Implementations/Diagnostics/CommonProcess.cs b/Emby.Common.Implementations/Diagnostics/CommonProcess.cs
index 462345ced..afd30bc47 100644
--- a/Emby.Common.Implementations/Diagnostics/CommonProcess.cs
+++ b/Emby.Common.Implementations/Diagnostics/CommonProcess.cs
@@ -31,14 +31,12 @@ namespace Emby.Common.Implementations.Diagnostics
                 RedirectStandardOutput = options.RedirectStandardOutput
             };
 
-#if NET46
             startInfo.ErrorDialog = options.ErrorDialog;
 
             if (options.IsHidden)
             {
                 startInfo.WindowStyle = ProcessWindowStyle.Hidden;
             }
-#endif    
 
             _process = new Process
             {
@@ -100,6 +98,11 @@ namespace Emby.Common.Implementations.Diagnostics
             return _process.WaitForExit(timeMs);
         }
 
+        public Task<bool> WaitForExitAsync(int timeMs)
+        {
+            return Task.FromResult(_process.WaitForExit(timeMs));
+        }
+
         public void Dispose()
         {
             _process.Dispose();
diff --git a/Emby.Common.Implementations/Emby.Common.Implementations.csproj b/Emby.Common.Implementations/Emby.Common.Implementations.csproj
new file mode 100644
index 000000000..bf52ff0c7
--- /dev/null
+++ b/Emby.Common.Implementations/Emby.Common.Implementations.csproj
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1E37A338-9F57-4B70-BD6D-BB9C591E319B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Emby.Common.Implementations</RootNamespace>
+    <AssemblyName>Emby.Common.Implementations</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text, Version=4.5.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SimpleInjector, Version=4.0.7.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\packages\SimpleInjector.4.0.7\lib\net45\SimpleInjector.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs">
+      <Link>Properties\SharedVersion.cs</Link>
+    </Compile>
+    <Compile Include="Archiving\ZipClient.cs" />
+    <Compile Include="BaseApplicationHost.cs" />
+    <Compile Include="Cryptography\CryptographyProvider.cs" />
+    <Compile Include="Devices\DeviceId.cs" />
+    <Compile Include="Diagnostics\CommonProcess.cs" />
+    <Compile Include="Diagnostics\ProcessFactory.cs" />
+    <Compile Include="EnvironmentInfo\EnvironmentInfo.cs" />
+    <Compile Include="HttpClientManager\HttpClientInfo.cs" />
+    <Compile Include="HttpClientManager\HttpClientManager.cs" />
+    <Compile Include="IO\IsoManager.cs" />
+    <Compile Include="IO\LnkShortcutHandler.cs" />
+    <Compile Include="IO\ManagedFileSystem.cs" />
+    <Compile Include="IO\ProgressStream.cs" />
+    <Compile Include="IO\SharpCifsFileSystem.cs" />
+    <Compile Include="IO\SharpCifs\Config.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcBind.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcBinding.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcConstants.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcError.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcException.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcHandle.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcMessage.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcPipeHandle.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\DcerpcSecurityProvider.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\LsaPolicyHandle.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\Lsarpc.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\LsarSidArrayX.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcDfsRootEnum.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcEnumerateAliasesInDomain.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcGetMembersInAlias.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcLookupSids.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcLsarOpenPolicy2.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcQueryInformationPolicy.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcSamrConnect2.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcSamrConnect4.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcSamrOpenAlias.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcSamrOpenDomain.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcShareEnum.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\MsrpcShareGetInfo.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\Netdfs.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\Samr.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\SamrAliasHandle.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\SamrDomainHandle.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\SamrPolicyHandle.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Msrpc\Srvsvc.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Ndr\NdrBuffer.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Ndr\NdrException.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Ndr\NdrHyper.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Ndr\NdrLong.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Ndr\NdrObject.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Ndr\NdrShort.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Ndr\NdrSmall.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\Rpc.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\UnicodeString.cs" />
+    <Compile Include="IO\SharpCifs\Dcerpc\UUID.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\Lmhosts.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\Name.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NameQueryRequest.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NameQueryResponse.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NameServiceClient.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NameServicePacket.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NbtAddress.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NbtException.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NodeStatusRequest.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\NodeStatusResponse.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\SessionRequestPacket.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\SessionRetargetResponsePacket.cs" />
+    <Compile Include="IO\SharpCifs\Netbios\SessionServicePacket.cs" />
+    <Compile Include="IO\SharpCifs\Ntlmssp\NtlmFlags.cs" />
+    <Compile Include="IO\SharpCifs\Ntlmssp\NtlmMessage.cs" />
+    <Compile Include="IO\SharpCifs\Ntlmssp\Type1Message.cs" />
+    <Compile Include="IO\SharpCifs\Ntlmssp\Type2Message.cs" />
+    <Compile Include="IO\SharpCifs\Ntlmssp\Type3Message.cs" />
+    <Compile Include="IO\SharpCifs\Smb\ACE.cs" />
+    <Compile Include="IO\SharpCifs\Smb\AllocInfo.cs" />
+    <Compile Include="IO\SharpCifs\Smb\AndXServerMessageBlock.cs" />
+    <Compile Include="IO\SharpCifs\Smb\BufferCache.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Dfs.cs" />
+    <Compile Include="IO\SharpCifs\Smb\DfsReferral.cs" />
+    <Compile Include="IO\SharpCifs\Smb\DosError.cs" />
+    <Compile Include="IO\SharpCifs\Smb\DosFileFilter.cs" />
+    <Compile Include="IO\SharpCifs\Smb\FileEntry.cs" />
+    <Compile Include="IO\SharpCifs\Smb\IInfo.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NetServerEnum2.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NetServerEnum2Response.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NetShareEnum.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NetShareEnumResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NtlmAuthenticator.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NtlmChallenge.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NtlmContext.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NtlmPasswordAuthentication.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NtStatus.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NtTransQuerySecurityDesc.cs" />
+    <Compile Include="IO\SharpCifs\Smb\NtTransQuerySecurityDescResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Principal.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SecurityDescriptor.cs" />
+    <Compile Include="IO\SharpCifs\Smb\ServerMessageBlock.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SID.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SigningDigest.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbAuthException.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComBlankResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComClose.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComCreateDirectory.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComDelete.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComDeleteDirectory.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComFindClose2.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComLogoffAndX.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComNegotiate.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComNegotiateResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComNTCreateAndX.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComNTCreateAndXResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComNtTransaction.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComNtTransactionResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComOpenAndX.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComOpenAndXResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComQueryInformation.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComQueryInformationResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComReadAndX.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComReadAndXResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComRename.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComSessionSetupAndX.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComSessionSetupAndXResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComTransaction.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComTransactionResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComTreeConnectAndX.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComTreeConnectAndXResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComTreeDisconnect.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComWrite.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComWriteAndX.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComWriteAndXResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbComWriteResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbConstants.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbException.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbFile.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbFileExtensions.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbFileFilter.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbFileInputStream.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbFilenameFilter.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbFileOutputStream.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbNamedPipe.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbRandomAccessFile.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbSession.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbShareInfo.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbTransport.cs" />
+    <Compile Include="IO\SharpCifs\Smb\SmbTree.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2FindFirst2.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2FindFirst2Response.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2FindNext2.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2GetDfsReferral.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2GetDfsReferralResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2QueryFSInformation.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2QueryFSInformationResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2QueryPathInformation.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2QueryPathInformationResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2SetFileInformation.cs" />
+    <Compile Include="IO\SharpCifs\Smb\Trans2SetFileInformationResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransactNamedPipeInputStream.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransactNamedPipeOutputStream.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransCallNamedPipe.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransCallNamedPipeResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransPeekNamedPipe.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransPeekNamedPipeResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransTransactNamedPipe.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransTransactNamedPipeResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransWaitNamedPipe.cs" />
+    <Compile Include="IO\SharpCifs\Smb\TransWaitNamedPipeResponse.cs" />
+    <Compile Include="IO\SharpCifs\Smb\WinError.cs" />
+    <Compile Include="IO\SharpCifs\UniAddress.cs" />
+    <Compile Include="IO\SharpCifs\Util\Base64.cs" />
+    <Compile Include="IO\SharpCifs\Util\DES.cs" />
+    <Compile Include="IO\SharpCifs\Util\Encdec.cs" />
+    <Compile Include="IO\SharpCifs\Util\Hexdump.cs" />
+    <Compile Include="IO\SharpCifs\Util\HMACT64.cs" />
+    <Compile Include="IO\SharpCifs\Util\LogStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\MD4.cs" />
+    <Compile Include="IO\SharpCifs\Util\RC4.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\AbstractMap.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Arrays.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\BufferedReader.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\BufferedWriter.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\CharBuffer.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\CharSequence.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Collections.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\ConcurrentHashMap.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\DateFormat.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\EnumeratorWrapper.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Exceptions.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Extensions.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\FileInputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\FileOutputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\FilePath.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\FileReader.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\FileWriter.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\FilterInputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\FilterOutputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Hashtable.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\HttpURLConnection.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\ICallable.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\IConcurrentMap.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\IExecutor.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\IFilenameFilter.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\IFuture.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\InputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\InputStreamReader.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\IPrivilegedAction.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\IRunnable.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Iterator.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\LinkageError.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Matcher.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\MD5.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\MD5Managed.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\MessageDigest.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\NetworkStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\ObjectInputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\ObjectOutputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\OutputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\OutputStreamWriter.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\PipedInputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\PipedOutputStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\PrintWriter.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Properties.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\RandomAccessFile.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\ReentrantLock.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Reference.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Runtime.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\SimpleDateFormat.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\SocketEx.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\StringTokenizer.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\SynchronizedList.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\Thread.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\ThreadFactory.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\ThreadPoolExecutor.cs" />
+    <Compile Include="IO\SharpCifs\Util\Sharpen\WrappedSystemStream.cs" />
+    <Compile Include="IO\SharpCifs\Util\Transport\Request.cs" />
+    <Compile Include="IO\SharpCifs\Util\Transport\Response.cs" />
+    <Compile Include="IO\SharpCifs\Util\Transport\Transport.cs" />
+    <Compile Include="IO\SharpCifs\Util\Transport\TransportException.cs" />
+    <Compile Include="Logging\NLogger.cs" />
+    <Compile Include="Logging\NlogManager.cs" />
+    <Compile Include="Networking\NetworkManager.cs" />
+    <Compile Include="Net\DisposableManagedObjectBase.cs" />
+    <Compile Include="Net\NetAcceptSocket.cs" />
+    <Compile Include="Net\SocketAcceptor.cs" />
+    <Compile Include="Net\SocketFactory.cs" />
+    <Compile Include="Net\UdpSocket.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Reflection\AssemblyInfo.cs" />
+    <Compile Include="ScheduledTasks\DailyTrigger.cs" />
+    <Compile Include="ScheduledTasks\IntervalTrigger.cs" />
+    <Compile Include="ScheduledTasks\ScheduledTaskWorker.cs" />
+    <Compile Include="ScheduledTasks\StartupTrigger.cs" />
+    <Compile Include="ScheduledTasks\SystemEventTrigger.cs" />
+    <Compile Include="ScheduledTasks\TaskManager.cs" />
+    <Compile Include="ScheduledTasks\Tasks\DeleteCacheFileTask.cs" />
+    <Compile Include="ScheduledTasks\Tasks\DeleteLogFileTask.cs" />
+    <Compile Include="ScheduledTasks\Tasks\ReloadLoggerFileTask.cs" />
+    <Compile Include="ScheduledTasks\WeeklyTrigger.cs" />
+    <Compile Include="Serialization\JsonSerializer.cs" />
+    <Compile Include="Serialization\XmlSerializer.cs" />
+    <Compile Include="TextEncoding\TextEncoding.cs" />
+    <Compile Include="TextEncoding\TextEncodingDetect.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\CharsetDetector.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\Big5Prober.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\BitPackage.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\CharDistributionAnalyser.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\CharsetProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\Charsets.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\CodingStateMachine.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\EscCharsetProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\EscSM.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\EUCJPProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\EUCKRProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\EUCTWProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\GB18030Prober.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\HebrewProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\JapaneseContextAnalyser.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\LangBulgarianModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\LangCyrillicModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\LangGreekModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\LangHebrewModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\LangHungarianModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\LangThaiModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\Latin1Prober.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\MBCSGroupProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\MBCSSM.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\SBCharsetProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\SBCSGroupProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\SequenceModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\SJISProber.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\SMModel.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\UniversalDetector.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\Core\UTF8Prober.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\DetectionConfidence.cs" />
+    <Compile Include="TextEncoding\UniversalDetector\ICharsetDetector.cs" />
+    <Compile Include="Threading\CommonTimer.cs" />
+    <Compile Include="Threading\TimerFactory.cs" />
+    <Compile Include="Xml\XmlReaderSettingsFactory.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
+      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
+      <Name>MediaBrowser.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Emby.Common.Implementations/Emby.Common.Implementations.xproj b/Emby.Common.Implementations/Emby.Common.Implementations.xproj
deleted file mode 100644
index 5bb6e4e58..000000000
--- a/Emby.Common.Implementations/Emby.Common.Implementations.xproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>5a27010a-09c6-4e86-93ea-437484c10917</ProjectGuid>
-    <RootNamespace>Emby.Common.Implementations</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
index 27fc642f1..89aa787b5 100644
--- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
+++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
@@ -10,7 +10,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
 {
     public class EnvironmentInfo : IEnvironmentInfo
     {
-        public MediaBrowser.Model.System.Architecture? CustomArchitecture { get; set; }
+        public Architecture? CustomArchitecture { get; set; }
         public MediaBrowser.Model.System.OperatingSystem? CustomOperatingSystem { get; set; }
 
         public virtual MediaBrowser.Model.System.OperatingSystem OperatingSystem
@@ -22,7 +22,6 @@ namespace Emby.Common.Implementations.EnvironmentInfo
                     return CustomOperatingSystem.Value;
                 }
 
-#if NET46
                 switch (Environment.OSVersion.Platform)
                 {
                     case PlatformID.MacOSX:
@@ -32,20 +31,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
                     case PlatformID.Unix:
                         return MediaBrowser.Model.System.OperatingSystem.Linux;
                 }
-#elif NETSTANDARD1_6
-                if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                {
-                    return OperatingSystem.OSX;
-                }
-                if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                {
-                    return OperatingSystem.Windows;
-                }
-                if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                {
-                    return OperatingSystem.Linux;
-                }
-#endif
+
                 return MediaBrowser.Model.System.OperatingSystem.Windows;
             }
         }
@@ -54,12 +40,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
         {
             get
             {
-#if NET46
                 return Environment.OSVersion.Platform.ToString();
-#elif NETSTANDARD1_6
-            return System.Runtime.InteropServices.RuntimeInformation.OSDescription;
-#endif
-                return "Operating System";
             }
         }
 
@@ -67,12 +48,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
         {
             get
             {
-#if NET46
                 return Environment.OSVersion.Version.ToString() + " " + Environment.OSVersion.ServicePack.ToString();
-#elif NETSTANDARD1_6
-            return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
-#endif
-                return "1.0";
             }
         }
 
@@ -84,7 +60,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
             }
         }
 
-        public MediaBrowser.Model.System.Architecture SystemArchitecture
+        public Architecture SystemArchitecture
         {
             get
             {
@@ -92,22 +68,8 @@ namespace Emby.Common.Implementations.EnvironmentInfo
                 {
                     return CustomArchitecture.Value;
                 }
-#if NET46
+
                 return Environment.Is64BitOperatingSystem ? MediaBrowser.Model.System.Architecture.X64 : MediaBrowser.Model.System.Architecture.X86;
-#elif NETSTANDARD1_6
-                switch(System.Runtime.InteropServices.RuntimeInformation.OSArchitecture)
-                {
-                    case System.Runtime.InteropServices.Architecture.Arm:
-                        return MediaBrowser.Model.System.Architecture.Arm;
-                    case System.Runtime.InteropServices.Architecture.Arm64:
-                        return MediaBrowser.Model.System.Architecture.Arm64;
-                    case System.Runtime.InteropServices.Architecture.X64:
-                        return MediaBrowser.Model.System.Architecture.X64;
-                    case System.Runtime.InteropServices.Architecture.X86:
-                        return MediaBrowser.Model.System.Architecture.X86;
-                }
-#endif
-                return MediaBrowser.Model.System.Architecture.X64;
             }
         }
 
diff --git a/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
index eb9bc1bd0..5bd18cb80 100644
--- a/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
@@ -1,7 +1,6 @@
 using System.Net.Sockets;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
@@ -17,6 +16,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Common.Implementations.HttpClientManager;
+using Emby.Common.Implementations.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Common;
 
@@ -66,13 +66,11 @@ namespace Emby.Common.Implementations.HttpClientManager
             _appPaths = appPaths;
             _defaultUserAgentFn = defaultUserAgentFn;
 
-#if NET46
             // http://stackoverflow.com/questions/566437/http-post-returns-the-error-417-expectation-failed-c
             ServicePointManager.Expect100Continue = false;
 
             // Trakt requests sometimes fail without this
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls;
-#endif    
         }
 
         /// <summary>
@@ -129,7 +127,6 @@ namespace Emby.Common.Implementations.HttpClientManager
 
         private void AddIpv4Option(HttpWebRequest request, HttpRequestOptions options)
         {
-#if NET46
             request.ServicePoint.BindIPEndPointDelegate = (servicePount, remoteEndPoint, retryCount) =>
             {
                 if (remoteEndPoint.AddressFamily == AddressFamily.InterNetwork)
@@ -138,7 +135,6 @@ namespace Emby.Common.Implementations.HttpClientManager
                 }
                 throw new InvalidOperationException("no IPv4 address");
             };
-#endif    
         }
 
         private WebRequest GetRequest(HttpRequestOptions options, string method)
@@ -165,7 +161,6 @@ namespace Emby.Common.Implementations.HttpClientManager
 
                 AddRequestHeaders(httpWebRequest, options);
 
-#if NET46
                 if (options.EnableHttpCompression)
                 {
                     if (options.DecompressionMethod.HasValue)
@@ -183,48 +178,33 @@ namespace Emby.Common.Implementations.HttpClientManager
                 {
                     httpWebRequest.AutomaticDecompression = DecompressionMethods.None;
                 }
-#endif    
             }
 
 
 
-#if NET46
             request.CachePolicy = new System.Net.Cache.RequestCachePolicy(System.Net.Cache.RequestCacheLevel.BypassCache);
-#endif    
 
             if (httpWebRequest != null)
             {
                 if (options.EnableKeepAlive)
                 {
-#if NET46
                     httpWebRequest.KeepAlive = true;
-#endif    
                 }
             }
 
             request.Method = method;
-#if NET46
             request.Timeout = options.TimeoutMs;
-#endif
 
             if (httpWebRequest != null)
             {
                 if (!string.IsNullOrEmpty(options.Host))
                 {
-#if NET46
                     httpWebRequest.Host = options.Host;
-#elif NETSTANDARD1_6
-                    httpWebRequest.Headers["Host"] = options.Host;
-#endif
                 }
 
                 if (!string.IsNullOrEmpty(options.Referer))
                 {
-#if NET46
                     httpWebRequest.Referer = options.Referer;
-#elif NETSTANDARD1_6
-                    httpWebRequest.Headers["Referer"] = options.Referer;
-#endif
                 }
             }
 
@@ -235,9 +215,7 @@ namespace Emby.Common.Implementations.HttpClientManager
                 {
                     request.Credentials = GetCredential(url, parts[0], parts[1]);
                     // TODO: .net core ??
-#if NET46
                     request.PreAuthenticate = true;
-#endif
                 }
             }
 
@@ -269,11 +247,7 @@ namespace Emby.Common.Implementations.HttpClientManager
                 }
                 else
                 {
-#if NET46
                     request.Headers.Set(header.Key, header.Value);
-#elif NETSTANDARD1_6
-                    request.Headers[header.Key] = header.Value;
-#endif
                 }
             }
 
@@ -285,11 +259,7 @@ namespace Emby.Common.Implementations.HttpClientManager
 
         private void SetUserAgent(HttpWebRequest request, string userAgent)
         {
-#if NET46
             request.UserAgent = userAgent;
-#elif NETSTANDARD1_6
-                    request.Headers["User-Agent"] = userAgent;
-#endif
         }
 
         /// <summary>
@@ -465,9 +435,7 @@ namespace Emby.Common.Implementations.HttpClientManager
 
                     httpWebRequest.ContentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
 
-#if NET46
                     httpWebRequest.ContentLength = bytes.Length;
-#endif
                     (await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false)).Write(bytes, 0, bytes.Length);
                 }
                 catch (Exception ex)
@@ -950,7 +918,6 @@ namespace Emby.Common.Implementations.HttpClientManager
 
         private Task<WebResponse> GetResponseAsync(WebRequest request, TimeSpan timeout)
         {
-#if NET46
             var taskCompletion = new TaskCompletionSource<WebResponse>();
 
             Task<WebResponse> asyncTask = Task.Factory.FromAsync<WebResponse>(request.BeginGetResponse, request.EndGetResponse, null);
@@ -963,9 +930,6 @@ namespace Emby.Common.Implementations.HttpClientManager
             asyncTask.ContinueWith(callback.OnError, TaskContinuationOptions.OnlyOnFaulted);
 
             return taskCompletion.Task;
-#endif
-
-            return request.GetResponseAsync();
         }
 
         private static void TimeoutCallback(object state, bool timedOut)
diff --git a/Emby.Common.Implementations/IO/ProgressStream.cs b/Emby.Common.Implementations/IO/ProgressStream.cs
new file mode 100644
index 000000000..fb8cf86df
--- /dev/null
+++ b/Emby.Common.Implementations/IO/ProgressStream.cs
@@ -0,0 +1,240 @@
+using System;
+using System.IO;
+
+namespace Emby.Common.Implementations.IO
+{
+    /// <summary>
+    /// Measures progress when reading from a stream or writing to one
+    /// </summary>
+    public class ProgressStream : Stream
+    {
+        /// <summary>
+        /// Gets the base stream.
+        /// </summary>
+        /// <value>The base stream.</value>
+        public Stream BaseStream { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the bytes processed.
+        /// </summary>
+        /// <value>The bytes processed.</value>
+        private long BytesProcessed { get; set; }
+        /// <summary>
+        /// Gets or sets the length of the write.
+        /// </summary>
+        /// <value>The length of the write.</value>
+        private long WriteLength { get; set; }
+
+        /// <summary>
+        /// Gets or sets the length of the read.
+        /// </summary>
+        /// <value>The length of the read.</value>
+        private long? ReadLength { get; set; }
+
+        /// <summary>
+        /// Gets or sets the progress action.
+        /// </summary>
+        /// <value>The progress action.</value>
+        private Action<double> ProgressAction { get; set; }
+
+        /// <summary>
+        /// Creates the read progress stream.
+        /// </summary>
+        /// <param name="baseStream">The base stream.</param>
+        /// <param name="progressAction">The progress action.</param>
+        /// <param name="readLength">Length of the read.</param>
+        /// <returns>ProgressStream.</returns>
+        public static ProgressStream CreateReadProgressStream(Stream baseStream, Action<double> progressAction, long? readLength = null)
+        {
+            return new ProgressStream
+            {
+                BaseStream = baseStream,
+                ProgressAction = progressAction,
+                ReadLength = readLength
+            };
+        }
+
+        /// <summary>
+        /// Creates the write progress stream.
+        /// </summary>
+        /// <param name="baseStream">The base stream.</param>
+        /// <param name="progressAction">The progress action.</param>
+        /// <param name="writeLength">Length of the write.</param>
+        /// <returns>ProgressStream.</returns>
+        public static ProgressStream CreateWriteProgressStream(Stream baseStream, Action<double> progressAction, long writeLength)
+        {
+            return new ProgressStream
+            {
+                BaseStream = baseStream,
+                ProgressAction = progressAction,
+                WriteLength = writeLength
+            };
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, gets a value indicating whether the current stream supports reading.
+        /// </summary>
+        /// <value><c>true</c> if this instance can read; otherwise, <c>false</c>.</value>
+        /// <returns>true if the stream supports reading; otherwise, false.</returns>
+        public override bool CanRead
+        {
+            get { return BaseStream.CanRead; }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, gets a value indicating whether the current stream supports seeking.
+        /// </summary>
+        /// <value><c>true</c> if this instance can seek; otherwise, <c>false</c>.</value>
+        /// <returns>true if the stream supports seeking; otherwise, false.</returns>
+        public override bool CanSeek
+        {
+            get { return BaseStream.CanSeek; }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, gets a value indicating whether the current stream supports writing.
+        /// </summary>
+        /// <value><c>true</c> if this instance can write; otherwise, <c>false</c>.</value>
+        /// <returns>true if the stream supports writing; otherwise, false.</returns>
+        public override bool CanWrite
+        {
+            get { return BaseStream.CanWrite; }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, clears all buffers for this stream and causes any buffered data to be written to the underlying device.
+        /// </summary>
+        public override void Flush()
+        {
+            BaseStream.Flush();
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, gets the length in bytes of the stream.
+        /// </summary>
+        /// <value>The length.</value>
+        /// <returns>A long value representing the length of the stream in bytes.</returns>
+        public override long Length
+        {
+            get { return BaseStream.Length; }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, gets or sets the position within the current stream.
+        /// </summary>
+        /// <value>The position.</value>
+        /// <returns>The current position within the stream.</returns>
+        public override long Position
+        {
+            get { return BaseStream.Position; }
+            set
+            {
+                BaseStream.Position = value;
+            }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, reads a sequence of bytes from the current stream and advances the position within the stream by the number of bytes read.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset" /> and (<paramref name="offset" /> + <paramref name="count" /> - 1) replaced by the bytes read from the current source.</param>
+        /// <param name="offset">The zero-based byte offset in <paramref name="buffer" /> at which to begin storing the data read from the current stream.</param>
+        /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
+        /// <returns>The total number of bytes read into the buffer. This can be less than the number of bytes requested if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.</returns>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            var read = BaseStream.Read(buffer, offset, count);
+
+            BytesProcessed += read;
+
+            double percent = BytesProcessed;
+            percent /= ReadLength ?? BaseStream.Length;
+            percent *= 100;
+
+            ProgressAction(percent);
+
+            return read;
+        }
+
+        public override int EndRead(IAsyncResult asyncResult)
+        {
+            var read = base.EndRead(asyncResult);
+
+            BytesProcessed += read;
+
+            double percent = BytesProcessed;
+            percent /= ReadLength ?? BaseStream.Length;
+            percent *= 100;
+
+            ProgressAction(percent);
+
+            return read;
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, sets the position within the current stream.
+        /// </summary>
+        /// <param name="offset">A byte offset relative to the <paramref name="origin" /> parameter.</param>
+        /// <param name="origin">A value of type <see cref="T:System.IO.SeekOrigin" /> indicating the reference point used to obtain the new position.</param>
+        /// <returns>The new position within the current stream.</returns>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return BaseStream.Seek(offset, origin);
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, sets the length of the current stream.
+        /// </summary>
+        /// <param name="value">The desired length of the current stream in bytes.</param>
+        public override void SetLength(long value)
+        {
+            BaseStream.SetLength(value);
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, writes a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. This method copies <paramref name="count" /> bytes from <paramref name="buffer" /> to the current stream.</param>
+        /// <param name="offset">The zero-based byte offset in <paramref name="buffer" /> at which to begin copying bytes to the current stream.</param>
+        /// <param name="count">The number of bytes to be written to the current stream.</param>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            BaseStream.Write(buffer, offset, count);
+
+            BytesProcessed += count;
+
+            double percent = BytesProcessed;
+            percent /= WriteLength;
+            percent *= 100;
+
+            ProgressAction(percent);
+        }
+
+        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        {
+            var result = base.BeginWrite(buffer, offset, count, callback, state);
+
+            BytesProcessed += count;
+
+            double percent = BytesProcessed;
+            percent /= WriteLength;
+            percent *= 100;
+
+            ProgressAction(percent);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Releases the unmanaged resources used by the <see cref="T:System.IO.Stream" /> and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                BaseStream.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+    }
+}
diff --git a/Emby.Common.Implementations/Net/NetAcceptSocket.cs b/Emby.Common.Implementations/Net/NetAcceptSocket.cs
index 82e7e9b00..5e831ac7a 100644
--- a/Emby.Common.Implementations/Net/NetAcceptSocket.cs
+++ b/Emby.Common.Implementations/Net/NetAcceptSocket.cs
@@ -97,7 +97,6 @@ namespace Emby.Common.Implementations.Net
             _acceptor.StartAccept();
         }
 
-#if NET46
         public Task SendFile(string path, byte[] preBuffer, byte[] postBuffer, CancellationToken cancellationToken)
         {
             var options = TransmitFileOptions.UseDefaultWorkerThread;
@@ -109,6 +108,18 @@ namespace Emby.Common.Implementations.Net
             return completionSource.Task;
         }
 
+        public IAsyncResult BeginSendFile(string path, byte[] preBuffer, byte[] postBuffer, AsyncCallback callback, object state)
+        {
+            var options = TransmitFileOptions.UseDefaultWorkerThread;
+
+            return Socket.BeginSendFile(path, preBuffer, postBuffer, options, new AsyncCallback(FileSendCallback), state);
+        }
+
+        public void EndSendFile(IAsyncResult result)
+        {
+            Socket.EndSendFile(result);
+        }
+
         private void FileSendCallback(IAsyncResult ar)
         {
             // Retrieve the socket from the state object.
@@ -117,25 +128,23 @@ namespace Emby.Common.Implementations.Net
             var client = data.Item1;
             var path = data.Item2;
             var taskCompletion = data.Item3;
-        
+
             // Complete sending the data to the remote device.
-        try {
-            client.EndSendFile(ar);
-        taskCompletion.TrySetResult(true);
-}
-        catch(SocketException ex){
-        _logger.Info("Socket.SendFile failed for {0}. error code {1}", path, ex.SocketErrorCode);
-        taskCompletion.TrySetException(ex);
-}catch(Exception ex){
-        taskCompletion.TrySetException(ex);
-}
-        }
-#else
-        public Task SendFile(string path, byte[] preBuffer, byte[] postBuffer, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
+            try
+            {
+                client.EndSendFile(ar);
+                taskCompletion.TrySetResult(true);
+            }
+            catch (SocketException ex)
+            {
+                _logger.Info("Socket.SendFile failed for {0}. error code {1}", path, ex.SocketErrorCode);
+                taskCompletion.TrySetException(ex);
+            }
+            catch (Exception ex)
+            {
+                taskCompletion.TrySetException(ex);
+            }
         }
-#endif
 
         public void Dispose()
         {
diff --git a/Emby.Common.Implementations/Net/SocketFactory.cs b/Emby.Common.Implementations/Net/SocketFactory.cs
index 39f236afa..0a1232a40 100644
--- a/Emby.Common.Implementations/Net/SocketFactory.cs
+++ b/Emby.Common.Implementations/Net/SocketFactory.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
@@ -188,16 +189,7 @@ namespace Emby.Common.Implementations.Net
 
             try
             {
-#if NET46
-				retVal.ExclusiveAddressUse = false;
-#else
-                // The ExclusiveAddressUse acceptSocket option is a Windows-specific option that, when set to "true," tells Windows not to allow another acceptSocket to use the same local address as this acceptSocket
-                // See https://github.com/dotnet/corefx/pull/11509 for more details
-                if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows))
-				{
-					retVal.ExclusiveAddressUse = false;
-				}
-#endif
+                retVal.ExclusiveAddressUse = false;
                 //retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
                 retVal.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
                 retVal.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, multicastTimeToLive);
@@ -217,5 +209,89 @@ namespace Emby.Common.Implementations.Net
                 throw;
             }
         }
+
+        public Stream CreateNetworkStream(ISocket socket, bool ownsSocket)
+        {
+            var netSocket = (UdpSocket)socket;
+
+            return new SocketStream(netSocket.Socket, ownsSocket);
+        }
     }
+
+    public class SocketStream : Stream
+    {
+        private readonly Socket _socket;
+
+        public SocketStream(Socket socket, bool ownsSocket)
+        {
+            _socket = socket;
+        }
+
+        public override void Flush()
+        {
+        }
+
+        public override bool CanRead
+        {
+            get { return true; }
+        }
+        public override bool CanSeek
+        {
+            get { return false; }
+        }
+        public override bool CanWrite
+        {
+            get { return true; }
+        }
+        public override long Length
+        {
+            get { throw new NotImplementedException(); }
+        }
+        public override long Position
+        {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            _socket.Send(buffer, offset, count, SocketFlags.None);
+        }
+
+        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        {
+            return _socket.BeginSend(buffer, offset, count, SocketFlags.None, callback, state);
+        }
+
+        public override void EndWrite(IAsyncResult asyncResult)
+        {
+            _socket.EndSend(asyncResult);
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            return _socket.Receive(buffer, offset, count, SocketFlags.None);
+        }
+
+        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        {
+            return _socket.BeginReceive(buffer, offset, count, SocketFlags.None, callback, state);
+        }
+
+        public override int EndRead(IAsyncResult asyncResult)
+        {
+            return _socket.EndReceive(asyncResult);
+        }
+    }
+
 }
diff --git a/Emby.Common.Implementations/Net/UdpSocket.cs b/Emby.Common.Implementations/Net/UdpSocket.cs
index f9181eb6a..578610b4c 100644
--- a/Emby.Common.Implementations/Net/UdpSocket.cs
+++ b/Emby.Common.Implementations/Net/UdpSocket.cs
@@ -14,11 +14,16 @@ namespace Emby.Common.Implementations.Net
     // THIS IS A LINKED FILE - SHARED AMONGST MULTIPLE PLATFORMS	
     // Be careful to check any changes compile and work for all platform projects it is shared in.
 
-    internal sealed class UdpSocket : DisposableManagedObjectBase, ISocket
+    public sealed class UdpSocket : DisposableManagedObjectBase, ISocket
     {
         private Socket _Socket;
         private int _LocalPort;
 
+        public Socket Socket
+        {
+            get { return _Socket; }
+        }
+
         private readonly SocketAsyncEventArgs _receiveSocketAsyncEventArgs = new SocketAsyncEventArgs()
         {
             SocketFlags = SocketFlags.None
@@ -116,129 +121,104 @@ namespace Emby.Common.Implementations.Net
             private set;
         }
 
-        public Task<SocketReceiveResult> ReceiveAsync(CancellationToken cancellationToken)
+        public IAsyncResult BeginReceive(byte[] buffer, int offset, int count, AsyncCallback callback)
         {
-            ThrowIfDisposed();
-            var tcs = new TaskCompletionSource<SocketReceiveResult>();
             EndPoint receivedFromEndPoint = new IPEndPoint(IPAddress.Any, 0);
 
-            var state = new AsyncReceiveState(_Socket, receivedFromEndPoint);
-            state.TaskCompletionSource = tcs;
-
-            cancellationToken.Register(() => tcs.TrySetCanceled());
-
-            _receiveSocketAsyncEventArgs.RemoteEndPoint = receivedFromEndPoint;
-            _currentReceiveTaskCompletionSource = tcs;
-
-            try
-            {
-                var willRaiseEvent = _Socket.ReceiveFromAsync(_receiveSocketAsyncEventArgs);
-
-                if (!willRaiseEvent)
-                {
-                    _receiveSocketAsyncEventArgs_Completed(this, _receiveSocketAsyncEventArgs);
-                }
-            }
-            catch (Exception ex)
-            {
-                tcs.TrySetException(ex);
-            }
-
-            return tcs.Task;
+            return _Socket.BeginReceiveFrom(buffer, offset, count, SocketFlags.None, ref receivedFromEndPoint, callback, buffer);
         }
 
-        public Task SendAsync(byte[] buffer, int size, IpEndPointInfo endPoint, CancellationToken cancellationToken)
+        public SocketReceiveResult EndReceive(IAsyncResult result)
         {
-            ThrowIfDisposed();
-
-            if (buffer == null) throw new ArgumentNullException("messageData");
-            if (endPoint == null) throw new ArgumentNullException("endPoint");
+            IPEndPoint sender = new IPEndPoint(IPAddress.Any, 0);
+            EndPoint remoteEndPoint = (EndPoint)sender;
 
-            var ipEndPoint = NetworkManager.ToIPEndPoint(endPoint);
+            var receivedBytes = _Socket.EndReceiveFrom(result, ref remoteEndPoint);
 
-#if NETSTANDARD1_6
+            var buffer = (byte[]) result.AsyncState;
 
-            if (size != buffer.Length)
+            return new SocketReceiveResult
             {
-                byte[] copy = new byte[size];
-                Buffer.BlockCopy(buffer, 0, copy, 0, size);
-                buffer = copy;
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
+                ReceivedBytes = receivedBytes,
+                RemoteEndPoint = ToIpEndPointInfo((IPEndPoint)remoteEndPoint),
+                Buffer = buffer,
+                LocalIPAddress = LocalIPAddress
+            };
+        }
 
-            _Socket.SendTo(buffer, ipEndPoint);
-            return Task.FromResult(true);
-#else
-            var taskSource = new TaskCompletionSource<bool>();
+        public Task<SocketReceiveResult> ReceiveAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            var taskCompletion = new TaskCompletionSource<SocketReceiveResult>();
 
-            try
+            Action<IAsyncResult> callback = callbackResult =>
             {
-                _Socket.BeginSendTo(buffer, 0, size, SocketFlags.None, ipEndPoint, result =>
+                try
                 {
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        taskSource.TrySetCanceled();
-                        return;
-                    }
-                    try
-                    {
-                        _Socket.EndSend(result);
-                        taskSource.TrySetResult(true);
-                    }
-                    catch (Exception ex)
-                    {
-                        taskSource.TrySetException(ex);
-                    }
+                    taskCompletion.TrySetResult(EndReceive(callbackResult));
+                }
+                catch (Exception ex)
+                {
+                    taskCompletion.TrySetException(ex);
+                }
+            };
 
-                }, null);
-            }
-            catch (Exception ex)
+            var result = BeginReceive(buffer, offset, count, new AsyncCallback(callback));
+
+            if (result.CompletedSynchronously)
             {
-                taskSource.TrySetException(ex);
+                callback(result);
             }
 
-            return taskSource.Task;
-#endif
-            //ThrowIfDisposed();
+            cancellationToken.Register(() => taskCompletion.TrySetCanceled());
+
+            return taskCompletion.Task;
+        }
 
-            //if (buffer == null) throw new ArgumentNullException("messageData");
-            //if (endPoint == null) throw new ArgumentNullException("endPoint");
+        public Task<SocketReceiveResult> ReceiveAsync(CancellationToken cancellationToken)
+        {
+            var buffer = new byte[8192];
 
-            //cancellationToken.ThrowIfCancellationRequested();
+            return ReceiveAsync(buffer, 0, buffer.Length, cancellationToken);
+        }
 
-            //var tcs = new TaskCompletionSource<int>();
+        public Task SendToAsync(byte[] buffer, int offset, int size, IpEndPointInfo endPoint, CancellationToken cancellationToken)
+        {
+            var taskCompletion = new TaskCompletionSource<int>();
 
-            //cancellationToken.Register(() => tcs.TrySetCanceled());
+            Action<IAsyncResult> callback = callbackResult =>
+            {
+                try
+                {
+                    taskCompletion.TrySetResult(EndSendTo(callbackResult));
+                }
+                catch (Exception ex)
+                {
+                    taskCompletion.TrySetException(ex);
+                }
+            };
 
-            //_sendSocketAsyncEventArgs.SetBuffer(buffer, 0, size);
-            //_sendSocketAsyncEventArgs.RemoteEndPoint = NetworkManager.ToIPEndPoint(endPoint);
-            //_currentSendTaskCompletionSource = tcs;
+            var result = BeginSendTo(buffer, offset, size, endPoint, new AsyncCallback(callback), null);
 
-            //var willRaiseEvent = _Socket.SendAsync(_sendSocketAsyncEventArgs);
+            if (result.CompletedSynchronously)
+            {
+                callback(result);
+            }
 
-            //if (!willRaiseEvent)
-            //{
-            //    _sendSocketAsyncEventArgs_Completed(this, _sendSocketAsyncEventArgs);
-            //}
+            cancellationToken.Register(() => taskCompletion.TrySetCanceled());
 
-            //return tcs.Task;
+            return taskCompletion.Task;
         }
 
-        public async Task SendWithLockAsync(byte[] buffer, int size, IpEndPointInfo endPoint, CancellationToken cancellationToken)
+        public IAsyncResult BeginSendTo(byte[] buffer, int offset, int size, IpEndPointInfo endPoint, AsyncCallback callback, object state)
         {
-            ThrowIfDisposed();
+            var ipEndPoint = NetworkManager.ToIPEndPoint(endPoint);
 
-            //await _sendLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+            return _Socket.BeginSendTo(buffer, offset, size, SocketFlags.None, ipEndPoint, callback, state);
+        }
 
-            try
-            {
-                await SendAsync(buffer, size, endPoint, cancellationToken).ConfigureAwait(false);
-            }
-            finally
-            {
-                //_sendLock.Release();
-            }
+        public int EndSendTo(IAsyncResult result)
+        {
+            return _Socket.EndSendTo(result);
         }
 
         protected override void Dispose(bool disposing)
@@ -273,52 +253,5 @@ namespace Emby.Common.Implementations.Net
 
             return NetworkManager.ToIpEndPointInfo(endpoint);
         }
-
-        private void ProcessResponse(IAsyncResult asyncResult)
-        {
-#if NET46
-            var state = asyncResult.AsyncState as AsyncReceiveState;
-            try
-            {
-                var bytesRead = state.Socket.EndReceiveFrom(asyncResult, ref state.RemoteEndPoint);
-
-                var ipEndPoint = state.RemoteEndPoint as IPEndPoint;
-                state.TaskCompletionSource.SetResult(
-                    new SocketReceiveResult
-                    {
-                        Buffer = state.Buffer,
-                        ReceivedBytes = bytesRead,
-                        RemoteEndPoint = ToIpEndPointInfo(ipEndPoint),
-                        LocalIPAddress = LocalIPAddress
-                    }
-                );
-            }
-            catch (ObjectDisposedException)
-            {
-                state.TaskCompletionSource.SetCanceled();
-            }
-            catch (Exception ex)
-            {
-                state.TaskCompletionSource.SetException(ex);
-            }
-#endif
-        }
-
-        private class AsyncReceiveState
-        {
-            public AsyncReceiveState(Socket socket, EndPoint remoteEndPoint)
-            {
-                this.Socket = socket;
-                this.RemoteEndPoint = remoteEndPoint;
-            }
-
-            public EndPoint RemoteEndPoint;
-            public byte[] Buffer = new byte[8192];
-
-            public Socket Socket { get; private set; }
-
-            public TaskCompletionSource<SocketReceiveResult> TaskCompletionSource { get; set; }
-
-        }
     }
 }
diff --git a/Emby.Common.Implementations/Properties/AssemblyInfo.cs b/Emby.Common.Implementations/Properties/AssemblyInfo.cs
index 1a5abcb27..787f18997 100644
--- a/Emby.Common.Implementations/Properties/AssemblyInfo.cs
+++ b/Emby.Common.Implementations/Properties/AssemblyInfo.cs
@@ -2,18 +2,33 @@
 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("Emby.Common.Implementations")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Emby.Common.Implementations")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
 
-// 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
+// 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("5a27010a-09c6-4e86-93ea-437484c10917")]
+[assembly: Guid("1e37a338-9f57-4b70-bd6d-bb9c591e319b")]
+
+// 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.*")]
\ No newline at end of file
diff --git a/Emby.Common.Implementations/Reflection/AssemblyInfo.cs b/Emby.Common.Implementations/Reflection/AssemblyInfo.cs
index 7a92f02d6..87821bf7a 100644
--- a/Emby.Common.Implementations/Reflection/AssemblyInfo.cs
+++ b/Emby.Common.Implementations/Reflection/AssemblyInfo.cs
@@ -9,18 +9,12 @@ namespace Emby.Common.Implementations.Reflection
     {
         public Stream GetManifestResourceStream(Type type, string resource)
         {
-#if NET46
             return type.Assembly.GetManifestResourceStream(resource);
-#endif
-            return type.GetTypeInfo().Assembly.GetManifestResourceStream(resource);
         }
 
         public string[] GetManifestResourceNames(Type type)
         {
-#if NET46
             return type.Assembly.GetManifestResourceNames();
-#endif
-            return type.GetTypeInfo().Assembly.GetManifestResourceNames();
         }
 
         public Assembly[] GetCurrentAssemblies()
diff --git a/Emby.Common.Implementations/Serialization/XmlSerializer.cs b/Emby.Common.Implementations/Serialization/XmlSerializer.cs
index 3583f998e..b5896e6b0 100644
--- a/Emby.Common.Implementations/Serialization/XmlSerializer.cs
+++ b/Emby.Common.Implementations/Serialization/XmlSerializer.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Xml;
 using System.Xml.Serialization;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 
@@ -78,18 +77,11 @@ namespace Emby.Common.Implementations.Serialization
         /// <param name="stream">The stream.</param>
         public void SerializeToStream(object obj, Stream stream)
         {
-#if NET46
-            using (var writer = new XmlTextWriter(stream, null))            
+            using (var writer = new XmlTextWriter(stream, null))
             {
                 writer.Formatting = Formatting.Indented;
                 SerializeToWriter(obj, writer);
             }
-#else
-            using (var writer = XmlWriter.Create(stream))
-            {
-                SerializeToWriter(obj, writer);
-            }
-#endif
         }
 
         /// <summary>
diff --git a/Emby.Common.Implementations/Xml/XmlReaderSettingsFactory.cs b/Emby.Common.Implementations/Xml/XmlReaderSettingsFactory.cs
index 806290cf4..35c266cdb 100644
--- a/Emby.Common.Implementations/Xml/XmlReaderSettingsFactory.cs
+++ b/Emby.Common.Implementations/Xml/XmlReaderSettingsFactory.cs
@@ -11,9 +11,7 @@ namespace Emby.Common.Implementations.Xml
 
             if (!enableValidation)
             {
-#if NET46
                 settings.ValidationType = ValidationType.None;
-#endif
             }
 
             return settings;
diff --git a/Emby.Common.Implementations/packages.config b/Emby.Common.Implementations/packages.config
new file mode 100644
index 000000000..ec0fc45bc
--- /dev/null
+++ b/Emby.Common.Implementations/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="4.4.9" targetFramework="net46" />
+  <package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" />
+  <package id="SharpCompress" version="0.14.0" targetFramework="net462" />
+  <package id="SimpleInjector" version="4.0.7" targetFramework="net462" />
+</packages>
\ No newline at end of file
diff --git a/Emby.Common.Implementations/project.json b/Emby.Common.Implementations/project.json
deleted file mode 100644
index ff60c740e..000000000
--- a/Emby.Common.Implementations/project.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "version": "1.0.0-*",
-
-  "dependencies": {
-
-  },
-
-  "frameworks": {
-    "net46": {
-      "frameworkAssemblies": {
-        "System.Collections": "4.0.0.0",
-        "System.IO": "4.0.0.0",
-        "System.Net": "4.0.0.0",
-        "System.Net.Http": "4.0.0.0",
-        "System.Net.Primitives": "4.0.0.0",
-        "System.Net.Http.WebRequest": "4.0.0.0",
-        "System.Reflection": "4.0.0.0",
-        "System.Runtime": "4.0.0.0",
-        "System.Runtime.Extensions": "4.0.0.0",
-        "System.Text.Encoding": "4.0.0.0",
-        "System.Threading": "4.0.0.0",
-        "System.Threading.Tasks": "4.0.0.0",
-        "System.Xml.ReaderWriter": "4.0.0"
-      },
-      "dependencies": {
-        "SimpleInjector": "3.2.4",
-        "ServiceStack.Text": "4.5.4",
-        "NLog": "4.4.0-betaV15",
-        "sharpcompress": "0.14.0",
-        "MediaBrowser.Model": {
-          "target": "project"
-        },
-        "MediaBrowser.Common": {
-          "target": "project"
-        }
-      }
-    },
-    "netstandard1.6": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "NETStandard.Library": "1.6.1",
-        "System.IO.FileSystem.DriveInfo": "4.3.0",
-        "System.Diagnostics.Process": "4.3.0",
-        "System.Threading.Timer": "4.3.0",
-        "System.Net.Requests": "4.3.0",
-        "System.Xml.ReaderWriter": "4.3.0",
-        "System.Xml.XmlSerializer": "4.3.0",
-        "System.Net.Http": "4.3.2",
-        "System.Net.Primitives": "4.3.0",
-        "System.Net.Sockets": "4.3.0",
-        "System.Net.NetworkInformation": "4.3.0",
-        "System.Net.NameResolution": "4.3.0",
-        "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-        "System.Reflection": "4.3.0",
-        "System.Reflection.Primitives": "4.3.0",
-        "System.Runtime.Loader": "4.3.0",
-        "SimpleInjector": "3.2.4",
-        "ServiceStack.Text.Core": "1.0.27",
-        "NLog": "4.4.0-betaV15",
-        "sharpcompress": "0.14.0",
-		"System.AppDomain": "2.0.11",
-        "MediaBrowser.Model": {
-          "target": "project"
-        },
-        "MediaBrowser.Common": {
-          "target": "project"
-        }
-      }
-    }
-  }
-}