From fd4546e0b18469f62a06625f55755e539eac1eff Mon Sep 17 00:00:00 2001 From: Martin Sobotka Date: Wed, 3 Jan 2024 13:45:24 +0100 Subject: [PATCH 1/3] Remove build warnings in example apps --- src/HelloSignalR/HelloSignalR.csproj | 2 +- src/SigSpec.Console/SigSpec.Console.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HelloSignalR/HelloSignalR.csproj b/src/HelloSignalR/HelloSignalR.csproj index fcad69b..553bd99 100644 --- a/src/HelloSignalR/HelloSignalR.csproj +++ b/src/HelloSignalR/HelloSignalR.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net8.0 diff --git a/src/SigSpec.Console/SigSpec.Console.csproj b/src/SigSpec.Console/SigSpec.Console.csproj index dc4279e..5382609 100644 --- a/src/SigSpec.Console/SigSpec.Console.csproj +++ b/src/SigSpec.Console/SigSpec.Console.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net8.0 dotnet-sigspec SigSpec From ed829ae376d8be047a6bd8c40bc735f7308fc2d2 Mon Sep 17 00:00:00 2001 From: Martin Sobotka Date: Wed, 3 Jan 2024 13:44:58 +0100 Subject: [PATCH 2/3] Update NJsonSchema dependencies --- .../SigSpec.CodeGeneration.CSharp.csproj | 4 ++-- .../SigSpec.CodeGeneration.TypeScript.csproj | 4 ++-- src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj | 2 +- src/SigSpec.Core/SigSpec.Core.csproj | 5 +++-- src/SigSpec.Core/SigSpecDocument.cs | 2 +- src/SigSpec.Core/SigSpecGeneratorSettings.cs | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/SigSpec.CodeGeneration.CSharp/SigSpec.CodeGeneration.CSharp.csproj b/src/SigSpec.CodeGeneration.CSharp/SigSpec.CodeGeneration.CSharp.csproj index 14865b6..04b191a 100644 --- a/src/SigSpec.CodeGeneration.CSharp/SigSpec.CodeGeneration.CSharp.csproj +++ b/src/SigSpec.CodeGeneration.CSharp/SigSpec.CodeGeneration.CSharp.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj b/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj index 45df2f0..71a7012 100644 --- a/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj +++ b/src/SigSpec.CodeGeneration.TypeScript/SigSpec.CodeGeneration.TypeScript.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj b/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj index 0126f6c..e7b150c 100644 --- a/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj +++ b/src/SigSpec.CodeGeneration/SigSpec.CodeGeneration.csproj @@ -14,7 +14,7 @@ SignalR Specification CodeGeneration - + diff --git a/src/SigSpec.Core/SigSpec.Core.csproj b/src/SigSpec.Core/SigSpec.Core.csproj index 9ba30fd..54fdcbb 100644 --- a/src/SigSpec.Core/SigSpec.Core.csproj +++ b/src/SigSpec.Core/SigSpec.Core.csproj @@ -14,8 +14,9 @@ SignalR Specification CodeGeneration - - + + + \ No newline at end of file diff --git a/src/SigSpec.Core/SigSpecDocument.cs b/src/SigSpec.Core/SigSpecDocument.cs index a8fded1..92a739d 100644 --- a/src/SigSpec.Core/SigSpecDocument.cs +++ b/src/SigSpec.Core/SigSpecDocument.cs @@ -2,9 +2,9 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; using NJsonSchema; -using NJsonSchema.Converters; using System; using System.Collections.Generic; +using NJsonSchema.NewtonsoftJson.Converters; namespace SigSpec.Core { diff --git a/src/SigSpec.Core/SigSpecGeneratorSettings.cs b/src/SigSpec.Core/SigSpecGeneratorSettings.cs index 45bcd2d..17e5895 100644 --- a/src/SigSpec.Core/SigSpecGeneratorSettings.cs +++ b/src/SigSpec.Core/SigSpecGeneratorSettings.cs @@ -1,10 +1,10 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using NJsonSchema.Generation; +using NJsonSchema.NewtonsoftJson.Generation; namespace SigSpec.Core { - public class SigSpecGeneratorSettings : JsonSchemaGeneratorSettings + public class SigSpecGeneratorSettings : NewtonsoftJsonSchemaGeneratorSettings { public SigSpecGeneratorSettings() { From f4e10b139066e91e3403f1f42eea8984dd25cc08 Mon Sep 17 00:00:00 2001 From: Martin Sobotka Date: Tue, 9 Jan 2024 12:54:32 +0100 Subject: [PATCH 3/3] Bump SigSpec.AspNetCore to net8.0 --- src/SigSpec.AspNetCore/SigSpec.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SigSpec.AspNetCore/SigSpec.AspNetCore.csproj b/src/SigSpec.AspNetCore/SigSpec.AspNetCore.csproj index ba6d541..92058f0 100644 --- a/src/SigSpec.AspNetCore/SigSpec.AspNetCore.csproj +++ b/src/SigSpec.AspNetCore/SigSpec.AspNetCore.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net8.0 Rico Suter