diff --git a/Directory.Packages.props b/Directory.Packages.props index e4a1dc3..17f22f4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,13 +3,13 @@ true - - - - + + + + - + diff --git a/conformance/CoreControllerServer/Program.cs b/conformance/CoreControllerServer/Program.cs index 1184191..d7005d5 100644 --- a/conformance/CoreControllerServer/Program.cs +++ b/conformance/CoreControllerServer/Program.cs @@ -12,7 +12,7 @@ using var testsJsonReader = new StreamReader(typeof(Program).Assembly.GetManifestResourceStream("CoreControllerServer.ConformanceTests.json")!); return new ConformanceApiService(new ConformanceApiServiceSettings { - Tests = ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd(), SystemTextJsonServiceSerializer.Instance).Tests!, + Tests = ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd()).Tests!, JsonSerializer = SystemTextJsonServiceSerializer.Instance, }); }); diff --git a/conformance/CoreMiddlewareServer/Program.cs b/conformance/CoreMiddlewareServer/Program.cs index 14d822c..b985985 100644 --- a/conformance/CoreMiddlewareServer/Program.cs +++ b/conformance/CoreMiddlewareServer/Program.cs @@ -13,7 +13,7 @@ using var testsJsonReader = new StreamReader(typeof(Program).Assembly.GetManifestResourceStream("CoreMiddlewareServer.ConformanceTests.json")!); return new ConformanceApiService(new ConformanceApiServiceSettings { - Tests = ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd(), SystemTextJsonServiceSerializer.Instance).Tests!, + Tests = ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd()).Tests!, JsonSerializer = SystemTextJsonServiceSerializer.Instance, }); }); diff --git a/conformance/WebApiControllerServer/WebApiControllerServerApp.cs b/conformance/WebApiControllerServer/WebApiControllerServerApp.cs index ebebac5..5167016 100644 --- a/conformance/WebApiControllerServer/WebApiControllerServerApp.cs +++ b/conformance/WebApiControllerServer/WebApiControllerServerApp.cs @@ -42,6 +42,6 @@ public void Configuration(IAppBuilder app) private static IReadOnlyList LoadTests() { using var testsJsonReader = new StreamReader(typeof(WebApiControllerServerApp).Assembly.GetManifestResourceStream("WebApiControllerServer.ConformanceTests.json")!); - return ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd(), JsonSerializer).Tests!; + return ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd()).Tests!; } } diff --git a/conformance/WebApiMiddlewareServer/WebApiMiddlewareServerApp.cs b/conformance/WebApiMiddlewareServer/WebApiMiddlewareServerApp.cs index 5c479c7..41ef66b 100644 --- a/conformance/WebApiMiddlewareServer/WebApiMiddlewareServerApp.cs +++ b/conformance/WebApiMiddlewareServer/WebApiMiddlewareServerApp.cs @@ -39,6 +39,6 @@ public void Configuration(IAppBuilder app) private static IReadOnlyList LoadTests() { using var testsJsonReader = new StreamReader(typeof(WebApiMiddlewareServerApp).Assembly.GetManifestResourceStream("WebApiMiddlewareServer.ConformanceTests.json")!); - return ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd(), JsonSerializer).Tests!; + return ConformanceTestsInfo.FromJson(testsJsonReader.ReadToEnd()).Tests!; } } diff --git a/dotnet-tools.json b/dotnet-tools.json index e3ecf76..c556e80 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,10 +3,11 @@ "isRoot": true, "tools": { "facilityconformance": { - "version": "2.25.0", + "version": "2.28.2", "commands": [ "FacilityConformance" - ] + ], + "rollForward": false } } } \ No newline at end of file