diff --git a/build/dependencies.props b/build/dependencies.props index 17b9f395ac..94bf472e66 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -10,7 +10,15 @@ 4.7.1 $(BundledNETStandardPackageVersion) 1.2.3 - 15.0.0 - 2.2.0 + 15.3.0-* + 2.3.0-beta2-* + + + $(NoWarn);AD0001 + diff --git a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs index 24e5a3425f..68c7aaa065 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs @@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests var ex = await Assert.ThrowsAnyAsync( async () => await connection.Invoke("!@#$%")); - Assert.Equal(ex.Message, "Unknown hub method '!@#$%'"); + Assert.Equal("Unknown hub method '!@#$%'", ex.Message); } finally { diff --git a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj index ebdd46a343..d55d759ce5 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj @@ -4,9 +4,6 @@ netcoreapp2.0 - - true - true @@ -29,8 +26,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ConnectionTests.cs index c684ba7a91..ece53d7a5c 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ConnectionTests.cs @@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Sockets.Client.Tests } [Theory] - [InlineData(0)] + [InlineData((TransportType)0)] [InlineData(TransportType.All + 1)] public async Task CannotStartConnectionWithInvalidTransportType(TransportType requestedTransportType) { diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index 74835160db..1b5d2e0f51 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -4,9 +4,6 @@ netcoreapp2.0 - - true - true @@ -25,8 +22,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TaskQueueTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TaskQueueTests.cs index d74c9ca2cc..f6765fc7bc 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TaskQueueTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TaskQueueTests.cs @@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Client.Tests }); task.Wait(); - Assert.Equal(n, 2); + Assert.Equal(2, n); } } } diff --git a/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj index d06c98408d..efab05e118 100644 --- a/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj @@ -5,9 +5,6 @@ netcoreapp2.0;net46 netcoreapp2.0 - - true - true @@ -24,8 +21,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs index e445f2876c..fa4920dad2 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests public class DefaultTransportFactoryTests { [Theory] - [InlineData(0)] + [InlineData((TransportType)0)] [InlineData(TransportType.All + 1)] public void DefaultTransportFactoryCannotBeCreatedWithInvalidTransportType(TransportType transportType) { @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests var exception = Assert.Throws( () => new DefaultTransportFactory(TransportType.All, new LoggerFactory(), httpClient: null)); - Assert.Equal(exception.ParamName, "httpClient"); + Assert.Equal("httpClient", exception.ParamName); } [ConditionalTheory] diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj index c279dcf6bb..3f781d5455 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -4,11 +4,6 @@ netcoreapp2.0 - - true - true - - Exe @@ -36,8 +31,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Sockets.Common.Tests/Microsoft.AspNetCore.Sockets.Common.Tests.csproj b/test/Microsoft.AspNetCore.Sockets.Common.Tests/Microsoft.AspNetCore.Sockets.Common.Tests.csproj index b8ae849b14..c9f319a0a8 100644 --- a/test/Microsoft.AspNetCore.Sockets.Common.Tests/Microsoft.AspNetCore.Sockets.Common.Tests.csproj +++ b/test/Microsoft.AspNetCore.Sockets.Common.Tests/Microsoft.AspNetCore.Sockets.Common.Tests.csproj @@ -4,9 +4,6 @@ netcoreapp2.0 - - true - true @@ -21,8 +18,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs b/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs index 574f22a152..46df967d5e 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs +++ b/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs @@ -178,7 +178,7 @@ namespace Microsoft.AspNetCore.Sockets.Tests Assert.NotNull(state.Connection.Transport); await state.DisposeAsync(); - Assert.Equal(state.Status, ConnectionState.ConnectionStatus.Disposed); + Assert.Equal(ConnectionState.ConnectionStatus.Disposed, state.Status); } private static ConnectionManager CreateConnectionManager() diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj b/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj index 0f22dc0587..1942a84b66 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj +++ b/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj @@ -4,9 +4,6 @@ netcoreapp2.0 - - true - true @@ -25,8 +22,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.csproj b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.csproj index 7f68d57dbf..96068784f3 100644 --- a/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.csproj +++ b/test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.csproj @@ -1,11 +1,11 @@ + + netcoreapp2.0 - - true - true + @@ -17,8 +17,5 @@ - - - - - + + diff --git a/test/Microsoft.Extensions.WebSockets.Internal.Tests/Microsoft.Extensions.WebSockets.Internal.Tests.csproj b/test/Microsoft.Extensions.WebSockets.Internal.Tests/Microsoft.Extensions.WebSockets.Internal.Tests.csproj index a8f1ff2575..4addad53ee 100644 --- a/test/Microsoft.Extensions.WebSockets.Internal.Tests/Microsoft.Extensions.WebSockets.Internal.Tests.csproj +++ b/test/Microsoft.Extensions.WebSockets.Internal.Tests/Microsoft.Extensions.WebSockets.Internal.Tests.csproj @@ -4,9 +4,6 @@ netcoreapp2.0 - - true - true @@ -22,8 +19,4 @@ - - - -