diff --git a/paket.dependencies b/paket.dependencies
index ce268c64..2756db84 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -38,5 +38,4 @@ group Test
 // Locked, because support for .NET 40 and Silverlight 5 are dropped in versions 4.5 +
   nuget Moq 4.2.1510.2205
 
-// Locked, because 4.0.2 has breaking changes. If you have some time you can try to fix it.
-  nuget Unity 4.0.1
\ No newline at end of file
+  nuget Autofac ~> 3.5
diff --git a/paket.lock b/paket.lock
index 0f975452..8e85bc21 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1268,13 +1268,13 @@ NUGET
 GROUP Test
 NUGET
   remote: https://www.nuget.org/api/v2
-    CommonServiceLocator (1.3)
+    Autofac (3.5.2)
     Microsoft.NETCore.Platforms (1.1) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard14)) (>= netstandard16)
-    Microsoft.NETCore.Targets (1.1) - restriction: || (&& (< net20) (< netstandard11) (>= netstandard13) (< win8)) (&& (< net20) (< netstandard12) (>= netstandard13) (< win8)) (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (< net20) (>= netstandard13) (< win8) (< wpa81)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
+    Microsoft.NETCore.Targets (1.1) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
     Microsoft.Win32.Primitives (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     Moq (4.2.1510.2205)
     NETStandard.Library (1.6.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: >= netstandard10
@@ -1338,21 +1338,21 @@ NUGET
     NUnit.Extension.NUnitV2ResultWriter (3.5)
     NUnit.Extension.TeamCityEventListener (1.0.2)
     NUnit.Extension.VSProjectLoader (3.5)
-    runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.native.System (4.3) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+    runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.native.System (4.3) - restriction: || (&& (< net20) (>= netstandard13) (< win8) (< wpa81)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
-    runtime.native.System.IO.Compression (4.3) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (&& (>= dnxcore50) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard16)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+    runtime.native.System.IO.Compression (4.3) - restriction: || (&& (< net20) (>= netstandard13) (< win8) (< wpa81)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
-    runtime.native.System.Net.Http (4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+    runtime.native.System.Net.Http (4.3) - restriction: >= netstandard16
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
-    runtime.native.System.Security.Cryptography.Apple (4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+    runtime.native.System.Security.Cryptography.Apple (4.3) - restriction: >= netstandard16
       runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3)
-    runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+    runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
       runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1)
       runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1)
       runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1)
@@ -1363,120 +1363,120 @@ NUGET
       runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1)
       runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1)
       runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.1)
-    runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-    runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+    runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3) - restriction: >= netstandard16
+    runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+    runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
     System.AppContext (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard16)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    System.Buffers (4.3) - restriction: || (&& (< net20) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= dnxcore50) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard16)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Diagnostics.Debug (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      System.Diagnostics.Tracing (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      System.Threading (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13)) (>= dnxcore50) (>= netstandard16)
+    System.Buffers (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
+      System.Diagnostics.Debug (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< win8) (< wpa81)
+      System.Diagnostics.Tracing (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< win8) (< wpa81)
+      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< win8) (< wpa81)
+      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< win8) (< wpa81)
+      System.Threading (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< win8) (< wpa81)
     System.Collections (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
     System.Collections.Concurrent (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Globalization (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Globalization (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard13) (< win8) (< wpa81)
+      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
     System.Console (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     System.Diagnostics.Debug (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
-    System.Diagnostics.DiagnosticSource (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (&& (>= dnxcore50) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard16)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81))
-      System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81))
-      System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81))
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81))
-      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81))
+    System.Diagnostics.DiagnosticSource (4.3.1) - restriction: || (&& (< net20) (>= netstandard13) (< win8) (< wpa81)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
+      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81))
+      System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81))
+      System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81))
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81))
+      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81))
     System.Diagnostics.Tools (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
     System.Diagnostics.Tracing (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
     System.Globalization (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
     System.Globalization.Calendars (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Globalization (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-    System.Globalization.Extensions (4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Globalization (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-    System.IO (4.3) - restriction: || (&& (< net20) (>= net463)) (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard14)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.Globalization (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+    System.Globalization.Extensions (4.3) - restriction: >= netstandard16
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.Globalization (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+    System.IO (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       System.Text.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
     System.IO.Compression (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      runtime.native.System (>= 4.3) - restriction: && (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      runtime.native.System.IO.Compression (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Buffers (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.IO (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime.InteropServices (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Text.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net45) (>= netstandard13) (< win8) (< wpa81)
+      runtime.native.System (>= 4.3) - restriction: && (< net45) (>= netstandard13) (< win8) (< wpa81)
+      runtime.native.System.IO.Compression (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Buffers (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.IO (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime.InteropServices (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Text.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
     System.IO.Compression.ZipFile (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      System.Buffers (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO.Compression (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO.FileSystem (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO.FileSystem.Primitives (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      System.Buffers (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.IO.Compression (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.IO.FileSystem (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.IO.FileSystem.Primitives (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     System.IO.FileSystem (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO.FileSystem.Primitives (>= 4.3) - restriction: || (>= net46) (&& (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Handles (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Threading.Tasks (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-    System.IO.FileSystem.Primitives (4.3) - restriction: || (&& (< net20) (>= net46)) (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.IO.FileSystem.Primitives (>= 4.3) - restriction: >= netstandard13
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.Handles (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Threading.Tasks (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+    System.IO.FileSystem.Primitives (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     System.Linq (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
       System.Diagnostics.Debug (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
@@ -1502,117 +1502,117 @@ NUGET
       System.Runtime.Extensions (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
       System.Threading (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
     System.Net.Http (4.3.2) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
       Microsoft.Win32.Primitives (>= 4.3) - restriction: && (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)
-      runtime.native.System (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      runtime.native.System.Net.Http (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Diagnostics.DiagnosticSource (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Globalization (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Globalization.Extensions (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+      runtime.native.System (>= 4.3) - restriction: >= netstandard16
+      runtime.native.System.Net.Http (>= 4.3) - restriction: >= netstandard16
+      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: >= netstandard16
+      System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Diagnostics.DiagnosticSource (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Globalization (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Globalization.Extensions (>= 4.3) - restriction: >= netstandard16
+      System.IO (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
       System.IO.Compression (>= 4.3) - restriction: && (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)
-      System.IO.FileSystem (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Net.Primitives (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.InteropServices (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Primitives (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.X509Certificates (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= net46) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Text.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard16) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+      System.IO.FileSystem (>= 4.3) - restriction: >= netstandard16
+      System.Net.Primitives (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= netstandard16)
+      System.Runtime.InteropServices (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: >= netstandard16
+      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= netstandard16)
+      System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: >= netstandard16
+      System.Security.Cryptography.Primitives (>= 4.3) - restriction: >= netstandard16
+      System.Security.Cryptography.X509Certificates (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= net46) (>= dnxcore50) (>= netstandard16)
+      System.Text.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
+      System.Threading.Tasks (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (>= netstandard16)
     System.Net.Primitives (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard10) (< netstandard11) (< win8) (< wp8))
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard10) (< netstandard11) (< win8) (< wp8))
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard10) (< netstandard11) (< win8) (< wp8))
-      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard10) (< netstandard11) (< win8) (< wp8))
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard10) (< netstandard11) (< win8) (< wp8))
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50) (&& (>= netstandard10) (< netstandard11) (< win8) (< wp8))
+      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
     System.Net.Sockets (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Net.Primitives (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Threading.Tasks (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Net.Primitives (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Threading.Tasks (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     System.ObjectModel (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
       System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
-    System.Reflection (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= net462) (>= dnxcore50)) (&& (>= dnxcore50) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard15)) (>= netstandard16)
+    System.Reflection (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       System.IO (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       System.Reflection.Primitives (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
     System.Reflection.Emit (4.3) - restriction: >= netstandard16
-      System.IO (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Reflection.Primitives (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      System.IO (>= 4.3) - restriction: && (< net45) (>= netstandard11)
+      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard11)
+      System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: && (< net45) (>= netstandard11)
+      System.Reflection.Primitives (>= 4.3) - restriction: && (< net45) (>= netstandard11)
+      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard11)
     System.Reflection.Emit.ILGeneration (4.3) - restriction: || (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< wp8)
-      System.Reflection.Primitives (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< wp8)
-      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< wp8)
+      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< wp8)
+      System.Reflection.Primitives (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< wp8)
+      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< wp8)
     System.Reflection.Emit.Lightweight (4.3) - restriction: || (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< wp8)
-      System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< wp8)
-      System.Reflection.Primitives (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< wp8)
-      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< wp8)
+      System.Reflection (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< wp8)
+      System.Reflection.Emit.ILGeneration (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< wp8)
+      System.Reflection.Primitives (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< wp8)
+      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< wp8)
     System.Reflection.Extensions (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
       System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
     System.Reflection.Primitives (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
     System.Reflection.TypeExtensions (4.3) - restriction: || (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      System.Reflection (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard15)) (&& (< net46) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= net462) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard15)) (&& (< net46) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50)
+      System.Reflection (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard15)) (&& (< net46) (>= netstandard15)) (>= net462) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard15)) (&& (< net46) (>= netstandard15)) (>= dnxcore50)
     System.Resources.ResourceManager (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
       System.Globalization (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
       System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)) (>= dnxcore50)
-    System.Runtime (4.3) - restriction: || (&& (< net20) (>= net462)) (&& (< net20) (>= net463)) (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard14)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard14)) (&& (>= dnxcore50) (>= netstandard15)) (>= netstandard16)
+    System.Runtime (4.3) - restriction: || (&& (< net20) (>= net462)) (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard12) (< win8) (< wp8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard12) (< win8) (< wp8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
     System.Runtime.Extensions (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50)
-    System.Runtime.Handles (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard14)) (&& (< net20) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+    System.Runtime.Handles (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     System.Runtime.InteropServices (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50) (>= netcore11)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50) (>= netcore11)
-      System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50) (>= netcore11)
-      System.Reflection.Primitives (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50) (>= netcore11)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= net462) (>= dnxcore50) (>= netcore11)
-      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)) (>= dnxcore50) (>= netcore11)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50) (>= netcore11)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50) (>= netcore11)
+      System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50) (>= netcore11)
+      System.Reflection.Primitives (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50) (>= netcore11)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard12) (< win8)) (&& (< net45) (>= netstandard12) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= net462) (>= dnxcore50) (>= netcore11)
+      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< netstandard15) (< win8) (< wpa81)) (&& (< net45) (>= netstandard15)) (>= dnxcore50) (>= netcore11)
     System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      runtime.native.System (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Reflection.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
-      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)
-      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (>= dnxcore50)
+      runtime.native.System (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< win8) (< wpa81)
+      System.Reflection (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Reflection.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< win8) (< wpa81)) (>= dnxcore50)
+      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net45) (>= netstandard11) (< win8) (< wpa81)
+      System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< win8) (< wpa81)) (>= dnxcore50)
     System.Runtime.Loader (4.3) - restriction: >= netstandard16
       System.IO (>= 4.3) - restriction: && (< net462) (>= netstandard15)
       System.Reflection (>= 4.3) - restriction: && (< net462) (>= netstandard15)
@@ -1622,22 +1622,22 @@ NUGET
       System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard11) (< netstandard13) (< win8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
-    System.Security.Cryptography.Algorithms (4.3) - restriction: || (&& (< net20) (>= net46) (< netstandard14)) (&& (< net20) (>= net461)) (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard14)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      runtime.native.System.Security.Cryptography.Apple (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Collections (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14) (< netstandard16)) (>= net463) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14) (< netstandard16)) (>= net463) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Extensions (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Handles (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.InteropServices (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Numerics (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (>= net463) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (&& (>= net46) (< netstandard14)) (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14) (< netstandard16)) (>= net461) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Text.Encoding (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-    System.Security.Cryptography.Cng (4.3) - restriction: || (&& (>= dnxcore50) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard16)) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+    System.Security.Cryptography.Algorithms (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (>= dnxcore50) (>= netstandard16)
+      runtime.native.System.Security.Cryptography.Apple (>= 4.3) - restriction: >= netstandard16
+      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: >= netstandard16
+      System.Collections (>= 4.3) - restriction: >= netstandard16
+      System.IO (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= net463) (>= dnxcore50) (>= netstandard16)
+      System.Resources.ResourceManager (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= net463) (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Extensions (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Handles (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Runtime.InteropServices (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Numerics (>= 4.3) - restriction: >= netstandard16
+      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (>= net463) (>= dnxcore50) (>= netstandard16)
+      System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (&& (>= net46) (< netstandard14)) (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= net461) (>= dnxcore50) (>= netstandard16)
+      System.Text.Encoding (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+    System.Security.Cryptography.Cng (4.3) - restriction: || (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net46) (>= netstandard14)) (>= netstandard16)
       System.IO (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= netstandard16)
       System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net46) (>= netstandard14)) (>= netstandard16)
@@ -1649,81 +1649,81 @@ NUGET
       System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (&& (< net46) (>= netstandard14)) (>= netstandard16)
       System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (&& (>= net46) (< netstandard14)) (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= net461) (>= netstandard16)
       System.Text.Encoding (>= 4.3) - restriction: || (&& (< net46) (>= netstandard14)) (>= netstandard16)
-    System.Security.Cryptography.Csp (4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Reflection (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Handles (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: || (>= net46) (&& (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (>= net46) (&& (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Threading (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-    System.Security.Cryptography.Encoding (4.3) - restriction: || (&& (< net20) (>= net46) (< netstandard14)) (&& (< net20) (>= net461)) (&& (< net20) (>= net463)) (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard14)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Collections (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Collections.Concurrent (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Linq (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Handles (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Primitives (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-    System.Security.Cryptography.OpenSsl (4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+    System.Security.Cryptography.Csp (4.3) - restriction: >= netstandard16
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Reflection (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.Handles (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: >= netstandard13
+      System.Security.Cryptography.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Security.Cryptography.Primitives (>= 4.3) - restriction: >= netstandard13
+      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Threading (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+    System.Security.Cryptography.Encoding (4.3) - restriction: || (&& (< net20) (>= net463)) (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< net46) (>= netstandard13)
+      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Collections (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Collections.Concurrent (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Linq (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.Extensions (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.Handles (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime.InteropServices (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Security.Cryptography.Primitives (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Text.Encoding (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+    System.Security.Cryptography.OpenSsl (4.3) - restriction: >= netstandard16
       runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: || (>= net463) (>= netstandard16)
-      System.Collections (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: || (>= net463) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: || (>= net463) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Extensions (>= 4.3) - restriction: || (>= net463) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Handles (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.InteropServices (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime.Numerics (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: || (>= net463) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (>= net463) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (>= net463) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Text.Encoding (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      System.Collections (>= 4.3) - restriction: >= netstandard16
+      System.IO (>= 4.3) - restriction: || (>= net463) (>= netstandard16)
+      System.Resources.ResourceManager (>= 4.3) - restriction: >= netstandard16
+      System.Runtime (>= 4.3) - restriction: || (>= net463) (>= netstandard16)
+      System.Runtime.Extensions (>= 4.3) - restriction: || (>= net463) (>= netstandard16)
+      System.Runtime.Handles (>= 4.3) - restriction: >= netstandard16
+      System.Runtime.InteropServices (>= 4.3) - restriction: >= netstandard16
+      System.Runtime.Numerics (>= 4.3) - restriction: >= netstandard16
+      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: || (>= net463) (>= netstandard16)
+      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (>= net463) (>= netstandard16)
+      System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (>= net463) (>= netstandard16)
+      System.Text.Encoding (>= 4.3) - restriction: >= netstandard16
     System.Security.Cryptography.Primitives (4.3) - restriction: || (&& (< net20) (>= net46) (< netstandard14)) (&& (< net20) (>= net461)) (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard14)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      System.Diagnostics.Debug (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Globalization (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Threading (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Threading.Tasks (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      System.Diagnostics.Debug (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Globalization (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.IO (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Resources.ResourceManager (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Threading (>= 4.3) - restriction: && (< net46) (>= netstandard13)
+      System.Threading.Tasks (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     System.Security.Cryptography.X509Certificates (4.3) - restriction: || (&& (< net20) (>= net46)) (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      runtime.native.System (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      runtime.native.System.Net.Http (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Collections (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Diagnostics.Debug (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Globalization (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Globalization.Calendars (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.IO (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.IO.FileSystem (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.IO.FileSystem.Primitives (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Resources.ResourceManager (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14) (< netstandard16)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Extensions (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14) (< netstandard16)) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.InteropServices (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Runtime.Numerics (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: || (&& (>= net46) (< netstandard14)) (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14) (< netstandard16)) (>= net461) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Cng (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.Csp (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (&& (>= net46) (< netstandard14)) (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14) (< netstandard16)) (>= net461) (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: && (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
-      System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Text.Encoding (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
-      System.Threading (>= 4.3) - restriction: || (>= dnxcore50) (&& (>= netstandard16) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac))
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (>= dnxcore50) (>= netstandard16)
+      runtime.native.System (>= 4.3) - restriction: >= netstandard16
+      runtime.native.System.Net.Http (>= 4.3) - restriction: >= netstandard16
+      runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: >= netstandard16
+      System.Collections (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Diagnostics.Debug (>= 4.3) - restriction: >= netstandard16
+      System.Globalization (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Globalization.Calendars (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.IO (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.IO.FileSystem (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.IO.FileSystem.Primitives (>= 4.3) - restriction: >= netstandard16
+      System.Resources.ResourceManager (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Extensions (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Handles (>= 4.3) - restriction: || (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= dnxcore50) (>= netstandard16)
+      System.Runtime.InteropServices (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Runtime.Numerics (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Security.Cryptography.Algorithms (>= 4.3) - restriction: || (&& (>= net46) (< netstandard14)) (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= net461) (>= dnxcore50) (>= netstandard16)
+      System.Security.Cryptography.Cng (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Security.Cryptography.Csp (>= 4.3) - restriction: >= netstandard16
+      System.Security.Cryptography.Encoding (>= 4.3) - restriction: || (&& (>= net46) (< netstandard14)) (&& (< net46) (>= netstandard13) (< netstandard14)) (&& (< net46) (>= netstandard14)) (>= net461) (>= dnxcore50) (>= netstandard16)
+      System.Security.Cryptography.OpenSsl (>= 4.3) - restriction: >= netstandard16
+      System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Text.Encoding (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
+      System.Threading (>= 4.3) - restriction: || (>= dnxcore50) (>= netstandard16)
     System.Text.Encoding (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (< net20) (>= netstandard15)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
@@ -1748,15 +1748,15 @@ NUGET
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
     System.Threading.Tasks.Extensions (4.3) - restriction: || (&& (< net20) (>= netstandard13) (< win8) (< wpa81)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
-      System.Collections (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)
-      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)
-      System.Threading.Tasks (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wp8) (< wpa81)
+      System.Collections (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)
+      System.Runtime (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)
+      System.Threading.Tasks (>= 4.3) - restriction: && (< net45) (>= netstandard10) (< win8) (< wp8) (< wpa81)
     System.Threading.Thread (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac)
+      System.Runtime (>= 4.3) - restriction: && (< net46) (>= netstandard13)
     System.Threading.Timer (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (>= netstandard16)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net451) (>= netstandard12) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win81) (< wpa81)) (>= dnxcore50)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net451) (>= netstandard12) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win81) (< wpa81)) (>= dnxcore50)
-      System.Runtime (>= 4.3) - restriction: || (&& (< net451) (>= netstandard12) (< monoandroid) (< monotouch) (< xamarinios) (< xamarinmac) (< win81) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< net451) (>= netstandard12) (< win81) (< wpa81)) (>= dnxcore50)
+      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< net451) (>= netstandard12) (< win81) (< wpa81)) (>= dnxcore50)
+      System.Runtime (>= 4.3) - restriction: || (&& (< net451) (>= netstandard12) (< win81) (< wpa81)) (>= dnxcore50)
     System.Xml.ReaderWriter (4.3) - restriction: || (&& (< net20) (>= netstandard13)) (&& (>= dnxcore50) (>= netstandard13)) (>= netstandard16)
       System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
@@ -1786,5 +1786,3 @@ NUGET
       System.Text.Encoding (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
       System.Xml.ReaderWriter (>= 4.3) - restriction: || (&& (< net45) (>= netstandard10) (< netstandard13) (< win8) (< wp8) (< wpa81)) (&& (< net45) (>= netstandard13) (< win8) (< wpa81)) (>= dnxcore50)
-    Unity (4.0.1)
-      CommonServiceLocator (>= 1.3)
diff --git a/src/test/Test.RazorEngine.Core/ActivatorTestFixture.cs b/src/test/Test.RazorEngine.Core/ActivatorTestFixture.cs
index a95899a9..39f3f012 100644
--- a/src/test/Test.RazorEngine.Core/ActivatorTestFixture.cs
+++ b/src/test/Test.RazorEngine.Core/ActivatorTestFixture.cs
@@ -14,7 +14,9 @@
     using TestTypes.Activation;
     using Text;
 #if NET45
-    using Microsoft.Practices.Unity;
+    using Autofac;
+    using Autofac.Features.ResolveAnything;
+
     /// <summary>
     /// Defines a test fixture that provides tests for the <see cref="IActivator"/> type.
     /// </summary>
@@ -33,12 +35,14 @@ public void TemplateService_CanSupportCustomActivator_WithUnity()
             Assert.Ignore("We need to add roslyn to generate custom constructors!");
 #endif
 
-            var container = new UnityContainer();
-            container.RegisterType(typeof(ITextFormatter), typeof(ReverseTextFormatter));
-
+            var container = new ContainerBuilder();
+            container.RegisterType<ReverseTextFormatter>()
+                .AsSelf()
+                .As<ITextFormatter>();
+            container.RegisterSource(new AnyConcreteTypeNotAlreadyRegisteredSource());
             var config = new TemplateServiceConfiguration
                              {
-                                 Activator = new UnityTemplateActivator(container),
+                                 Activator = new AutofacTemplateActivator(container.Build()),
                                  BaseTemplateType = typeof(CustomTemplateBase<>)
                              };
 
diff --git a/src/test/Test.RazorEngine.Core/Test.RazorEngine.Core.csproj b/src/test/Test.RazorEngine.Core/Test.RazorEngine.Core.csproj
index 34ce0be5..547c229c 100644
--- a/src/test/Test.RazorEngine.Core/Test.RazorEngine.Core.csproj
+++ b/src/test/Test.RazorEngine.Core/Test.RazorEngine.Core.csproj
@@ -125,7 +125,7 @@
     <Compile Include="TemplateServiceTestFixture.cs" />
     <Compile Include="TestTypes\Activation\ITextFormatter.cs" />
     <Compile Include="TestTypes\Activation\ReverseTextFormatter.cs" />
-    <Compile Include="TestTypes\Activation\UnityTemplateActivator.cs" />
+    <Compile Include="TestTypes\Activation\AutofacTemplateActivator.cs" />
     <Compile Include="TestTypes\Animal.cs" />
     <Compile Include="TestTypes\Activation\CustomTemplateBase.cs" />
     <Compile Include="TestTypes\AnimalViewModel.cs" />
@@ -2044,10 +2044,19 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile259') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
+      <ItemGroup>
+        <Reference Include="Autofac">
+          <HintPath>..\..\..\packages\test\Autofac\lib\net40\Autofac.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile259') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
       <ItemGroup>
-        <Reference Include="Microsoft.Practices.ServiceLocation">
-          <HintPath>..\..\..\packages\test\CommonServiceLocator\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+        <Reference Include="Autofac">
+          <HintPath>..\..\..\packages\test\Autofac\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Autofac.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -2169,62 +2178,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
-      <ItemGroup>
-        <Reference Include="Microsoft.Practices.Unity">
-          <HintPath>..\..\..\packages\test\Unity\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Microsoft.Practices.Unity.Configuration">
-          <HintPath>..\..\..\packages\test\Unity\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention">
-          <HintPath>..\..\..\packages\test\Unity\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
-      <ItemGroup>
-        <Reference Include="Microsoft.Practices.Unity">
-          <HintPath>..\..\..\packages\test\Unity\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETCore'">
-      <ItemGroup>
-        <Reference Include="Microsoft.Practices.Unity">
-          <HintPath>..\..\..\packages\test\Unity\lib\win8\Microsoft.Practices.Unity.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention">
-          <HintPath>..\..\..\packages\test\Unity\lib\win8\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')">
-      <ItemGroup>
-        <Reference Include="Microsoft.Practices.Unity">
-          <HintPath>..\..\..\packages\test\Unity\lib\wp80\Microsoft.Practices.Unity.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention">
-          <HintPath>..\..\..\packages\test\Unity\lib\wp80\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
 </Project>
\ No newline at end of file
diff --git a/src/test/Test.RazorEngine.Core/TestTypes/Activation/UnityTemplateActivator.cs b/src/test/Test.RazorEngine.Core/TestTypes/Activation/AutofacTemplateActivator.cs
similarity index 77%
rename from src/test/Test.RazorEngine.Core/TestTypes/Activation/UnityTemplateActivator.cs
rename to src/test/Test.RazorEngine.Core/TestTypes/Activation/AutofacTemplateActivator.cs
index 9676d2fc..287c7588 100644
--- a/src/test/Test.RazorEngine.Core/TestTypes/Activation/UnityTemplateActivator.cs
+++ b/src/test/Test.RazorEngine.Core/TestTypes/Activation/AutofacTemplateActivator.cs
@@ -2,25 +2,25 @@
 {
     using System;
 #if NET45
-    using Microsoft.Practices.Unity;
+    using Autofac;
 
     using Templating;
 
     /// <summary>
     /// Defines an activator that supports Unity.
     /// </summary>
-    public class UnityTemplateActivator : IActivator
+    public class AutofacTemplateActivator : IActivator
     {
         #region Fields
-        private readonly UnityContainer _container;
+        private readonly IContainer _container;
         #endregion
 
         #region Constructor
         /// <summary>
-        /// Initialises a new instance of <see cref="UnityTemplateActivator"/>.
+        /// Initialises a new instance of <see cref="AutofacTemplateActivator"/>.
         /// </summary>
         /// <param name="container">The unity container.</param>
-        public UnityTemplateActivator(UnityContainer container)
+        public AutofacTemplateActivator(IContainer container)
         {
             if (container == null)
                 throw new ArgumentNullException("container");
diff --git a/src/test/Test.RazorEngine.Core/paket.references b/src/test/Test.RazorEngine.Core/paket.references
index ff62f796..20147c9b 100644
--- a/src/test/Test.RazorEngine.Core/paket.references
+++ b/src/test/Test.RazorEngine.Core/paket.references
@@ -10,4 +10,4 @@ group Razor4
 group Test
   Moq
   NUnit
-  Unity
\ No newline at end of file
+  Autofac
\ No newline at end of file