diff --git a/Directory.Packages.props b/Directory.Packages.props index dbb4110b3..4c921923d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,6 +1,7 @@ true + true 2.57.0 @@ -10,9 +11,6 @@ 4.3.1 3.9.0 0.1.12 - - 4.2.2 - 1.4.3 @@ -35,20 +33,18 @@ - - + - + - - - + + @@ -56,8 +52,14 @@ - - - + + + - \ No newline at end of file + + + + + + + diff --git a/NuGet.Config b/NuGet.Config index 1b5b68c2e..626413075 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,16 +1,9 @@  - - - - - - - diff --git a/tests/MagicOnion.Client.SourceGenerator.Tests/MagicOnion.Client.SourceGenerator.Tests.csproj b/tests/MagicOnion.Client.SourceGenerator.Tests/MagicOnion.Client.SourceGenerator.Tests.csproj index 0905a888c..ba3c2d4cc 100644 --- a/tests/MagicOnion.Client.SourceGenerator.Tests/MagicOnion.Client.SourceGenerator.Tests.csproj +++ b/tests/MagicOnion.Client.SourceGenerator.Tests/MagicOnion.Client.SourceGenerator.Tests.csproj @@ -26,7 +26,7 @@ - + diff --git a/tests/MagicOnion.Client.SourceGenerator.Tests/Verifiers/MagicOnionSourceGeneratorVerifier.cs b/tests/MagicOnion.Client.SourceGenerator.Tests/Verifiers/MagicOnionSourceGeneratorVerifier.cs index bc10f06da..db26da004 100644 --- a/tests/MagicOnion.Client.SourceGenerator.Tests/Verifiers/MagicOnionSourceGeneratorVerifier.cs +++ b/tests/MagicOnion.Client.SourceGenerator.Tests/Verifiers/MagicOnionSourceGeneratorVerifier.cs @@ -11,7 +11,6 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.CodeAnalysis.Text; using VerifyCS = MagicOnion.Client.SourceGenerator.Tests.Verifiers.MagicOnionSourceGeneratorVerifier; @@ -78,7 +77,7 @@ public static async Task RunAsync(IEnumerable<(string Path, string Content)> tes await test.RunAsync(); } - internal class Test : CSharpSourceGeneratorTest + internal class Test : CSharpSourceGeneratorTest { readonly string testFile; readonly string testMethod; diff --git a/tests/MagicOnion.Client.SourceGenerator.Unity.Tests/MagicOnion.Client.SourceGenerator.Unity.Tests.csproj b/tests/MagicOnion.Client.SourceGenerator.Unity.Tests/MagicOnion.Client.SourceGenerator.Unity.Tests.csproj index 905609c77..bccae4969 100644 --- a/tests/MagicOnion.Client.SourceGenerator.Unity.Tests/MagicOnion.Client.SourceGenerator.Unity.Tests.csproj +++ b/tests/MagicOnion.Client.SourceGenerator.Unity.Tests/MagicOnion.Client.SourceGenerator.Unity.Tests.csproj @@ -28,7 +28,7 @@ - + diff --git a/tests/MagicOnion.Server.InternalTesting/MagicOnion.Server.InternalTesting.csproj b/tests/MagicOnion.Server.InternalTesting/MagicOnion.Server.InternalTesting.csproj index ac160aa81..f0c9da63a 100644 --- a/tests/MagicOnion.Server.InternalTesting/MagicOnion.Server.InternalTesting.csproj +++ b/tests/MagicOnion.Server.InternalTesting/MagicOnion.Server.InternalTesting.csproj @@ -5,6 +5,9 @@ enable enable false + + true + ..\..\src\MagicOnion\opensource.snk diff --git a/tests/MagicOnion.Server.JsonTranscoding.Tests/UnaryFunctionalTests.cs b/tests/MagicOnion.Server.JsonTranscoding.Tests/UnaryFunctionalTests.cs index 97842b0b8..67213ecfd 100644 --- a/tests/MagicOnion.Server.JsonTranscoding.Tests/UnaryFunctionalTests.cs +++ b/tests/MagicOnion.Server.JsonTranscoding.Tests/UnaryFunctionalTests.cs @@ -55,7 +55,7 @@ public async Task Method_NoParameter_NoResult_IgnoreBody() // Assert var result = default(object); // null Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Equal(result, JsonSerializer.Deserialize(content, JsonSerializerOptions.Web)); + Assert.Equal(result, JsonSerializer.Deserialize(content, new JsonSerializerOptions(JsonSerializerDefaults.Web))); Assert.Equal("application/json", response.Content.Headers.ContentType?.ToString()); Assert.True((bool)factory.Items.GetValueOrDefault($"{nameof(Method_NoParameter_NoResult)}.Called", false)); } @@ -73,7 +73,7 @@ public async Task Method_NoParameter_ResultRefType() // Assert var result = nameof(Method_NoParameter_ResultRefType); // string Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Equal(result, JsonSerializer.Deserialize(content, JsonSerializerOptions.Web)); + Assert.Equal(result, JsonSerializer.Deserialize(content, new JsonSerializerOptions(JsonSerializerDefaults.Web))); Assert.Equal("application/json", response.Content.Headers.ContentType?.ToString()); } @@ -98,7 +98,7 @@ public async Task Method_NoParameter_ResultComplexType() D = 98765432100, E = "Hello!", }, - }, JsonSerializer.Deserialize(content, JsonSerializerOptions.Web)); + }, JsonSerializer.Deserialize(content, new JsonSerializerOptions(JsonSerializerDefaults.Web))); Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal("application/json", response.Content.Headers.ContentType?.ToString()); } @@ -118,7 +118,7 @@ public async Task Method_OneParameter_NoResult() // Assert Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Equal("Alice", JsonSerializer.Deserialize(content, JsonSerializerOptions.Web)); + Assert.Equal("Alice", JsonSerializer.Deserialize(content, new JsonSerializerOptions(JsonSerializerDefaults.Web))); Assert.Equal("application/json", response.Content.Headers.ContentType?.ToString()); } diff --git a/tests/samples/MagicOnionTestServer/MagicOnionTestServer.csproj b/tests/samples/MagicOnionTestServer/MagicOnionTestServer.csproj index ccd3af8bb..96bb8a0be 100644 --- a/tests/samples/MagicOnionTestServer/MagicOnionTestServer.csproj +++ b/tests/samples/MagicOnionTestServer/MagicOnionTestServer.csproj @@ -4,6 +4,9 @@ net8.0 enable enable + + true + ..\..\..\src\MagicOnion\opensource.snk