diff --git a/docs/client-concepts/connection-pooling/sniffing/address-parsing.asciidoc b/docs/client-concepts/connection-pooling/sniffing/address-parsing.asciidoc
index 327a5a09c1e..f562bb758ab 100644
--- a/docs/client-concepts/connection-pooling/sniffing/address-parsing.asciidoc
+++ b/docs/client-concepts/connection-pooling/sniffing/address-parsing.asciidoc
@@ -15,6 +15,33 @@ please modify the original csharp file found at the link and submit the PR with
[[address-parsing]]
== Address Parsing
+[source,csharp]
+----
+var testcases = new[,]
+{
+ {"helloworld/[::1]:9200", "helloworld", "[::1]", "9200"},
+ {"elastic.co/192.168.2.1:231", "elastic.co", "192.168.2.1", "231"}
+};
+
+var address = testcases[i, 0];
+
+var fqdn = testcases[i, 1];
+
+var ip = testcases[i, 2];
+
+var port = testcases[i, 3];
+
+var match = SniffParser.AddressRegex.Match(address);
+
+match.Success.Should().BeTrue();
+
+match.Groups["fqdn"].Value.ShouldBeEquivalentTo(fqdn);
+
+match.Groups["ip"].Value.ShouldBeEquivalentTo(ip);
+
+match.Groups["port"].Value.ShouldBeEquivalentTo(port);
+----
+
[source,csharp]
----
var testcases = new[,]
diff --git a/paket.dependencies b/paket.dependencies
index 8512afd1719..6ef7b9f2002 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -13,6 +13,7 @@ nuget System.Collections.Immutable
nuget FluentAssertions
nuget Bogus
nuget DiffPlex
+nuget SemanticVersioning
// profiling / benchmarking
nuget JetBrains.Profiler.Kernel.Windows.Api
diff --git a/paket.lock b/paket.lock
index 301e104d7aa..6c23fe7205a 100644
--- a/paket.lock
+++ b/paket.lock
@@ -168,26 +168,26 @@ NUGET
NDesk.Options (0.2.1)
NETStandard.Library (1.6) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard10
- Microsoft.Win32.Primitives (>= 4.0.1) - framework: >= netstandard13
- System.AppContext (>= 4.1) - framework: >= netstandard13
+ Microsoft.Win32.Primitives (>= 4.0.1) - framework: >= net46, >= netstandard13
+ System.AppContext (>= 4.1) - framework: >= net46, >= netstandard13
System.Collections (>= 4.0.11) - framework: >= netstandard10
- System.Collections.Concurrent (>= 4.0.12) - framework: >= netstandard11
- System.Console (>= 4.0) - framework: >= netstandard13
+ System.Collections.Concurrent (>= 4.0.12) - framework: >= net45, >= netstandard11
+ System.Console (>= 4.0) - framework: >= net46, >= netstandard13
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10
System.Diagnostics.Tools (>= 4.0.1) - framework: >= netstandard10
- System.Diagnostics.Tracing (>= 4.1) - framework: >= netstandard11
+ System.Diagnostics.Tracing (>= 4.1) - framework: >= net45, >= netstandard11
System.Globalization (>= 4.0.11) - framework: >= netstandard10
- System.Globalization.Calendars (>= 4.0.1) - framework: >= netstandard13
+ System.Globalization.Calendars (>= 4.0.1) - framework: >= net46, >= netstandard13
System.IO (>= 4.1) - framework: >= netstandard10
- System.IO.Compression (>= 4.1) - framework: >= netstandard11
- System.IO.Compression.ZipFile (>= 4.0.1) - framework: >= netstandard13
- System.IO.FileSystem (>= 4.0.1) - framework: >= netstandard13
- System.IO.FileSystem.Primitives (>= 4.0.1) - framework: >= netstandard13
+ System.IO.Compression (>= 4.1) - framework: >= net45, >= netstandard11
+ System.IO.Compression.ZipFile (>= 4.0.1) - framework: >= net46, >= netstandard13
+ System.IO.FileSystem (>= 4.0.1) - framework: >= net46, >= netstandard13
+ System.IO.FileSystem.Primitives (>= 4.0.1) - framework: >= net46, >= netstandard13
System.Linq (>= 4.1) - framework: >= netstandard10
System.Linq.Expressions (>= 4.1) - framework: >= netstandard10
- System.Net.Http (>= 4.1) - framework: >= netstandard11
+ System.Net.Http (>= 4.1) - framework: >= net45, >= netstandard11
System.Net.Primitives (>= 4.0.11) - framework: >= netstandard10
- System.Net.Sockets (>= 4.1) - framework: >= netstandard13
+ System.Net.Sockets (>= 4.1) - framework: >= net46, >= netstandard13
System.ObjectModel (>= 4.0.12) - framework: >= netstandard10
System.Reflection (>= 4.1) - framework: >= netstandard10
System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard10
@@ -195,20 +195,20 @@ NUGET
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10
System.Runtime (>= 4.1) - framework: >= netstandard10
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10
- System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard13
- System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard11
- System.Runtime.InteropServices.RuntimeInformation (>= 4.0) - framework: >= netstandard11
- System.Runtime.Numerics (>= 4.0.1) - framework: >= netstandard11
- System.Security.Cryptography.Algorithms (>= 4.2) - framework: >= netstandard13
- System.Security.Cryptography.Encoding (>= 4.0) - framework: >= netstandard13
- System.Security.Cryptography.Primitives (>= 4.0) - framework: >= netstandard13
- System.Security.Cryptography.X509Certificates (>= 4.1) - framework: >= netstandard13
+ System.Runtime.Handles (>= 4.0.1) - framework: >= net46, >= netstandard13
+ System.Runtime.InteropServices (>= 4.1) - framework: >= net45, >= netstandard11
+ System.Runtime.InteropServices.RuntimeInformation (>= 4.0) - framework: >= net45, >= netstandard11
+ System.Runtime.Numerics (>= 4.0.1) - framework: >= net45, >= netstandard11
+ System.Security.Cryptography.Algorithms (>= 4.2) - framework: >= net46, >= netstandard13
+ System.Security.Cryptography.Encoding (>= 4.0) - framework: >= net46, >= netstandard13
+ System.Security.Cryptography.Primitives (>= 4.0) - framework: >= net46, >= netstandard13
+ System.Security.Cryptography.X509Certificates (>= 4.1) - framework: >= net46, >= netstandard13
System.Text.Encoding (>= 4.0.11) - framework: >= netstandard10
System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard10
System.Text.RegularExpressions (>= 4.1) - framework: >= netstandard10
System.Threading (>= 4.0.11) - framework: >= netstandard10
System.Threading.Tasks (>= 4.0.11) - framework: >= netstandard10
- System.Threading.Timer (>= 4.0.1) - framework: >= netstandard12
+ System.Threading.Timer (>= 4.0.1) - framework: >= net451, >= netstandard12
System.Xml.ReaderWriter (>= 4.0.11) - framework: >= netstandard10
System.Xml.XDocument (>= 4.0.11) - framework: >= netstandard10
Newtonsoft.Json (9.0.1)
@@ -241,22 +241,24 @@ NUGET
runtime.native.System.IO.Compression (4.1) - framework: >= netstandard13
Microsoft.NETCore.Platforms (>= 1.0.1)
Microsoft.NETCore.Targets (>= 1.0.1)
- runtime.native.System.Net.Http (4.0.1) - framework: >= netstandard15
+ runtime.native.System.Net.Http (4.0.1) - framework: >= netstandard16
Microsoft.NETCore.Platforms (>= 1.0.1)
Microsoft.NETCore.Targets (>= 1.0.1)
runtime.native.System.Security.Cryptography (4.0) - framework: >= netstandard13
Microsoft.NETCore.Platforms (>= 1.0.1)
Microsoft.NETCore.Targets (>= 1.0.1)
+ SemanticVersioning (0.7.6)
+ NETStandard.Library (>= 1.6) - framework: >= netstandard11
ShellProgressBar (3.0)
System.AppContext (4.1) - framework: >= netstandard13
- System.Runtime (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15
+ System.Runtime (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard16
System.Buffers (4.0) - framework: >= netstandard13
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard11
System.Diagnostics.Tracing (>= 4.1) - framework: >= netstandard11
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard11
System.Runtime (>= 4.1) - framework: >= netstandard11
System.Threading (>= 4.0.11) - framework: >= netstandard11
- System.Collections (4.0.11) - framework: >= netstandard10, netcore10
+ System.Collections (4.0.11) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
@@ -288,17 +290,17 @@ NUGET
System.IO (>= 4.1) - framework: >= netstandard13
System.Runtime (>= 4.1) - framework: >= netstandard13
System.Text.Encoding (>= 4.0.11) - framework: >= netstandard13
- System.Diagnostics.Debug (4.0.11) - framework: >= netstandard10, netcore10
+ System.Diagnostics.Debug (4.0.11) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
- System.Diagnostics.DiagnosticSource (4.0) - framework: netstandard13, >= netstandard15
+ System.Diagnostics.DiagnosticSource (4.0) - framework: netstandard13, >= netstandard16
System.Collections (>= 4.0.11) - framework: netstandard11, >= netstandard13
System.Diagnostics.Tracing (>= 4.1) - framework: netstandard11, >= netstandard13
System.Reflection (>= 4.1) - framework: netstandard11, >= netstandard13
System.Runtime (>= 4.1) - framework: netstandard11, >= netstandard13
System.Threading (>= 4.0.11) - framework: netstandard11, >= netstandard13
- System.Diagnostics.Tools (4.0.1) - framework: >= netstandard10, netcore10
+ System.Diagnostics.Tools (4.0.1) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
@@ -322,7 +324,7 @@ NUGET
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard13
System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13
- System.Globalization (4.0.11) - framework: >= netstandard10, netcore10
+ System.Globalization (4.0.11) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
@@ -331,7 +333,7 @@ NUGET
Microsoft.NETCore.Targets (>= 1.0.1) - framework: >= netstandard13
System.Globalization (>= 4.0.11) - framework: >= netstandard13
System.Runtime (>= 4.1) - framework: >= netstandard13
- System.Globalization.Extensions (4.0.1) - framework: >= netstandard15
+ System.Globalization.Extensions (4.0.1) - framework: >= netstandard16
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13
System.Globalization (>= 4.0.11) - framework: >= netstandard13
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard13
@@ -381,58 +383,58 @@ NUGET
System.IO.FileSystem.Primitives (4.0.1) - framework: >= netstandard13
System.Runtime (>= 4.1) - framework: >= netstandard13
System.Linq (4.1) - framework: >= netstandard10, netcore10
- System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard15
- System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard15
- System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard15
+ System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard16
+ System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16
System.Linq.Expressions (4.1) - framework: >= netstandard10
- System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.IO (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Linq (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.ObjectModel (>= 4.0.12) - framework: >= netstandard15
- System.Reflection (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
- System.Reflection.Emit (>= 4.0.1) - framework: >= netstandard15
- System.Reflection.Emit.ILGeneration (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Reflection.Emit.Lightweight (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Reflection.Extensions (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Reflection.TypeExtensions (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
- System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard15
+ System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.IO (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Linq (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.ObjectModel (>= 4.0.12) - framework: >= netstandard16
+ System.Reflection (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16
+ System.Reflection.Emit (>= 4.0.1) - framework: >= netstandard16
+ System.Reflection.Emit.ILGeneration (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Reflection.Emit.Lightweight (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Reflection.Extensions (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Reflection.TypeExtensions (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard16
System.Net.Http (4.1) - framework: >= netstandard11
- Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard13, >= netstandard15
+ Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard13, >= netstandard16
Microsoft.Win32.Primitives (>= 4.0.1) - framework: >= net46, netstandard13
- runtime.native.System (>= 4.0) - framework: >= netstandard15
- runtime.native.System.Net.Http (>= 4.0.1) - framework: >= netstandard15
- runtime.native.System.Security.Cryptography (>= 4.0) - framework: >= netstandard15
- System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Diagnostics.DiagnosticSource (>= 4.0) - framework: >= net46, dnxcore50, netstandard13, >= netstandard15
- System.Diagnostics.Tracing (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Globalization (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Globalization.Extensions (>= 4.0.1) - framework: >= netstandard15
- System.IO (>= 4.1) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard15
+ runtime.native.System (>= 4.0) - framework: >= netstandard16
+ runtime.native.System.Net.Http (>= 4.0.1) - framework: >= netstandard16
+ runtime.native.System.Security.Cryptography (>= 4.0) - framework: >= netstandard16
+ System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Diagnostics.DiagnosticSource (>= 4.0) - framework: >= net46, dnxcore50, netstandard13, >= netstandard16
+ System.Diagnostics.Tracing (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Globalization (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Globalization.Extensions (>= 4.0.1) - framework: >= netstandard16
+ System.IO (>= 4.1) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16
System.IO.Compression (>= 4.1) - framework: netstandard13
- System.IO.FileSystem (>= 4.0.1) - framework: >= netstandard15
- System.Net.Primitives (>= 4.0.11) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard15
- System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Runtime (>= 4.1) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard15
- System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Runtime.Handles (>= 4.0.1) - framework: netstandard13, >= netstandard15
- System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Security.Cryptography.Algorithms (>= 4.2) - framework: >= netstandard15
- System.Security.Cryptography.Encoding (>= 4.0) - framework: >= netstandard15
- System.Security.Cryptography.OpenSsl (>= 4.0) - framework: >= netstandard15
- System.Security.Cryptography.Primitives (>= 4.0) - framework: >= netstandard15
- System.Security.Cryptography.X509Certificates (>= 4.1) - framework: >= net46, dnxcore50, netstandard13, >= netstandard15
- System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard15
- System.Threading (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard15
+ System.IO.FileSystem (>= 4.0.1) - framework: >= netstandard16
+ System.Net.Primitives (>= 4.0.11) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Runtime (>= 4.1) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Runtime.Handles (>= 4.0.1) - framework: netstandard13, >= netstandard16
+ System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Security.Cryptography.Algorithms (>= 4.2) - framework: >= netstandard16
+ System.Security.Cryptography.Encoding (>= 4.0) - framework: >= netstandard16
+ System.Security.Cryptography.OpenSsl (>= 4.0) - framework: >= netstandard16
+ System.Security.Cryptography.Primitives (>= 4.0) - framework: >= netstandard16
+ System.Security.Cryptography.X509Certificates (>= 4.1) - framework: >= net46, dnxcore50, netstandard13, >= netstandard16
+ System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16
+ System.Threading (>= 4.0.11) - framework: dnxcore50, netstandard13, >= netstandard16
+ System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16
System.Net.Primitives (4.0.11) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard11, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard11, >= netstandard13
@@ -499,19 +501,19 @@ NUGET
System.Threading (>= 4.0.11) - framework: netstandard10, netstandard11, >= netstandard13
System.Threading.Tasks (>= 4.0.11) - framework: netstandard10, netstandard11, >= netstandard13
System.Reactive.PlatformServices (3.0)
- System.Collections (>= 4.0.11) - framework: netstandard10, >= netstandard13, netcore10
- System.Diagnostics.Debug (>= 4.0.11) - framework: netstandard10, >= netstandard13, netcore10
- System.Diagnostics.Tools (>= 4.0.1) - framework: netstandard10, >= netstandard13, netcore10
- System.Globalization (>= 4.0.11) - framework: netstandard10, >= netstandard13, netcore10
- System.Reactive.Core (>= 3.0)
- System.Reactive.Interfaces (>= 3.0)
- System.Reflection (>= 4.1) - framework: netstandard10, >= netstandard13, netcore10
- System.Resources.ResourceManager (>= 4.0.1) - framework: netstandard10, >= netstandard13, netcore10
- System.Runtime (>= 4.1) - framework: netstandard10, >= netstandard13, netcore10
- System.Runtime.Extensions (>= 4.1) - framework: netstandard10, >= netstandard13, netcore10
- System.Runtime.InteropServices.WindowsRuntime (>= 4.0.1) - framework: net10, net11, net20, net30, net35, net40, net40-full
- System.Threading (>= 4.0.11) - framework: netstandard10, >= netstandard13, netcore10
- System.Threading.Tasks (>= 4.0.11) - framework: netstandard10, >= netstandard13, netcore10
+ System.Collections (>= 4.0.11) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Diagnostics.Debug (>= 4.0.11) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Diagnostics.Tools (>= 4.0.1) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Globalization (>= 4.0.11) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Reactive.Core (>= 3.0) - framework: net45, >= net46, uap100, netstandard10, >= netstandard13, netcore10, portable-net45+win8+wp8+wpa81, winv4.5.1, wpav8.1
+ System.Reactive.Interfaces (>= 3.0) - framework: net45, >= net46, uap100, netstandard10, >= netstandard13, netcore10, portable-net45+win8+wp8+wpa81, winv4.5.1, wpav8.1
+ System.Reflection (>= 4.1) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Resources.ResourceManager (>= 4.0.1) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Runtime (>= 4.1) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Runtime.Extensions (>= 4.1) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Runtime.InteropServices.WindowsRuntime (>= 4.0.1) - framework: uap100
+ System.Threading (>= 4.0.11) - framework: uap100, netstandard10, >= netstandard13, netcore10
+ System.Threading.Tasks (>= 4.0.11) - framework: uap100, netstandard10, >= netstandard13, netcore10
System.Threading.Thread (>= 4.0) - framework: netcore10
System.Threading.ThreadPool (>= 4.0.10) - framework: netcore10
System.Threading.Timer (>= 4.0.1) - framework: netcore10
@@ -519,11 +521,7 @@ NUGET
System.Reactive.Core (>= 3.0)
System.Reactive.WindowsRuntime (3.0) - framework: winv4.5.1, wpav8.1
System.Reactive.Linq (>= 3.0)
- System.Resources.ResourceManager (>= 4.0.1)
- System.Runtime (>= 4.1)
- System.Runtime.WindowsRuntime (>= 4.0.11)
- System.Threading.Tasks (>= 4.0.11)
- System.Reflection (4.1) - framework: >= netstandard10, netcore10
+ System.Reflection (4.1) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.IO (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
@@ -539,7 +537,7 @@ NUGET
System.Reflection (>= 4.1) - framework: >= netstandard10
System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard10
System.Runtime (>= 4.1) - framework: >= netstandard10
- System.Reflection.Emit.Lightweight (4.0.1) - framework: >= netstandard15
+ System.Reflection.Emit.Lightweight (4.0.1) - framework: >= netstandard16
System.Reflection (>= 4.1) - framework: >= netstandard10
System.Reflection.Emit.ILGeneration (>= 4.0.1) - framework: >= netstandard10, monoandroid, monotouch, xamarinios, xamarinmac
System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard10
@@ -570,18 +568,18 @@ NUGET
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
System.Reflection.TypeExtensions (4.1) - framework: >= netstandard13
- System.Reflection (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15
+ System.Reflection (>= 4.1) - framework: >= net462, dnxcore50, netstandard13, >= netstandard15
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15
- System.Resources.ResourceManager (4.0.1) - framework: >= netstandard10, netcore10, winv4.5.1, wpav8.1
+ System.Resources.ResourceManager (4.0.1) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard10
System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
- System.Runtime (4.1) - framework: >= netstandard10, netcore10, winv4.5.1, wpav8.1
+ System.Runtime (4.1) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15
- System.Runtime.Extensions (4.1) - framework: >= netstandard10, netcore10
+ System.Runtime.Extensions (4.1) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
@@ -594,7 +592,7 @@ NUGET
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Reflection (>= 4.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
- System.Runtime (>= 4.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
+ System.Runtime (>= 4.1) - framework: >= net462, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard15
System.Runtime.InteropServices.RuntimeInformation (4.0) - framework: >= netstandard11
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard11
@@ -604,7 +602,7 @@ NUGET
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard11
System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard11
System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard11
- System.Runtime.InteropServices.WindowsRuntime (4.0.1) - framework: net10, net11, net20, net30, net35, net40, net40-full, netstandard10, netstandard11, >= netstandard13
+ System.Runtime.InteropServices.WindowsRuntime (4.0.1) - framework: uap100, netstandard10, netstandard11, >= netstandard13
System.Runtime.Numerics (4.0.1) - framework: >= netstandard11
System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard13
System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13
@@ -613,34 +611,33 @@ NUGET
System.Runtime.Serialization.Primitives (4.1.1) - framework: >= netstandard10
System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
- System.Runtime.WindowsRuntime (4.0.11) - framework: winv4.5.1, wpav8.1
System.Security.Cryptography.Algorithms (4.2) - framework: >= netstandard13
- Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard15
- runtime.native.System.Security.Cryptography (>= 4.0) - framework: >= netstandard15
- System.Collections (>= 4.0.11) - framework: >= netstandard15
- System.IO (>= 4.1) - framework: dnxcore50, >= netstandard13
- System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard13
- System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Runtime.Numerics (>= 4.0.1) - framework: >= netstandard15
- System.Security.Cryptography.Encoding (>= 4.0) - framework: dnxcore50, >= netstandard15
- System.Security.Cryptography.Primitives (>= 4.0) - framework: net46, >= net461, dnxcore50, >= netstandard13
- System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Security.Cryptography.Cng (4.2) - framework: >= netstandard15
- Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard14
- System.IO (>= 4.1) - framework: >= netstandard13
- System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard14
- System.Runtime (>= 4.1) - framework: >= netstandard13
- System.Runtime.Extensions (>= 4.1) - framework: >= netstandard14
- System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard13
- System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard14
- System.Security.Cryptography.Algorithms (>= 4.2)
- System.Security.Cryptography.Encoding (>= 4.0) - framework: >= netstandard14
- System.Security.Cryptography.Primitives (>= 4.0)
- System.Text.Encoding (>= 4.0.11) - framework: >= netstandard14
- System.Security.Cryptography.Csp (4.0) - framework: >= netstandard15
+ Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard16
+ runtime.native.System.Security.Cryptography (>= 4.0) - framework: >= netstandard16
+ System.Collections (>= 4.0.11) - framework: >= netstandard16
+ System.IO (>= 4.1) - framework: >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime (>= 4.1) - framework: >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime.Numerics (>= 4.0.1) - framework: >= netstandard16
+ System.Security.Cryptography.Encoding (>= 4.0) - framework: >= net463, dnxcore50, >= netstandard16
+ System.Security.Cryptography.Primitives (>= 4.0) - framework: net46, net461, >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16
+ System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Security.Cryptography.Cng (4.2) - framework: >= netstandard16
+ Microsoft.NETCore.Platforms (>= 1.0.1) - framework: netstandard14, >= netstandard16
+ System.IO (>= 4.1) - framework: netstandard13, netstandard14, >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: netstandard14, >= netstandard16
+ System.Runtime (>= 4.1) - framework: netstandard13, netstandard14, >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: netstandard14, >= netstandard16
+ System.Runtime.Handles (>= 4.0.1) - framework: netstandard13, netstandard14, >= netstandard16
+ System.Runtime.InteropServices (>= 4.1) - framework: netstandard14, >= netstandard16
+ System.Security.Cryptography.Algorithms (>= 4.2) - framework: net46, net461, >= net463, netstandard13, netstandard14, >= netstandard16
+ System.Security.Cryptography.Encoding (>= 4.0) - framework: netstandard14, >= netstandard16
+ System.Security.Cryptography.Primitives (>= 4.0) - framework: net46, net461, >= net463, netstandard13, netstandard14, >= netstandard16
+ System.Text.Encoding (>= 4.0.11) - framework: netstandard14, >= netstandard16
+ System.Security.Cryptography.Csp (4.0) - framework: >= netstandard16
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13
System.IO (>= 4.1) - framework: >= netstandard13
System.Reflection (>= 4.1) - framework: >= netstandard13
@@ -667,20 +664,20 @@ NUGET
System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard13
System.Security.Cryptography.Primitives (>= 4.0) - framework: >= netstandard13
System.Text.Encoding (>= 4.0.11) - framework: >= netstandard13
- System.Security.Cryptography.OpenSsl (4.0) - framework: >= netstandard15
+ System.Security.Cryptography.OpenSsl (4.0) - framework: >= netstandard16
runtime.native.System.Security.Cryptography (>= 4.0)
- System.Collections (>= 4.0.11) - framework: >= netstandard15
- System.IO (>= 4.1) - framework: >= netstandard15
- System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard15
- System.Runtime (>= 4.1) - framework: >= netstandard15
- System.Runtime.Extensions (>= 4.1) - framework: >= netstandard15
- System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard15
- System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard15
- System.Runtime.Numerics (>= 4.0.1) - framework: >= netstandard15
- System.Security.Cryptography.Algorithms (>= 4.2) - framework: >= netstandard15
- System.Security.Cryptography.Encoding (>= 4.0) - framework: >= netstandard15
- System.Security.Cryptography.Primitives (>= 4.0) - framework: >= netstandard15
- System.Text.Encoding (>= 4.0.11) - framework: >= netstandard15
+ System.Collections (>= 4.0.11) - framework: >= netstandard16
+ System.IO (>= 4.1) - framework: >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard16
+ System.Runtime (>= 4.1) - framework: >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: >= net463, >= netstandard16
+ System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard16
+ System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard16
+ System.Runtime.Numerics (>= 4.0.1) - framework: >= netstandard16
+ System.Security.Cryptography.Algorithms (>= 4.2) - framework: >= net463, >= netstandard16
+ System.Security.Cryptography.Encoding (>= 4.0) - framework: >= net463, >= netstandard16
+ System.Security.Cryptography.Primitives (>= 4.0) - framework: >= net463, >= netstandard16
+ System.Text.Encoding (>= 4.0.11) - framework: >= netstandard16
System.Security.Cryptography.Primitives (4.0) - framework: >= netstandard13
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard13
System.Globalization (>= 4.0.11) - framework: >= netstandard13
@@ -690,31 +687,31 @@ NUGET
System.Threading (>= 4.0.11) - framework: >= netstandard13
System.Threading.Tasks (>= 4.0.11) - framework: >= netstandard13
System.Security.Cryptography.X509Certificates (4.1) - framework: >= netstandard13
- Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard15
- runtime.native.System (>= 4.0) - framework: >= netstandard15
- runtime.native.System.Net.Http (>= 4.0.1) - framework: >= netstandard15
- runtime.native.System.Security.Cryptography (>= 4.0) - framework: >= netstandard15
- System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard15
- System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Globalization.Calendars (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.IO (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.IO.FileSystem (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.IO.FileSystem.Primitives (>= 4.0.1) - framework: >= netstandard15
- System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard13
- System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, >= netstandard13
- System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Runtime.Numerics (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Security.Cryptography.Algorithms (>= 4.2) - framework: net46, >= net461, dnxcore50, >= netstandard13
- System.Security.Cryptography.Cng (>= 4.2) - framework: dnxcore50, >= netstandard15
- System.Security.Cryptography.Csp (>= 4.0) - framework: >= netstandard15
- System.Security.Cryptography.Encoding (>= 4.0) - framework: net46, >= net461, dnxcore50, >= netstandard13
- System.Security.Cryptography.OpenSsl (>= 4.0) - framework: >= netstandard15
- System.Security.Cryptography.Primitives (>= 4.0) - framework: dnxcore50, >= netstandard15
- System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard15
+ Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard16
+ runtime.native.System (>= 4.0) - framework: >= netstandard16
+ runtime.native.System.Net.Http (>= 4.0.1) - framework: >= netstandard16
+ runtime.native.System.Security.Cryptography (>= 4.0) - framework: >= netstandard16
+ System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard16
+ System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Globalization.Calendars (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.IO (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.IO.FileSystem (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.IO.FileSystem.Primitives (>= 4.0.1) - framework: >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime (>= 4.1) - framework: dnxcore50, netstandard13, netstandard14, >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, netstandard13, netstandard14, >= netstandard16
+ System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime.Numerics (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Security.Cryptography.Algorithms (>= 4.2) - framework: net46, >= net461, dnxcore50, netstandard13, netstandard14, >= netstandard16
+ System.Security.Cryptography.Cng (>= 4.2) - framework: dnxcore50, >= netstandard16
+ System.Security.Cryptography.Csp (>= 4.0) - framework: >= netstandard16
+ System.Security.Cryptography.Encoding (>= 4.0) - framework: net46, >= net461, dnxcore50, netstandard13, netstandard14, >= netstandard16
+ System.Security.Cryptography.OpenSsl (>= 4.0) - framework: >= netstandard16
+ System.Security.Cryptography.Primitives (>= 4.0) - framework: dnxcore50, >= netstandard16
+ System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard16
System.Text.Encoding (4.0.11) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
@@ -725,16 +722,16 @@ NUGET
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
System.Text.RegularExpressions (4.1) - framework: >= netstandard10
- System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard15
- System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
- System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard15
- System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard15
- System.Threading (4.0.11) - framework: >= netstandard10, netcore10
+ System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16
+ System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16
+ System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16
+ System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard16
+ System.Threading (4.0.11) - framework: uap100, >= netstandard10, netcore10
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
- System.Threading.Tasks (4.0.11) - framework: >= netstandard10, netcore10, winv4.5.1, wpav8.1
+ System.Threading.Tasks (4.0.11) - framework: uap100, >= netstandard10, netcore10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
diff --git a/src/Benchmarking/Benchmarking.csproj b/src/Benchmarking/Benchmarking.csproj
index 24fbaed970d..afe7fd308a9 100644
--- a/src/Benchmarking/Benchmarking.csproj
+++ b/src/Benchmarking/Benchmarking.csproj
@@ -93,7 +93,7 @@
..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll
- True
+ False
True
@@ -111,7 +111,7 @@
..\..\packages\System.AppContext\ref\netstandard1.3\System.AppContext.dll
- True
+ False
True
@@ -133,7 +133,7 @@
..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll
- True
+ False
True
@@ -142,7 +142,7 @@
..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
- True
+ False
True
@@ -153,7 +153,7 @@
..\..\packages\System.Collections.Concurrent\ref\netstandard1.1\System.Collections.Concurrent.dll
- True
+ False
True
@@ -162,7 +162,7 @@
..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll
- True
+ False
True
@@ -173,7 +173,7 @@
..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll
- True
+ False
True
@@ -184,7 +184,7 @@
..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
- True
+ False
True
@@ -195,7 +195,7 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -204,14 +204,14 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
- True
+ False
True
-
+
..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -226,7 +226,7 @@
..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll
- True
+ False
True
@@ -237,7 +237,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.1\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -246,7 +246,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.2\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -255,7 +255,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.3\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -264,7 +264,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -275,7 +275,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.0\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -284,7 +284,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -295,7 +295,7 @@
..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll
- True
+ False
True
@@ -304,7 +304,7 @@
..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
- True
+ False
True
@@ -315,18 +315,18 @@
..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
- True
+ False
True
-
+
..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
- True
+ False
True
@@ -337,7 +337,7 @@
..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll
- True
+ False
True
@@ -346,7 +346,7 @@
..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll
- True
+ False
True
@@ -355,7 +355,7 @@
..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
- True
+ False
True
@@ -366,7 +366,7 @@
..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll
- True
+ False
True
@@ -375,7 +375,7 @@
..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll
- True
+ False
True
@@ -386,7 +386,7 @@
..\..\packages\System.IO.Compression.ZipFile\ref\netstandard1.3\System.IO.Compression.ZipFile.dll
- True
+ False
True
@@ -397,7 +397,7 @@
..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
- True
+ False
True
@@ -408,7 +408,7 @@
..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll
- True
+ False
True
@@ -419,7 +419,7 @@
..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll
- True
+ False
True
@@ -428,7 +428,7 @@
..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll
- True
+ False
True
@@ -439,7 +439,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll
- True
+ False
True
@@ -448,7 +448,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll
- True
+ False
True
@@ -457,7 +457,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll
- True
+ False
True
@@ -468,7 +468,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.0\System.Net.Primitives.dll
- True
+ False
True
@@ -477,7 +477,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.1\System.Net.Primitives.dll
- True
+ False
True
@@ -486,7 +486,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll
- True
+ False
True
@@ -497,7 +497,7 @@
..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll
- True
+ False
True
@@ -508,7 +508,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.dll
- True
+ False
True
@@ -517,7 +517,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll
- True
+ False
True
@@ -587,6 +587,15 @@
+
+
+
+ ..\..\packages\System.Reactive.Core\lib\uap10.0\System.Reactive.Core.dll
+ True
+ True
+
+
+
@@ -719,6 +728,15 @@
+
+
+
+ ..\..\packages\System.Reactive.PlatformServices\lib\uap10.0\System.Reactive.PlatformServices.dll
+ True
+ True
+
+
+
@@ -786,7 +804,7 @@
..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll
- True
+ False
True
@@ -795,7 +813,7 @@
..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll
- True
+ False
True
@@ -804,7 +822,7 @@
..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
- True
+ False
True
@@ -815,7 +833,7 @@
..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll
- True
+ False
True
@@ -826,18 +844,18 @@
..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll
- True
+ False
True
-
+
..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll
- True
+ False
True
@@ -848,7 +866,7 @@
..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll
- True
+ False
True
@@ -859,7 +877,7 @@
..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll
- True
+ False
True
@@ -870,7 +888,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -879,7 +897,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -890,7 +908,7 @@
..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll
- True
+ False
True
@@ -901,7 +919,7 @@
..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll
- True
+ False
True
@@ -910,7 +928,7 @@
..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll
- True
+ False
True
@@ -919,7 +937,7 @@
..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll
- True
+ False
True
@@ -928,7 +946,7 @@
..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
- True
+ False
True
@@ -939,7 +957,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll
- True
+ False
True
@@ -948,7 +966,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll
- True
+ False
True
@@ -957,7 +975,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
- True
+ False
True
@@ -968,7 +986,7 @@
..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
- True
+ False
True
@@ -979,7 +997,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -988,7 +1006,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -997,7 +1015,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1006,7 +1024,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1017,7 +1035,7 @@
..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
- True
+ False
True
@@ -1028,7 +1046,7 @@
..\..\packages\System.Runtime.InteropServices.WindowsRuntime\ref\netstandard1.0\System.Runtime.InteropServices.WindowsRuntime.dll
- True
+ False
True
@@ -1039,18 +1057,7 @@
..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll
- True
- True
-
-
-
-
-
-
-
-
- ..\..\packages\System.Runtime.WindowsRuntime\ref\netstandard1.2\System.Runtime.WindowsRuntime.dll
- True
+ False
True
@@ -1061,7 +1068,7 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
@@ -1070,7 +1077,7 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
@@ -1079,38 +1086,29 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
-
-
-
- ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.4\System.Security.Cryptography.Cng.dll
- True
- True
-
-
-
..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
- True
+ False
True
-
+
..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
- True
+ False
True
@@ -1121,7 +1119,7 @@
..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
- True
+ False
True
@@ -1132,7 +1130,7 @@
..\..\packages\System.Security.Cryptography.OpenSsl\ref\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
- True
+ False
True
@@ -1143,7 +1141,7 @@
..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll
- True
+ False
True
@@ -1154,7 +1152,7 @@
..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll
- True
+ False
True
@@ -1163,7 +1161,7 @@
..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
- True
+ False
True
@@ -1174,7 +1172,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll
- True
+ False
True
@@ -1183,7 +1181,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
- True
+ False
True
@@ -1194,7 +1192,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -1203,7 +1201,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -1214,7 +1212,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.0\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -1223,7 +1221,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -1232,7 +1230,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -1243,7 +1241,7 @@
..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll
- True
+ False
True
@@ -1252,7 +1250,7 @@
..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll
- True
+ False
True
@@ -1263,7 +1261,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll
- True
+ False
True
@@ -1272,7 +1270,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
- True
+ False
True
@@ -1294,7 +1292,7 @@
..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll
- True
+ False
True
@@ -1305,7 +1303,7 @@
..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll
- True
+ False
True
@@ -1316,7 +1314,7 @@
..\..\packages\System.Threading.Timer\ref\netstandard1.2\System.Threading.Timer.dll
- True
+ False
True
@@ -1327,7 +1325,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.0\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -1336,7 +1334,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -1347,7 +1345,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.0\System.Xml.XDocument.dll
- True
+ False
True
@@ -1356,7 +1354,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll
- True
+ False
True
diff --git a/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj b/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
index e888b299028..fe27daa2b7e 100644
--- a/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
+++ b/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
@@ -353,7 +353,7 @@
..\..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll
- True
+ False
True
@@ -362,7 +362,7 @@
..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
- True
+ False
True
@@ -373,7 +373,7 @@
..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -382,7 +382,7 @@
..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -393,7 +393,7 @@
..\..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll
- True
+ False
True
@@ -404,7 +404,7 @@
..\..\..\packages\System.Dynamic.Runtime\ref\netstandard1.0\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -413,7 +413,7 @@
..\..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -424,7 +424,7 @@
..\..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll
- True
+ False
True
@@ -433,7 +433,7 @@
..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
- True
+ False
True
@@ -444,7 +444,7 @@
..\..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll
- True
+ False
True
@@ -453,7 +453,7 @@
..\..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll
- True
+ False
True
@@ -462,7 +462,7 @@
..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
- True
+ False
True
@@ -473,7 +473,7 @@
..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
- True
+ False
True
@@ -484,7 +484,7 @@
..\..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll
- True
+ False
True
@@ -495,7 +495,7 @@
..\..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll
- True
+ False
True
@@ -504,7 +504,7 @@
..\..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll
- True
+ False
True
@@ -515,7 +515,7 @@
..\..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll
- True
+ False
True
@@ -524,7 +524,7 @@
..\..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll
- True
+ False
True
@@ -533,7 +533,7 @@
..\..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll
- True
+ False
True
@@ -544,7 +544,7 @@
..\..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.dll
- True
+ False
True
@@ -553,7 +553,7 @@
..\..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll
- True
+ False
True
@@ -564,7 +564,7 @@
..\..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll
- True
+ False
True
@@ -573,7 +573,7 @@
..\..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll
- True
+ False
True
@@ -582,7 +582,7 @@
..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
- True
+ False
True
@@ -593,7 +593,7 @@
..\..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll
- True
+ False
True
@@ -604,18 +604,18 @@
..\..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll
- True
+ False
True
-
+
..\..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll
- True
+ False
True
@@ -626,7 +626,7 @@
..\..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll
- True
+ False
True
@@ -637,7 +637,7 @@
..\..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll
- True
+ False
True
@@ -648,7 +648,7 @@
..\..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -657,7 +657,7 @@
..\..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -668,7 +668,7 @@
..\..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll
- True
+ False
True
@@ -679,7 +679,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll
- True
+ False
True
@@ -688,7 +688,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll
- True
+ False
True
@@ -697,7 +697,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll
- True
+ False
True
@@ -706,7 +706,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
- True
+ False
True
@@ -717,7 +717,7 @@
..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll
- True
+ False
True
@@ -726,7 +726,7 @@
..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll
- True
+ False
True
@@ -735,7 +735,7 @@
..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
- True
+ False
True
@@ -746,7 +746,7 @@
..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
- True
+ False
True
@@ -757,7 +757,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -766,7 +766,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -775,7 +775,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -784,7 +784,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -795,7 +795,7 @@
..\..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.0\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -804,7 +804,7 @@
..\..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -815,7 +815,7 @@
..\..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll
- True
+ False
True
@@ -824,7 +824,7 @@
..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
- True
+ False
True
@@ -835,7 +835,7 @@
..\..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -844,7 +844,7 @@
..\..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -855,7 +855,7 @@
..\..\..\packages\System.Text.RegularExpressions\ref\netstandard1.0\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -864,7 +864,7 @@
..\..\..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -873,7 +873,7 @@
..\..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -884,7 +884,7 @@
..\..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll
- True
+ False
True
@@ -893,7 +893,7 @@
..\..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll
- True
+ False
True
@@ -904,7 +904,7 @@
..\..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll
- True
+ False
True
@@ -913,7 +913,7 @@
..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
- True
+ False
True
@@ -935,7 +935,7 @@
..\..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.0\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -944,7 +944,7 @@
..\..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -955,7 +955,7 @@
..\..\..\packages\System.Xml.XDocument\ref\netstandard1.0\System.Xml.XDocument.dll
- True
+ False
True
@@ -964,7 +964,7 @@
..\..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll
- True
+ False
True
diff --git a/src/CodeGeneration/DocGenerator/DocGenerator.csproj b/src/CodeGeneration/DocGenerator/DocGenerator.csproj
index 01929339887..15b9b0c48ff 100644
--- a/src/CodeGeneration/DocGenerator/DocGenerator.csproj
+++ b/src/CodeGeneration/DocGenerator/DocGenerator.csproj
@@ -128,7 +128,7 @@
..\..\..\packages\Microsoft.CSharp\ref\netstandard1.0\Microsoft.CSharp.dll
- True
+ False
True
@@ -204,7 +204,7 @@
..\..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll
- True
+ False
True
@@ -213,7 +213,7 @@
..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
- True
+ False
True
@@ -244,7 +244,7 @@
..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -253,7 +253,7 @@
..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -264,7 +264,7 @@
..\..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll
- True
+ False
True
@@ -275,7 +275,7 @@
..\..\..\packages\System.Dynamic.Runtime\ref\netstandard1.0\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -284,7 +284,7 @@
..\..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -295,7 +295,7 @@
..\..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll
- True
+ False
True
@@ -304,7 +304,7 @@
..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
- True
+ False
True
@@ -315,7 +315,7 @@
..\..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll
- True
+ False
True
@@ -324,7 +324,7 @@
..\..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll
- True
+ False
True
@@ -333,7 +333,7 @@
..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
- True
+ False
True
@@ -344,7 +344,7 @@
..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
- True
+ False
True
@@ -355,7 +355,7 @@
..\..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll
- True
+ False
True
@@ -366,7 +366,7 @@
..\..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll
- True
+ False
True
@@ -375,7 +375,7 @@
..\..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll
- True
+ False
True
@@ -386,7 +386,7 @@
..\..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll
- True
+ False
True
@@ -395,7 +395,7 @@
..\..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll
- True
+ False
True
@@ -404,7 +404,7 @@
..\..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll
- True
+ False
True
@@ -415,7 +415,7 @@
..\..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.dll
- True
+ False
True
@@ -424,7 +424,7 @@
..\..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll
- True
+ False
True
@@ -435,7 +435,7 @@
..\..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll
- True
+ False
True
@@ -444,7 +444,7 @@
..\..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll
- True
+ False
True
@@ -453,7 +453,7 @@
..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
- True
+ False
True
@@ -464,7 +464,7 @@
..\..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll
- True
+ False
True
@@ -475,18 +475,18 @@
..\..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll
- True
+ False
True
-
+
..\..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll
- True
+ False
True
@@ -497,7 +497,7 @@
..\..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll
- True
+ False
True
@@ -528,7 +528,7 @@
..\..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll
- True
+ False
True
@@ -539,7 +539,7 @@
..\..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -548,7 +548,7 @@
..\..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -559,7 +559,7 @@
..\..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll
- True
+ False
True
@@ -570,7 +570,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll
- True
+ False
True
@@ -579,7 +579,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll
- True
+ False
True
@@ -588,7 +588,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll
- True
+ False
True
@@ -597,7 +597,7 @@
..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
- True
+ False
True
@@ -608,7 +608,7 @@
..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll
- True
+ False
True
@@ -617,7 +617,7 @@
..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll
- True
+ False
True
@@ -626,7 +626,7 @@
..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
- True
+ False
True
@@ -637,7 +637,7 @@
..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
- True
+ False
True
@@ -648,7 +648,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -657,7 +657,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -666,7 +666,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -675,7 +675,7 @@
..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -686,7 +686,7 @@
..\..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.0\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -695,7 +695,7 @@
..\..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -706,7 +706,7 @@
..\..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll
- True
+ False
True
@@ -715,7 +715,7 @@
..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
- True
+ False
True
@@ -726,7 +726,7 @@
..\..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -735,7 +735,7 @@
..\..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -746,7 +746,7 @@
..\..\..\packages\System.Text.RegularExpressions\ref\netstandard1.0\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -755,7 +755,7 @@
..\..\..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -764,7 +764,7 @@
..\..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -775,7 +775,7 @@
..\..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll
- True
+ False
True
@@ -784,7 +784,7 @@
..\..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll
- True
+ False
True
@@ -795,7 +795,7 @@
..\..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll
- True
+ False
True
@@ -804,7 +804,7 @@
..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
- True
+ False
True
@@ -826,7 +826,7 @@
..\..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.0\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -835,7 +835,7 @@
..\..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -846,7 +846,7 @@
..\..\..\packages\System.Xml.XDocument\ref\netstandard1.0\System.Xml.XDocument.dll
- True
+ False
True
@@ -855,7 +855,7 @@
..\..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll
- True
+ False
True
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
index 0eea511494f..9e6637bfe32 100644
--- a/src/Nest/Nest.csproj
+++ b/src/Nest/Nest.csproj
@@ -1497,7 +1497,6 @@
-
@@ -1571,7 +1570,7 @@
..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll
- True
+ False
True
@@ -1580,7 +1579,7 @@
..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
- True
+ False
True
@@ -1591,7 +1590,7 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -1600,7 +1599,7 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -1611,7 +1610,7 @@
..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll
- True
+ False
True
@@ -1622,7 +1621,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.0\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -1631,7 +1630,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -1642,7 +1641,7 @@
..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll
- True
+ False
True
@@ -1651,7 +1650,7 @@
..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
- True
+ False
True
@@ -1662,7 +1661,7 @@
..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll
- True
+ False
True
@@ -1671,7 +1670,7 @@
..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll
- True
+ False
True
@@ -1680,7 +1679,7 @@
..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
- True
+ False
True
@@ -1691,7 +1690,7 @@
..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
- True
+ False
True
@@ -1702,7 +1701,7 @@
..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll
- True
+ False
True
@@ -1713,7 +1712,7 @@
..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll
- True
+ False
True
@@ -1722,7 +1721,7 @@
..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll
- True
+ False
True
@@ -1733,7 +1732,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll
- True
+ False
True
@@ -1742,7 +1741,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll
- True
+ False
True
@@ -1751,7 +1750,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll
- True
+ False
True
@@ -1762,7 +1761,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.dll
- True
+ False
True
@@ -1771,7 +1770,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll
- True
+ False
True
@@ -1782,7 +1781,7 @@
..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll
- True
+ False
True
@@ -1791,7 +1790,7 @@
..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll
- True
+ False
True
@@ -1800,7 +1799,7 @@
..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
- True
+ False
True
@@ -1811,7 +1810,7 @@
..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll
- True
+ False
True
@@ -1822,18 +1821,18 @@
..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll
- True
+ False
True
-
+
..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll
- True
+ False
True
@@ -1844,7 +1843,7 @@
..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll
- True
+ False
True
@@ -1855,7 +1854,7 @@
..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll
- True
+ False
True
@@ -1866,7 +1865,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -1875,7 +1874,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -1886,7 +1885,7 @@
..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll
- True
+ False
True
@@ -1897,7 +1896,7 @@
..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll
- True
+ False
True
@@ -1906,7 +1905,7 @@
..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll
- True
+ False
True
@@ -1915,7 +1914,7 @@
..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll
- True
+ False
True
@@ -1924,7 +1923,7 @@
..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
- True
+ False
True
@@ -1935,7 +1934,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1944,7 +1943,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1953,7 +1952,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1964,7 +1963,7 @@
..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
- True
+ False
True
@@ -1975,7 +1974,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1984,7 +1983,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1993,7 +1992,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -2002,7 +2001,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -2013,7 +2012,7 @@
..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.0\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -2022,7 +2021,7 @@
..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -2033,7 +2032,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll
- True
+ False
True
@@ -2042,7 +2041,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
- True
+ False
True
@@ -2053,7 +2052,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -2062,7 +2061,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -2073,7 +2072,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.0\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -2082,7 +2081,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -2091,7 +2090,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -2102,7 +2101,7 @@
..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll
- True
+ False
True
@@ -2111,7 +2110,7 @@
..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll
- True
+ False
True
@@ -2122,7 +2121,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll
- True
+ False
True
@@ -2131,7 +2130,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
- True
+ False
True
@@ -2153,7 +2152,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.0\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -2162,7 +2161,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -2173,7 +2172,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.0\System.Xml.XDocument.dll
- True
+ False
True
@@ -2182,7 +2181,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll
- True
+ False
True
diff --git a/src/Profiling/Profiling.csproj b/src/Profiling/Profiling.csproj
index 4fc1e6251ed..2866e69da0a 100644
--- a/src/Profiling/Profiling.csproj
+++ b/src/Profiling/Profiling.csproj
@@ -182,6 +182,11 @@
+
+
+ <__paket__xunit_core_props>uap10.0\xunit.core
+
+
<__paket__xunit_core_props>win81\xunit.core
@@ -227,7 +232,7 @@
..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll
- True
+ False
True
@@ -303,7 +308,7 @@
..\..\packages\System.AppContext\ref\netstandard1.3\System.AppContext.dll
- True
+ False
True
@@ -325,7 +330,7 @@
..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll
- True
+ False
True
@@ -334,7 +339,7 @@
..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
- True
+ False
True
@@ -345,7 +350,7 @@
..\..\packages\System.Collections.Concurrent\ref\netstandard1.1\System.Collections.Concurrent.dll
- True
+ False
True
@@ -354,7 +359,7 @@
..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll
- True
+ False
True
@@ -365,7 +370,7 @@
..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll
- True
+ False
True
@@ -376,7 +381,7 @@
..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
- True
+ False
True
@@ -387,7 +392,7 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -396,14 +401,14 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
- True
+ False
True
-
+
..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -418,7 +423,7 @@
..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll
- True
+ False
True
@@ -429,7 +434,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.1\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -438,7 +443,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.2\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -447,7 +452,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.3\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -456,7 +461,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -467,7 +472,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.0\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -476,7 +481,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -487,7 +492,7 @@
..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll
- True
+ False
True
@@ -496,7 +501,7 @@
..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
- True
+ False
True
@@ -507,18 +512,18 @@
..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
- True
+ False
True
-
+
..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
- True
+ False
True
@@ -529,7 +534,7 @@
..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll
- True
+ False
True
@@ -538,7 +543,7 @@
..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll
- True
+ False
True
@@ -547,7 +552,7 @@
..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
- True
+ False
True
@@ -558,7 +563,7 @@
..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll
- True
+ False
True
@@ -567,7 +572,7 @@
..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll
- True
+ False
True
@@ -578,7 +583,7 @@
..\..\packages\System.IO.Compression.ZipFile\ref\netstandard1.3\System.IO.Compression.ZipFile.dll
- True
+ False
True
@@ -589,7 +594,7 @@
..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
- True
+ False
True
@@ -600,7 +605,7 @@
..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll
- True
+ False
True
@@ -611,7 +616,7 @@
..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll
- True
+ False
True
@@ -620,7 +625,7 @@
..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll
- True
+ False
True
@@ -631,7 +636,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll
- True
+ False
True
@@ -640,7 +645,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll
- True
+ False
True
@@ -649,7 +654,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll
- True
+ False
True
@@ -660,7 +665,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.0\System.Net.Primitives.dll
- True
+ False
True
@@ -669,7 +674,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.1\System.Net.Primitives.dll
- True
+ False
True
@@ -678,7 +683,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll
- True
+ False
True
@@ -689,7 +694,7 @@
..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll
- True
+ False
True
@@ -700,7 +705,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.dll
- True
+ False
True
@@ -709,7 +714,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll
- True
+ False
True
@@ -779,6 +784,15 @@
+
+
+
+ ..\..\packages\System.Reactive.Core\lib\uap10.0\System.Reactive.Core.dll
+ True
+ True
+
+
+
@@ -911,6 +925,15 @@
+
+
+
+ ..\..\packages\System.Reactive.PlatformServices\lib\uap10.0\System.Reactive.PlatformServices.dll
+ True
+ True
+
+
+
@@ -978,7 +1001,7 @@
..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll
- True
+ False
True
@@ -987,7 +1010,7 @@
..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll
- True
+ False
True
@@ -996,7 +1019,7 @@
..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
- True
+ False
True
@@ -1007,7 +1030,7 @@
..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll
- True
+ False
True
@@ -1018,18 +1041,18 @@
..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll
- True
+ False
True
-
+
..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll
- True
+ False
True
@@ -1040,7 +1063,7 @@
..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll
- True
+ False
True
@@ -1051,7 +1074,7 @@
..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll
- True
+ False
True
@@ -1062,7 +1085,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -1071,7 +1094,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -1082,7 +1105,7 @@
..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll
- True
+ False
True
@@ -1093,7 +1116,7 @@
..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll
- True
+ False
True
@@ -1102,7 +1125,7 @@
..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll
- True
+ False
True
@@ -1111,7 +1134,7 @@
..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll
- True
+ False
True
@@ -1120,7 +1143,7 @@
..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
- True
+ False
True
@@ -1131,7 +1154,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1140,7 +1163,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1149,7 +1172,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1160,7 +1183,7 @@
..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
- True
+ False
True
@@ -1171,7 +1194,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1180,7 +1203,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1189,7 +1212,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1198,7 +1221,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1209,7 +1232,7 @@
..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
- True
+ False
True
@@ -1220,7 +1243,7 @@
..\..\packages\System.Runtime.InteropServices.WindowsRuntime\ref\netstandard1.0\System.Runtime.InteropServices.WindowsRuntime.dll
- True
+ False
True
@@ -1231,7 +1254,7 @@
..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll
- True
+ False
True
@@ -1242,7 +1265,7 @@
..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.0\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -1251,18 +1274,7 @@
..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll
- True
- True
-
-
-
-
-
-
-
-
- ..\..\packages\System.Runtime.WindowsRuntime\ref\netstandard1.2\System.Runtime.WindowsRuntime.dll
- True
+ False
True
@@ -1273,7 +1285,7 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
@@ -1282,7 +1294,7 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
@@ -1291,38 +1303,29 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
-
-
-
- ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.4\System.Security.Cryptography.Cng.dll
- True
- True
-
-
-
..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
- True
+ False
True
-
+
..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
- True
+ False
True
@@ -1333,7 +1336,7 @@
..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
- True
+ False
True
@@ -1344,7 +1347,7 @@
..\..\packages\System.Security.Cryptography.OpenSsl\ref\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
- True
+ False
True
@@ -1355,7 +1358,7 @@
..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll
- True
+ False
True
@@ -1366,7 +1369,7 @@
..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll
- True
+ False
True
@@ -1375,7 +1378,7 @@
..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
- True
+ False
True
@@ -1386,7 +1389,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll
- True
+ False
True
@@ -1395,7 +1398,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
- True
+ False
True
@@ -1406,7 +1409,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -1415,7 +1418,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -1426,7 +1429,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.0\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -1435,7 +1438,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -1444,7 +1447,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -1455,7 +1458,7 @@
..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll
- True
+ False
True
@@ -1464,7 +1467,7 @@
..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll
- True
+ False
True
@@ -1475,7 +1478,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll
- True
+ False
True
@@ -1484,7 +1487,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
- True
+ False
True
@@ -1506,7 +1509,7 @@
..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll
- True
+ False
True
@@ -1517,7 +1520,7 @@
..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll
- True
+ False
True
@@ -1528,7 +1531,7 @@
..\..\packages\System.Threading.Timer\ref\netstandard1.2\System.Threading.Timer.dll
- True
+ False
True
@@ -1539,7 +1542,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.0\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -1548,7 +1551,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -1559,7 +1562,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.0\System.Xml.XDocument.dll
- True
+ False
True
@@ -1568,7 +1571,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll
- True
+ False
True
diff --git a/src/Tests/Framework/Configuration/Versions/ElasticsearchVersion.cs b/src/Tests/Framework/Configuration/Versions/ElasticsearchVersion.cs
index 2f31964bfd4..b92bee37ac5 100644
--- a/src/Tests/Framework/Configuration/Versions/ElasticsearchVersion.cs
+++ b/src/Tests/Framework/Configuration/Versions/ElasticsearchVersion.cs
@@ -3,10 +3,11 @@
using System.Text.RegularExpressions;
using System.Threading;
using System.Xml.Linq;
+using Version = SemVer.Version;
namespace Tests.Framework.Versions
{
- public class ElasticsearchVersion : SemanticVersion
+ public class ElasticsearchVersion : Version
{
private static readonly Lazy LatestVersion = new Lazy(ResolveLatestVersion, LazyThreadSafetyMode.ExecutionAndPublication);
private static readonly Lazy LatestSnapshot = new Lazy(ResolveLatestSnapshot, LazyThreadSafetyMode.ExecutionAndPublication);
@@ -31,7 +32,7 @@ private static string ResolveLatestVersion()
{
var versions = XElement.Load($"{SonaTypeUrl}/maven-metadata.xml")
.Descendants("version")
- .Select(n => new SemanticVersion(n.Value))
+ .Select(n => new Version(n.Value))
.OrderByDescending(n => n);
return versions.First().ToString();
}
diff --git a/src/Tests/Framework/Configuration/Versions/SemVer.cs b/src/Tests/Framework/Configuration/Versions/SemVer.cs
deleted file mode 100644
index a8639fa0bc8..00000000000
--- a/src/Tests/Framework/Configuration/Versions/SemVer.cs
+++ /dev/null
@@ -1,1267 +0,0 @@
-/*
-Copyright (c) Adam Reeve ("Author")
-All rights reserved.
-
-The BSD License
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-//TODO TAKEN FROM https://github.com/adamreeve/semver.net, we need to be good OSS citizens and open a PR for CoreCLR support
-//With rc2 in such a flux at the moment its best to defer this untill we are ready to move to rc2 ourselves
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace Tests.Framework.Versions
-{
- internal class SemverComparator : IEquatable
- {
- public readonly Operator ComparatorType;
-
- public readonly SemanticVersion Version;
-
- private const string pattern = @"
- \s*
- ([=<>]*) # SemverComparator type (can be empty)
- \s*
- ([0-9a-zA-Z\-\+\.\*]+) # Version (potentially partial version)
- \s*
- ";
-
- public SemverComparator(string input)
- {
- var regex = new Regex(String.Format("^{0}$", pattern),
- RegexOptions.IgnorePatternWhitespace);
- var match = regex.Match(input);
- if (!match.Success)
- {
- throw new ArgumentException(String.Format("Invalid comparator string: {0}", input));
- }
-
- ComparatorType = ParseComparatorType(match.Groups[1].Value);
- var partialVersion = new PartialVersion(match.Groups[2].Value);
-
- if (!partialVersion.IsFull())
- {
- // For Operator.Equal, partial versions are handled by the StarRange
- // desugarer, and desugar to multiple comparators.
-
- switch (ComparatorType)
- {
- // For <= with a partial version, eg. <=1.2.x, this
- // means the same as < 1.3.0, and <=1.x means <2.0
- case Operator.LessThanOrEqual:
- ComparatorType = Operator.LessThan;
- if (!partialVersion.Major.HasValue)
- {
- // <=* means >=0.0.0
- ComparatorType = Operator.GreaterThanOrEqual;
- Version = new SemanticVersion(0, 0, 0);
- }
- else if (!partialVersion.Minor.HasValue)
- {
- Version = new SemanticVersion(partialVersion.Major.Value + 1, 0, 0);
- }
- else
- {
- Version = new SemanticVersion(partialVersion.Major.Value, partialVersion.Minor.Value + 1, 0);
- }
- break;
- case Operator.GreaterThan:
- ComparatorType = Operator.GreaterThanOrEqual;
- if (!partialVersion.Major.HasValue)
- {
- // >* is unsatisfiable, so use <0.0.0
- ComparatorType = Operator.LessThan;
- Version = new SemanticVersion(0, 0, 0);
- }
- else if (!partialVersion.Minor.HasValue)
- {
- // eg. >1.x -> >=2.0
- Version = new SemanticVersion(partialVersion.Major.Value + 1, 0, 0);
- }
- else
- {
- // eg. >1.2.x -> >=1.3
- Version = new SemanticVersion(partialVersion.Major.Value, partialVersion.Minor.Value + 1, 0);
- }
- break;
- default:
- // <1.2.x means <1.2.0
- // >=1.2.x means >=1.2.0
- Version = partialVersion.ToZeroVersion();
- break;
- }
- }
- else
- {
- Version = partialVersion.ToZeroVersion();
- }
- }
-
- public SemverComparator(Operator comparatorType, SemanticVersion comparatorVersion)
- {
- if (comparatorVersion == null)
- {
- throw new NullReferenceException("Null comparator version");
- }
- ComparatorType = comparatorType;
- Version = comparatorVersion;
- }
-
- public static Tuple TryParse(string input)
- {
- var regex = new Regex(String.Format("^{0}", pattern),
- RegexOptions.IgnorePatternWhitespace);
-
- var match = regex.Match(input);
-
- return match.Success ?
- Tuple.Create(
- match.Length,
- new SemverComparator(match.Value))
- : null;
- }
-
- private static Operator ParseComparatorType(string input)
- {
- switch (input)
- {
- case (""):
- case ("="):
- return Operator.Equal;
- case ("<"):
- return Operator.LessThan;
- case ("<="):
- return Operator.LessThanOrEqual;
- case (">"):
- return Operator.GreaterThan;
- case (">="):
- return Operator.GreaterThanOrEqual;
- default:
- throw new ArgumentException(String.Format("Invalid comparator type: {0}", input));
- }
- }
-
- public bool IsSatisfied(SemanticVersion version)
- {
- switch (ComparatorType)
- {
- case (Operator.Equal):
- return version == Version;
- case (Operator.LessThan):
- return version < Version;
- case (Operator.LessThanOrEqual):
- return version <= Version;
- case (Operator.GreaterThan):
- return version > Version;
- case (Operator.GreaterThanOrEqual):
- return version >= Version;
- default:
- throw new InvalidOperationException("SemverComparator type not recognised.");
- }
- }
-
- public enum Operator
- {
- Equal = 0,
- LessThan,
- LessThanOrEqual,
- GreaterThan,
- GreaterThanOrEqual,
- }
-
- public override string ToString()
- {
- string operatorString = null;
- switch (ComparatorType)
- {
- case (Operator.Equal):
- operatorString = "=";
- break;
- case (Operator.LessThan):
- operatorString = "<";
- break;
- case (Operator.LessThanOrEqual):
- operatorString = "<=";
- break;
- case (Operator.GreaterThan):
- operatorString = ">";
- break;
- case (Operator.GreaterThanOrEqual):
- operatorString = ">=";
- break;
- default:
- throw new InvalidOperationException("SemverComparator type not recognised.");
- }
- return String.Format("{0}{1}", operatorString, Version);
- }
-
- public bool Equals(SemverComparator other)
- {
- if (ReferenceEquals(other, null))
- {
- return false;
- }
- return ComparatorType == other.ComparatorType && Version == other.Version;
- }
-
- public override bool Equals(object other)
- {
- return Equals(other as SemverComparator);
- }
-
- public override int GetHashCode()
- {
- return ToString().GetHashCode();
- }
- }
-
- internal static class PreReleaseVersion
- {
- public static int Compare(string a, string b)
- {
- if (a == null && b == null)
- {
- return 0;
- }
- else if (a == null)
- {
- // No pre-release is > having a pre-release version
- return 1;
- }
- else if (b == null)
- {
- return -1;
- }
- else
- {
- foreach (var c in IdentifierComparisons(Identifiers(a), Identifiers(b)))
- {
- if (c != 0)
- {
- return c;
- }
- }
- return 0;
- }
- }
-
- public static string Clean(string input)
- {
- var identifierStrings = Identifiers(input).Select(i => i.Clean());
- return String.Join(".", identifierStrings.ToArray());
- }
-
- private class Identifier
- {
- public bool IsNumeric { get; set; }
- public int IntValue { get; set; }
- public string Value { get; set; }
-
- public Identifier(string input)
- {
- Value = input;
- SetNumeric();
- }
-
- public string Clean()
- {
- return IsNumeric ? IntValue.ToString() : Value;
- }
-
- private void SetNumeric()
- {
- int x;
- bool couldParse = Int32.TryParse(Value, out x);
- IsNumeric = couldParse && x >= 0;
- IntValue = x;
- }
- }
-
- private static IEnumerable Identifiers(string input)
- {
- foreach (var identifier in input.Split('.'))
- {
- yield return new Identifier(identifier);
- }
- }
-
- private static IEnumerable IdentifierComparisons(
- IEnumerable aIdentifiers, IEnumerable bIdentifiers)
- {
- foreach (var identifiers in ZipIdentifiers(aIdentifiers, bIdentifiers))
- {
- var a = identifiers.Item1;
- var b = identifiers.Item2;
- if (a == b)
- {
- yield return 0;
- }
- else if (a == null)
- {
- yield return -1;
- }
- else if (b == null)
- {
- yield return 1;
- }
- else
- {
- if (a.IsNumeric && b.IsNumeric)
- {
- yield return a.IntValue.CompareTo(b.IntValue);
- }
- else if (!a.IsNumeric && !b.IsNumeric)
- {
- yield return String.CompareOrdinal(a.Value, b.Value);
- }
- else if (a.IsNumeric && !b.IsNumeric)
- {
- yield return -1;
- }
- else // !a.IsNumeric && b.IsNumeric
- {
- yield return 1;
- }
- }
- }
- }
-
- // Zip identifier sets until both have been exhausted, returning null
- // for identifier components not in one set.
- private static IEnumerable> ZipIdentifiers(
- IEnumerable first, IEnumerable second)
- {
- using (var ie1 = first.GetEnumerator())
- using (var ie2 = second.GetEnumerator())
- {
- while (ie1.MoveNext())
- {
- if (ie2.MoveNext())
- {
- yield return Tuple.Create(ie1.Current, ie2.Current);
- }
- else
- {
- yield return Tuple.Create(ie1.Current, null);
- }
- }
- while (ie2.MoveNext())
- {
- yield return Tuple.Create(null, ie2.Current);
- }
- }
- }
- }
-
- // A version that might not have a minor or patch
- // number, for use in ranges like "^1.2" or "2.x"
- internal class PartialVersion
- {
- public int? Major { get; set; }
-
- public int? Minor { get; set; }
-
- public int? Patch { get; set; }
-
- public string PreRelease { get; set; }
-
- private static Regex regex = new Regex(@"^
- [v=\s]*
- (\d+|[Xx\*]) # major version
- (
- \.
- (\d+|[Xx\*]) # minor version
- (
- \.
- (\d+|[Xx\*]) # patch version
- (\-?([0-9A-Za-z\-\.]+))? # pre-release version
- (\+([0-9A-Za-z\-\.]+))? # build version (ignored)
- )?
- )?
- $",
- RegexOptions.IgnorePatternWhitespace);
-
- public PartialVersion(string input)
- {
-
- string[] xValues = { "X", "x", "*" };
-
- if (input.Trim() == "")
- {
- // Empty input means any version
- return;
- }
-
- var match = regex.Match(input);
- if (!match.Success)
- {
- throw new ArgumentException(String.Format("Invalid version string: \"{0}\"", input));
- }
-
- if (xValues.Contains(match.Groups[1].Value))
- {
- Major = null;
- }
- else
- {
- Major = Int32.Parse(match.Groups[1].Value);
- }
-
- if (match.Groups[2].Success)
- {
- if (xValues.Contains(match.Groups[3].Value))
- {
- Minor = null;
- }
- else
- {
- Minor = Int32.Parse(match.Groups[3].Value);
- }
- }
-
- if (match.Groups[4].Success)
- {
- if (xValues.Contains(match.Groups[5].Value))
- {
- Patch = null;
- }
- else
- {
- Patch = Int32.Parse(match.Groups[5].Value);
- }
- }
-
- if (match.Groups[6].Success)
- {
- PreRelease = match.Groups[7].Value;
- }
- }
-
- public SemanticVersion ToZeroVersion()
- {
- return new SemanticVersion(
- Major ?? 0,
- Minor ?? 0,
- Patch ?? 0,
- PreRelease);
- }
-
- public bool IsFull()
- {
- return Major.HasValue && Minor.HasValue && Patch.HasValue;
- }
- }
-
- internal static class Desugarer
- {
- private const string versionChars = @"[0-9a-zA-Z\-\+\.\*]";
-
- // Allows patch-level changes if a minor version is specified
- // on the comparator. Allows minor-level changes if not.
- public static Tuple TildeRange(string spec)
- {
- string pattern = String.Format(@"^\s*~\s*({0}+)\s*", versionChars);
-
- var regex = new Regex(pattern);
- var match = regex.Match(spec);
- if (!match.Success)
- {
- return null;
- }
-
- SemanticVersion minVersion = null;
- SemanticVersion maxVersion = null;
-
- var version = new PartialVersion(match.Groups[1].Value);
- if (version.Minor.HasValue)
- {
- // Doesn't matter whether patch version is null or not,
- // the logic is the same, min patch version will be zero if null.
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(version.Major.Value, version.Minor.Value + 1, 0);
- }
- else
- {
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(version.Major.Value + 1, 0, 0);
- }
-
- return Tuple.Create(
- match.Length,
- minMaxComparators(minVersion, maxVersion));
- }
-
- // Allows changes that do not modify the left-most non-zero digit
- // in the [major, minor, patch] tuple.
- public static Tuple CaretRange(string spec)
- {
- string pattern = String.Format(@"^\s*\^\s*({0}+)\s*", versionChars);
-
- var regex = new Regex(pattern);
- var match = regex.Match(spec);
- if (!match.Success)
- {
- return null;
- }
-
- SemanticVersion minVersion = null;
- SemanticVersion maxVersion = null;
-
- var version = new PartialVersion(match.Groups[1].Value);
-
- if (version.Major.Value > 0)
- {
- // Don't allow major version change
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(version.Major.Value + 1, 0, 0);
- }
- else if (!version.Minor.HasValue)
- {
- // Don't allow major version change, even if it's zero
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(version.Major.Value + 1, 0, 0);
- }
- else if (!version.Patch.HasValue)
- {
- // Don't allow minor version change, even if it's zero
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(0, version.Minor.Value + 1, 0);
- }
- else if (version.Minor > 0)
- {
- // Don't allow minor version change
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(0, version.Minor.Value + 1, 0);
- }
- else
- {
- // Only patch non-zero, don't allow patch change
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(0, 0, version.Patch.Value + 1);
- }
-
- return Tuple.Create(
- match.Length,
- minMaxComparators(minVersion, maxVersion));
- }
-
- public static Tuple HyphenRange(string spec)
- {
- string pattern = String.Format(@"^\s*({0}+)\s+\-\s+({0}+)\s*", versionChars);
-
- var regex = new Regex(pattern);
- var match = regex.Match(spec);
- if (!match.Success)
- {
- return null;
- }
-
- PartialVersion minPartialVersion = null;
- PartialVersion maxPartialVersion = null;
-
- // Parse versions from lower and upper ranges, which might
- // be partial versions.
- try
- {
- minPartialVersion = new PartialVersion(match.Groups[1].Value);
- maxPartialVersion = new PartialVersion(match.Groups[2].Value);
- }
- catch (ArgumentException)
- {
- return null;
- }
-
- // Lower range has any non-supplied values replaced with zero
- var minVersion = minPartialVersion.ToZeroVersion();
-
- SemverComparator.Operator maxOperator = maxPartialVersion.IsFull()
- ? SemverComparator.Operator.LessThanOrEqual : SemverComparator.Operator.LessThan;
-
- SemanticVersion maxVersion = null;
-
- // Partial upper range means supplied version values can't change
- if (!maxPartialVersion.Major.HasValue)
- {
- // eg. upper range = "*", then maxVersion remains null
- // and there's only a minimum
- }
- else if (!maxPartialVersion.Minor.HasValue)
- {
- maxVersion = new SemanticVersion(maxPartialVersion.Major.Value + 1, 0, 0);
- }
- else if (!maxPartialVersion.Patch.HasValue)
- {
- maxVersion = new SemanticVersion(maxPartialVersion.Major.Value, maxPartialVersion.Minor.Value + 1, 0);
- }
- else
- {
- // Fully specified max version
- maxVersion = maxPartialVersion.ToZeroVersion();
- }
- return Tuple.Create(
- match.Length,
- minMaxComparators(minVersion, maxVersion, maxOperator));
- }
-
- public static Tuple StarRange(string spec)
- {
- // Also match with an equals sign, eg. "=0.7.x"
- string pattern = String.Format(@"^\s*=?\s*({0}+)\s*", versionChars);
-
- var regex = new Regex(pattern);
- var match = regex.Match(spec);
-
- if (!match.Success)
- {
- return null;
- }
-
- PartialVersion version = null;
- try
- {
- version = new PartialVersion(match.Groups[1].Value);
- }
- catch (ArgumentException)
- {
- return null;
- }
-
- // If partial version match is actually a full version,
- // then this isn't a star range, so return null.
- if (version.IsFull())
- {
- return null;
- }
-
- SemanticVersion minVersion = null;
- SemanticVersion maxVersion = null;
- if (!version.Major.HasValue)
- {
- minVersion = version.ToZeroVersion();
- // no max version
- }
- else if (!version.Minor.HasValue)
- {
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(version.Major.Value + 1, 0, 0);
- }
- else
- {
- minVersion = version.ToZeroVersion();
- maxVersion = new SemanticVersion(version.Major.Value, version.Minor.Value + 1, 0);
- }
-
- return Tuple.Create(
- match.Length,
- minMaxComparators(minVersion, maxVersion));
- }
-
- private static SemverComparator[] minMaxComparators(SemanticVersion minVersion, SemanticVersion maxVersion,
- SemverComparator.Operator maxOperator = SemverComparator.Operator.LessThan)
- {
- var minComparator = new SemverComparator(
- SemverComparator.Operator.GreaterThanOrEqual,
- minVersion);
- if (maxVersion == null)
- {
- return new[] { minComparator };
- }
- else
- {
- var maxComparator = new SemverComparator(
- maxOperator, maxVersion);
- return new[] { minComparator, maxComparator };
- }
- }
- }
-
- internal class ComparatorSet : IEquatable
- {
- private readonly List _comparators;
-
- public ComparatorSet(string spec)
- {
- _comparators = new List { };
-
- spec = spec.Trim();
- if (spec == "")
- {
- spec = "*";
- }
-
- int position = 0;
- int end = spec.Length;
-
- while (position < end)
- {
- int iterStartPosition = position;
-
- // A comparator set might be an advanced range specifier
- // like ~1.2.3, ^1.2, or 1.*.
- // Check for these first before standard comparators:
- foreach (var desugarer in new Func>[] {
- Desugarer.HyphenRange,
- Desugarer.TildeRange,
- Desugarer.CaretRange,
- Desugarer.StarRange,
- })
- {
- var result = desugarer(spec.Substring(position));
- if (result != null)
- {
- position += result.Item1;
- _comparators.AddRange(result.Item2);
- }
- }
-
- // Check for standard comparator with operator and version:
- var comparatorResult = SemverComparator.TryParse(spec.Substring(position));
- if (comparatorResult != null)
- {
- position += comparatorResult.Item1;
- _comparators.Add(comparatorResult.Item2);
- }
-
- if (position == iterStartPosition)
- {
- // Didn't manage to read any valid comparators
- throw new ArgumentException(String.Format("Invalid range specification: \"{0}\"", spec));
- }
- }
- }
-
- public bool IsSatisfied(SemanticVersion version)
- {
- bool satisfied = _comparators.All(c => c.IsSatisfied(version));
- if (version.PreRelease != null)
- {
- // If the version is a pre-release, then one of the
- // comparators must have the same version and also include
- // a pre-release tag.
- return satisfied && _comparators.Any(c =>
- c.Version.PreRelease != null &&
- c.Version.BaseVersion() == version.BaseVersion());
- }
- else
- {
- return satisfied;
- }
- }
-
- public bool Equals(ComparatorSet other)
- {
- if (ReferenceEquals(other, null))
- {
- return false;
- }
- var thisSet = new HashSet(_comparators);
- return thisSet.SetEquals(other._comparators);
- }
-
- public override bool Equals(object other)
- {
- return Equals(other as ComparatorSet);
- }
-
- public override int GetHashCode()
- {
- // XOR is commutative, so this hash code is independent
- // of the order of comparators.
- return _comparators.Aggregate(0, (accum, next) => accum ^ next.GetHashCode());
- }
- }
-
- ///
- /// A semantic version.
- ///
- public class SemanticVersion : IComparable, IEquatable
- {
- private readonly string _inputString;
- private readonly int _major;
- private readonly int _minor;
- private readonly int _patch;
- private readonly string _preRelease;
- private readonly string _build;
-
- ///
- /// The major component of the version.
- ///
- public int Major { get { return _major; } }
-
- ///
- /// The minor component of the version.
- ///
- public int Minor { get { return _minor; } }
-
- ///
- /// The patch component of the version.
- ///
- public int Patch { get { return _patch; } }
-
- ///
- /// The pre-release string, or null for no pre-release version.
- ///
- public string PreRelease { get { return _preRelease; } }
-
- ///
- /// The build string, or null for no build version.
- ///
- public string Build { get { return _build; } }
-
- private static Regex strictRegex = new Regex(@"^
- \s*v?
- (\d+) # major version
- \.
- (\d+) # minor version
- \.
- (\d+) # patch version
- (\-([0-9A-Za-z\-\.]+))? # pre-release version
- (\+([0-9A-Za-z\-\.]+))? # build metadata
- \s*
- $",
- RegexOptions.IgnorePatternWhitespace);
-
- private static Regex looseRegex = new Regex(@"^
- [v=\s]*
- (\d+) # major version
- \.
- (\d+) # minor version
- \.
- (\d+) # patch version
- (\-?([0-9A-Za-z\-\.]+))? # pre-release version
- (\+([0-9A-Za-z\-\.]+))? # build metadata
- \s*
- $",
- RegexOptions.IgnorePatternWhitespace);
-
- ///
- /// Construct a new semantic version from a version string.
- ///
- /// The version string.
- /// When true, be more forgiving of some invalid version specifications.
- /// Thrown when the version string is invalid.
- public SemanticVersion(string input, bool loose = false)
- {
- _inputString = input;
-
- var regex = loose ? looseRegex : strictRegex;
-
- var match = regex.Match(input);
- if (!match.Success)
- {
- throw new ArgumentException(String.Format("Invalid version string: {0}", input));
- }
-
- _major = Int32.Parse(match.Groups[1].Value);
-
- _minor = Int32.Parse(match.Groups[2].Value);
-
- _patch = Int32.Parse(match.Groups[3].Value);
-
- if (match.Groups[4].Success)
- {
- var inputPreRelease = match.Groups[5].Value;
- var cleanedPreRelease = PreReleaseVersion.Clean(inputPreRelease);
- if (!loose && inputPreRelease != cleanedPreRelease)
- {
- throw new ArgumentException(String.Format(
- "Invalid pre-release version: {0}", inputPreRelease));
- }
- _preRelease = cleanedPreRelease;
- }
-
- if (match.Groups[6].Success)
- {
- _build = match.Groups[7].Value;
- }
- }
-
- ///
- /// Construct a new semantic version from version components.
- ///
- /// The major component of the version.
- /// The minor component of the version.
- /// The patch component of the version.
- /// The pre-release version string, or null for no pre-release version.
- /// The build version string, or null for no build version.
- public SemanticVersion(int major, int minor, int patch,
- string preRelease = null, string build = null)
- {
- _major = major;
- _minor = minor;
- _patch = patch;
- _preRelease = preRelease;
- _build = build;
- }
-
- ///
- /// Returns this version without any pre-release or build version.
- ///
- /// The base version
- public SemanticVersion BaseVersion()
- {
- return new SemanticVersion(Major, Minor, Patch);
- }
-
- ///
- /// Returns the original input string the version was constructed from or
- /// the cleaned version if the version was constructed from version components.
- ///
- /// The version string
- public override string ToString()
- {
- return _inputString ?? Clean();
- }
-
- ///
- /// Return a cleaned, normalised version string.
- ///
- /// The cleaned version string.
- public string Clean()
- {
- var preReleaseString = PreRelease == null ? ""
- : String.Format("-{0}", PreReleaseVersion.Clean(PreRelease));
- var buildString = Build == null ? ""
- : String.Format("+{0}", Build);
-
- return String.Format("{0}.{1}.{2}{3}{4}",
- Major, Minor, Patch, preReleaseString, buildString);
- }
-
- ///
- /// Calculate a hash code for the version.
- ///
- public override int GetHashCode()
- {
- // The build version isn't included when calculating the hash,
- // as two versions with equal properties except for the build
- // are considered equal.
-
- unchecked // Allow integer overflow with wrapping
- {
- int hash = 17;
- hash = hash * 23 + Major.GetHashCode();
- hash = hash * 23 + Minor.GetHashCode();
- hash = hash * 23 + Patch.GetHashCode();
- if (PreRelease != null)
- {
- hash = hash * 23 + PreRelease.GetHashCode();
- }
- return hash;
- }
- }
-
- // Implement IEquatable
- ///
- /// Test whether two versions are semantically equivalent.
- ///
- ///
- ///
- public bool Equals(SemanticVersion other)
- {
- if (ReferenceEquals(other, null))
- {
- return false;
- }
- return CompareTo(other) == 0;
- }
-
- // Implement IComparable
- public int CompareTo(SemanticVersion other)
- {
- if (ReferenceEquals(other, null))
- {
- return 1;
- }
-
- foreach (var c in PartComparisons(other))
- {
- if (c != 0)
- {
- return c;
- }
- }
-
- return PreReleaseVersion.Compare(this.PreRelease, other.PreRelease);
- }
-
- private IEnumerable PartComparisons(SemanticVersion other)
- {
- yield return Major.CompareTo(other.Major);
- yield return Minor.CompareTo(other.Minor);
- yield return Patch.CompareTo(other.Patch);
- }
-
- public override bool Equals(object other)
- {
- return Equals(other as SemanticVersion);
- }
-
- public static bool operator ==(SemanticVersion a, SemanticVersion b)
- {
- if (ReferenceEquals(a, null))
- {
- return ReferenceEquals(b, null);
- }
- return a.Equals(b);
- }
-
- public static bool operator !=(SemanticVersion a, SemanticVersion b)
- {
- return !(a == b);
- }
-
- public static bool operator >(SemanticVersion a, SemanticVersion b)
- {
- if (ReferenceEquals(a, null))
- {
- return false;
- }
- return a.CompareTo(b) > 0;
- }
-
- public static bool operator >=(SemanticVersion a, SemanticVersion b)
- {
- if (ReferenceEquals(a, null))
- {
- return ReferenceEquals(b, null) ? true : false;
- }
- return a.CompareTo(b) >= 0;
- }
-
- public static bool operator <(SemanticVersion a, SemanticVersion b)
- {
- if (ReferenceEquals(a, null))
- {
- return ReferenceEquals(b, null) ? false : true;
- }
- return a.CompareTo(b) < 0;
- }
-
- public static bool operator <=(SemanticVersion a, SemanticVersion b)
- {
- if (ReferenceEquals(a, null))
- {
- return true;
- }
- return a.CompareTo(b) <= 0;
- }
- }
-
- ///
- /// Specifies valid versions.
- ///
- public class VersionRange : IEquatable
- {
- private readonly ComparatorSet[] _comparatorSets;
-
- private readonly string _rangeSpec;
-
- ///
- /// Construct a new range from a range specification.
- ///
- /// The range specification string.
- /// When true, be more forgiving of some invalid version specifications.
- /// Thrown when the range specification is invalid.
- public VersionRange(string rangeSpec, bool loose = false)
- {
- _rangeSpec = rangeSpec;
- var comparatorSetSpecs = rangeSpec.Split(new[] { "||" }, StringSplitOptions.None);
- _comparatorSets = comparatorSetSpecs.Select(s => new ComparatorSet(s)).ToArray();
- }
-
- ///
- /// Determine whether the given version satisfies this range.
- ///
- /// The version to check.
- /// true if the range is satisfied by the version.
- public bool IsSatisfied(SemanticVersion version)
- {
- return _comparatorSets.Any(s => s.IsSatisfied(version));
- }
-
- ///
- /// Determine whether the given version satisfies this range.
- /// With an invalid version this method returns false.
- ///
- /// The version to check.
- /// When true, be more forgiving of some invalid version specifications.
- /// true if the range is satisfied by the version.
- public bool IsSatisfied(string versionString, bool loose = false)
- {
- try
- {
- var version = new SemanticVersion(versionString, loose);
- return IsSatisfied(version);
- }
- catch (ArgumentException)
- {
- return false;
- }
- }
-
- ///
- /// Return the set of versions that satisfy this range.
- ///
- /// The versions to check.
- /// An IEnumerable of satisfying versions.
- public IEnumerable Satisfying(IEnumerable versions)
- {
- return versions.Where(IsSatisfied);
- }
-
- ///
- /// Return the set of version strings that satisfy this range.
- /// Invalid version specifications are skipped.
- ///
- /// The version strings to check.
- /// When true, be more forgiving of some invalid version specifications.
- /// An IEnumerable of satisfying version strings.
- public IEnumerable Satisfying(IEnumerable versions, bool loose = false)
- {
- return versions.Where(v => IsSatisfied(v, loose));
- }
-
- ///
- /// Return the maximum version that satisfies this range.
- ///
- /// The versions to select from.
- /// The maximum satisfying version, or null if no versions satisfied this range.
- public SemanticVersion MaxSatisfying(IEnumerable versions)
- {
- return Satisfying(versions).Max();
- }
-
- ///
- /// Return the maximum version that satisfies this range.
- ///
- /// The version strings to select from.
- /// When true, be more forgiving of some invalid version specifications.
- /// The maximum satisfying version string, or null if no versions satisfied this range.
- public string MaxSatisfying(IEnumerable versionStrings, bool loose = false)
- {
- var versions = ValidVersions(versionStrings, loose);
- var maxVersion = MaxSatisfying(versions);
- return maxVersion == null ? null : maxVersion.ToString();
- }
-
- ///
- /// Returns the range specification string used when constructing this range.
- ///
- /// The range string
- public override string ToString()
- {
- return _rangeSpec;
- }
-
- public bool Equals(VersionRange other)
- {
- if (ReferenceEquals(other, null))
- {
- return false;
- }
- var thisSet = new HashSet(_comparatorSets);
- return thisSet.SetEquals(other._comparatorSets);
- }
-
- public override bool Equals(object other)
- {
- return Equals(other as VersionRange);
- }
-
- public override int GetHashCode()
- {
- // XOR is commutative, so this hash code is independent
- // of the order of comparators.
- return _comparatorSets.Aggregate(0, (accum, next) => accum ^ next.GetHashCode());
- }
-
- // Static convenience methods
-
- ///
- /// Determine whether the given version satisfies a given range.
- /// With an invalid version this method returns false.
- ///
- /// The range specification.
- /// The version to check.
- /// When true, be more forgiving of some invalid version specifications.
- /// true if the range is satisfied by the version.
- public static bool IsSatisfied(string rangeSpec, string versionString, bool loose = false)
- {
- var range = new VersionRange(rangeSpec);
- return range.IsSatisfied(versionString);
- }
-
- ///
- /// Return the set of version strings that satisfy a given range.
- /// Invalid version specifications are skipped.
- ///
- /// The range specification.
- /// The version strings to check.
- /// When true, be more forgiving of some invalid version specifications.
- /// An IEnumerable of satisfying version strings.
- public static IEnumerable Satisfying(string rangeSpec, IEnumerable versions, bool loose = false)
- {
- var range = new VersionRange(rangeSpec);
- return range.Satisfying(versions);
- }
-
- ///
- /// Return the maximum version that satisfies a given range.
- ///
- /// The range specification.
- /// The version strings to select from.
- /// When true, be more forgiving of some invalid version specifications.
- /// The maximum satisfying version string, or null if no versions satisfied this range.
- public static string MaxSatisfying(string rangeSpec, IEnumerable versionStrings, bool loose = false)
- {
- var range = new VersionRange(rangeSpec);
- return range.MaxSatisfying(versionStrings);
- }
-
- private IEnumerable ValidVersions(IEnumerable versionStrings, bool loose)
- {
- foreach (var v in versionStrings)
- {
- SemanticVersion version = null;
-
- try
- {
- version = new SemanticVersion(v, loose);
- }
- catch (ArgumentException) { } // Skip
-
- if (version != null)
- {
- yield return version;
- }
- }
- }
- }
-}
diff --git a/src/Tests/Framework/XUnitPlumbing/SkipVersionAttribute.cs b/src/Tests/Framework/XUnitPlumbing/SkipVersionAttribute.cs
index 722ee29deb4..49a419803c3 100644
--- a/src/Tests/Framework/XUnitPlumbing/SkipVersionAttribute.cs
+++ b/src/Tests/Framework/XUnitPlumbing/SkipVersionAttribute.cs
@@ -1,18 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Tests.Framework.Versions;
+using SemVer;
namespace Tests.Framework
{
public class SkipVersionAttribute : Attribute
{
- public IList Ranges { get; }
+ public IList Ranges { get; }
public SkipVersionAttribute(string skipVersionRangesSeparatedByComma, string reason)
{
this.Ranges = skipVersionRangesSeparatedByComma.Split(',')
- .Select(r => new VersionRange(r))
+ .Select(r => new Range(r))
.ToList();
}
}
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
index ab12fa98cce..34399949365 100644
--- a/src/Tests/Tests.csproj
+++ b/src/Tests/Tests.csproj
@@ -388,7 +388,6 @@
-
@@ -763,10 +762,14 @@
-
+
+
+ <__paket__xunit_core_props>uap10.0\xunit.core
+
+
<__paket__xunit_core_props>win81\xunit.core
@@ -901,6 +904,20 @@
+
+
+
+ ..\..\packages\FluentAssertions\lib\uap10.0\FluentAssertions.Core.dll
+ True
+ True
+
+
+ ..\..\packages\FluentAssertions\lib\uap10.0\FluentAssertions.dll
+ True
+ True
+
+
+
@@ -949,7 +966,7 @@
..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll
- True
+ False
True
@@ -1020,12 +1037,35 @@
+
+
+
+
+ ..\..\packages\SemanticVersioning\lib\net45\SemVer.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+ ..\..\packages\SemanticVersioning\lib\netstandard1.1\SemVer.dll
+ True
+ True
+
+
+
+
..\..\packages\System.AppContext\ref\netstandard1.3\System.AppContext.dll
- True
+ False
True
@@ -1047,7 +1087,7 @@
..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll
- True
+ False
True
@@ -1056,7 +1096,7 @@
..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
- True
+ False
True
@@ -1067,7 +1107,7 @@
..\..\packages\System.Collections.Concurrent\ref\netstandard1.1\System.Collections.Concurrent.dll
- True
+ False
True
@@ -1076,7 +1116,7 @@
..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll
- True
+ False
True
@@ -1087,7 +1127,7 @@
..\..\packages\System.ComponentModel\ref\netstandard1.0\System.ComponentModel.dll
- True
+ False
True
@@ -1098,7 +1138,7 @@
..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
- True
+ False
True
@@ -1109,7 +1149,7 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll
- True
+ False
True
@@ -1118,14 +1158,14 @@
..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
- True
+ False
True
-
+
..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -1140,7 +1180,7 @@
..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll
- True
+ False
True
@@ -1151,7 +1191,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.1\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -1160,7 +1200,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.2\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -1169,7 +1209,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.3\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -1178,7 +1218,7 @@
..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
- True
+ False
True
@@ -1189,7 +1229,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.0\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -1198,7 +1238,7 @@
..\..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll
- True
+ False
True
@@ -1209,7 +1249,7 @@
..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll
- True
+ False
True
@@ -1218,7 +1258,7 @@
..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
- True
+ False
True
@@ -1229,18 +1269,18 @@
..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
- True
+ False
True
-
+
..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
- True
+ False
True
@@ -1251,7 +1291,7 @@
..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll
- True
+ False
True
@@ -1260,7 +1300,7 @@
..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll
- True
+ False
True
@@ -1269,7 +1309,7 @@
..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
- True
+ False
True
@@ -1280,7 +1320,7 @@
..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll
- True
+ False
True
@@ -1289,7 +1329,7 @@
..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll
- True
+ False
True
@@ -1300,7 +1340,7 @@
..\..\packages\System.IO.Compression.ZipFile\ref\netstandard1.3\System.IO.Compression.ZipFile.dll
- True
+ False
True
@@ -1311,7 +1351,7 @@
..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
- True
+ False
True
@@ -1322,7 +1362,7 @@
..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll
- True
+ False
True
@@ -1333,7 +1373,7 @@
..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll
- True
+ False
True
@@ -1342,7 +1382,7 @@
..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll
- True
+ False
True
@@ -1353,7 +1393,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.dll
- True
+ False
True
@@ -1362,7 +1402,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll
- True
+ False
True
@@ -1371,7 +1411,7 @@
..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll
- True
+ False
True
@@ -1382,7 +1422,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.0\System.Net.Primitives.dll
- True
+ False
True
@@ -1391,7 +1431,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.1\System.Net.Primitives.dll
- True
+ False
True
@@ -1400,7 +1440,7 @@
..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll
- True
+ False
True
@@ -1411,7 +1451,7 @@
..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll
- True
+ False
True
@@ -1422,7 +1462,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.dll
- True
+ False
True
@@ -1431,7 +1471,7 @@
..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll
- True
+ False
True
@@ -1501,6 +1541,15 @@
+
+
+
+ ..\..\packages\System.Reactive.Core\lib\uap10.0\System.Reactive.Core.dll
+ True
+ True
+
+
+
@@ -1633,6 +1682,15 @@
+
+
+
+ ..\..\packages\System.Reactive.PlatformServices\lib\uap10.0\System.Reactive.PlatformServices.dll
+ True
+ True
+
+
+
@@ -1700,7 +1758,7 @@
..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll
- True
+ False
True
@@ -1709,7 +1767,7 @@
..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll
- True
+ False
True
@@ -1718,7 +1776,7 @@
..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
- True
+ False
True
@@ -1729,7 +1787,7 @@
..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll
- True
+ False
True
@@ -1740,18 +1798,18 @@
..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll
- True
+ False
True
-
+
..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll
- True
+ False
True
@@ -1762,7 +1820,7 @@
..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll
- True
+ False
True
@@ -1773,7 +1831,7 @@
..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll
- True
+ False
True
@@ -1784,7 +1842,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.3\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -1793,7 +1851,7 @@
..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll
- True
+ False
True
@@ -1804,7 +1862,7 @@
..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll
- True
+ False
True
@@ -1815,7 +1873,7 @@
..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll
- True
+ False
True
@@ -1824,7 +1882,7 @@
..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll
- True
+ False
True
@@ -1833,7 +1891,7 @@
..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll
- True
+ False
True
@@ -1842,7 +1900,7 @@
..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
- True
+ False
True
@@ -1853,7 +1911,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1862,7 +1920,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1871,7 +1929,7 @@
..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
- True
+ False
True
@@ -1882,7 +1940,7 @@
..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
- True
+ False
True
@@ -1893,7 +1951,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1902,7 +1960,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1911,7 +1969,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1920,7 +1978,7 @@
..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
- True
+ False
True
@@ -1931,7 +1989,7 @@
..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
- True
+ False
True
@@ -1942,7 +2000,7 @@
..\..\packages\System.Runtime.InteropServices.WindowsRuntime\ref\netstandard1.0\System.Runtime.InteropServices.WindowsRuntime.dll
- True
+ False
True
@@ -1953,7 +2011,7 @@
..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll
- True
+ False
True
@@ -1964,7 +2022,7 @@
..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.0\System.Runtime.Serialization.Primitives.dll
- True
+ False
True
@@ -1973,18 +2031,7 @@
..\..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll
- True
- True
-
-
-
-
-
-
-
-
- ..\..\packages\System.Runtime.WindowsRuntime\ref\netstandard1.2\System.Runtime.WindowsRuntime.dll
- True
+ False
True
@@ -1995,7 +2042,7 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.3\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
@@ -2004,7 +2051,7 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.4\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
@@ -2013,38 +2060,29 @@
..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
- True
+ False
True
-
-
-
- ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.4\System.Security.Cryptography.Cng.dll
- True
- True
-
-
-
..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
- True
+ False
True
-
+
..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
- True
+ False
True
@@ -2055,7 +2093,7 @@
..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
- True
+ False
True
@@ -2066,7 +2104,7 @@
..\..\packages\System.Security.Cryptography.OpenSsl\ref\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
- True
+ False
True
@@ -2077,7 +2115,7 @@
..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll
- True
+ False
True
@@ -2088,7 +2126,7 @@
..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.dll
- True
+ False
True
@@ -2097,7 +2135,7 @@
..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
- True
+ False
True
@@ -2108,7 +2146,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll
- True
+ False
True
@@ -2117,7 +2155,7 @@
..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
- True
+ False
True
@@ -2128,7 +2166,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -2137,7 +2175,7 @@
..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
- True
+ False
True
@@ -2148,7 +2186,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.0\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -2157,7 +2195,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -2166,7 +2204,7 @@
..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll
- True
+ False
True
@@ -2177,7 +2215,7 @@
..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll
- True
+ False
True
@@ -2186,7 +2224,7 @@
..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll
- True
+ False
True
@@ -2197,7 +2235,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll
- True
+ False
True
@@ -2206,7 +2244,7 @@
..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
- True
+ False
True
@@ -2228,7 +2266,7 @@
..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll
- True
+ False
True
@@ -2239,7 +2277,7 @@
..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll
- True
+ False
True
@@ -2250,7 +2288,7 @@
..\..\packages\System.Threading.Timer\ref\netstandard1.2\System.Threading.Timer.dll
- True
+ False
True
@@ -2261,7 +2299,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.0\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -2270,7 +2308,7 @@
..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll
- True
+ False
True
@@ -2281,7 +2319,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.0\System.Xml.XDocument.dll
- True
+ False
True
@@ -2290,7 +2328,7 @@
..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll
- True
+ False
True
diff --git a/src/Tests/paket.references b/src/Tests/paket.references
index 837f018026f..1e06643a993 100644
--- a/src/Tests/paket.references
+++ b/src/Tests/paket.references
@@ -4,4 +4,5 @@ xunit
xunit.abstractions
System.Reactive
Bogus
-DiffPlex
\ No newline at end of file
+DiffPlex
+SemanticVersioning
\ No newline at end of file
diff --git a/src/Tests/project.json b/src/Tests/project.json
index 105ee34774b..df4a828f44f 100644
--- a/src/Tests/project.json
+++ b/src/Tests/project.json
@@ -15,7 +15,8 @@
"Newtonsoft.Json": "9.0.1",
"Rx-Main": "2.3.0-beta2",
"xunit": "2.2.0-beta2-build3300",
- "dotnet-test-xunit": "2.2.0-preview2-build1029"
+ "dotnet-test-xunit": "2.2.0-preview2-build1029",
+ "SemanticVersioning": "0.7.6"
},
"configurations": {
"Debug": {