From 0e65f32d2c303448846682002667a7a7f1439d2a Mon Sep 17 00:00:00 2001 From: Rico Suter Date: Sun, 20 Aug 2023 19:48:57 +0200 Subject: [PATCH] improve projects --- build/_build.csproj | 2 +- .../NJsonSchema.Benchmark.csproj | 8 ++- ...nSchema.CodeGeneration.CSharp.Tests.csproj | 33 +++++----- .../NJsonSchema.CodeGeneration.CSharp.csproj | 21 +++---- .../NJsonSchema.CodeGeneration.Tests.csproj | 63 ++++++++++--------- ...ema.CodeGeneration.TypeScript.Tests.csproj | 5 ++ ...sonSchema.CodeGeneration.TypeScript.csproj | 11 +++- .../NJsonSchema.CodeGeneration.csproj | 7 +++ src/NJsonSchema.Demo/NJsonSchema.Demo.csproj | 4 ++ .../NJsonSchema.NewtonsoftJson.csproj | 63 ++++++++++--------- .../NJsonSchema.Yaml.Tests.csproj | 5 ++ src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj | 5 ++ src/NJsonSchema/NJsonSchema.csproj | 6 ++ 13 files changed, 146 insertions(+), 87 deletions(-) diff --git a/build/_build.csproj b/build/_build.csproj index 404b1b33f..0f1499535 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj b/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj index 10af23dda..ccc70989b 100644 --- a/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj +++ b/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj @@ -1,13 +1,16 @@  + net6.0 false $(NoWarn),xUnit1013 false + + @@ -16,9 +19,11 @@ + - + + @@ -26,4 +31,5 @@ + diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj index eacb79347..539e99341 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj @@ -1,24 +1,29 @@  + - net6.0 - false - true - $(NoWarn),1587,1998,1591,618,SYSLIB0012 + net6.0 + false + true + $(NoWarn),1587,1998,1591,618,SYSLIB0012 + - + + - - - - - + + + + + + - - - - + + + + + diff --git a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj index a1f89977e..0b7defd4d 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj +++ b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj @@ -1,39 +1,38 @@  + netstandard2.0;net461 - - bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + + + + + + - - - - - - - - - + + EnumExtensions.cs + \ No newline at end of file diff --git a/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj b/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj index f582586e8..126f60f93 100644 --- a/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj +++ b/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj @@ -1,30 +1,37 @@  - - net6.0;net461 - false - $(NoWarn),1998,1591,618 - - - - - - - - - - - - - - - - - - - - - - - - + + + net6.0;net461 + false + $(NoWarn),1998,1591,618 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj index 3decba7ee..5ea7746a5 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj @@ -1,10 +1,12 @@  + net6.0;net461 false true $(NoWarn),1587,1998,1591,618 + @@ -13,13 +15,16 @@ + + + \ No newline at end of file diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj index 5fbb9599f..8995253a8 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj +++ b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj @@ -1,10 +1,13 @@  + netstandard2.0;net461 + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + @@ -18,22 +21,24 @@ + + - - - + + EnumExtensions.cs + \ No newline at end of file diff --git a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj b/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj index 7d2eb1394..3fe459f2a 100644 --- a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj +++ b/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj @@ -1,23 +1,30 @@  + netstandard2.0;net461 + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + + + + EnumExtensions.cs + \ No newline at end of file diff --git a/src/NJsonSchema.Demo/NJsonSchema.Demo.csproj b/src/NJsonSchema.Demo/NJsonSchema.Demo.csproj index 6f346c34d..123874202 100644 --- a/src/NJsonSchema.Demo/NJsonSchema.Demo.csproj +++ b/src/NJsonSchema.Demo/NJsonSchema.Demo.csproj @@ -1,4 +1,5 @@  + net6.0 false @@ -7,11 +8,14 @@ Exe + + + diff --git a/src/NJsonSchema.NewtonsoftJson/NJsonSchema.NewtonsoftJson.csproj b/src/NJsonSchema.NewtonsoftJson/NJsonSchema.NewtonsoftJson.csproj index 8fc603c71..ea0e35951 100644 --- a/src/NJsonSchema.NewtonsoftJson/NJsonSchema.NewtonsoftJson.csproj +++ b/src/NJsonSchema.NewtonsoftJson/NJsonSchema.NewtonsoftJson.csproj @@ -1,30 +1,35 @@ - - - netstandard2.0;net461 - - - bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - - - - - - 1.0.168 - - - - - - - - - - - - - - - - + + + + netstandard2.0;net461 + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + + + + + + + + + 1.0.168 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj b/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj index 3a079dc7c..c44b53acf 100644 --- a/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj +++ b/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj @@ -1,9 +1,11 @@  + net6.0;net461 false false + @@ -12,12 +14,15 @@ + + + \ No newline at end of file diff --git a/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj b/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj index 8b5734d43..09eddbed6 100644 --- a/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj +++ b/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj @@ -1,15 +1,20 @@  + netstandard2.0;net461 + + + + \ No newline at end of file diff --git a/src/NJsonSchema/NJsonSchema.csproj b/src/NJsonSchema/NJsonSchema.csproj index 9f79e2cbd..fd626eb74 100644 --- a/src/NJsonSchema/NJsonSchema.csproj +++ b/src/NJsonSchema/NJsonSchema.csproj @@ -1,15 +1,19 @@  + netstandard2.0;net461 + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + + @@ -18,7 +22,9 @@ + + \ No newline at end of file