Cleanup pre-processor directives (#1630)

RicoSuter · Oct 2, 2023 · ebd165d · ebd165d
1 parent d6f0d01
commit ebd165d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/src/NJsonSchema.CodeGeneration.Tests/InheritanceSerializationTests.cs b/src/NJsonSchema.CodeGeneration.Tests/InheritanceSerializationTests.cs
@@ -283,7 +283,7 @@ public async Task When_schema_contains_discriminator_and_inheritance_hierarchy_t
             Assert.Contains("this._discriminator = \"Dog\"", code);
         }
 
-#if NETCORE
+#if !NETFRAMEWORK
         [Fact]
 #else
         [Fact(Skip = "Dynamic compilation doesn't work for NET 4.6.1")]

diff --git a/src/NJsonSchema.Tests/Generation/ArrayGenerationTests.cs b/src/NJsonSchema.Tests/Generation/ArrayGenerationTests.cs
@@ -82,7 +82,7 @@ public async Task When_class_inherits_from_list_then_schema_is_inlined_and_type_
             Assert.NotNull(schema.Definitions["SomeModelCollectionResponse"].Item);
         }
 
-#if NET5_0
+#if !NETFRAMEWORK
 
         public class ClassWithAsyncEnumerable
         {

diff --git a/src/NJsonSchema.Tests/Generation/SystemTextJson/SystemTextJsonInheritanceTests.cs b/src/NJsonSchema.Tests/Generation/SystemTextJson/SystemTextJsonInheritanceTests.cs
@@ -45,7 +45,7 @@ public async Task When_using_JsonInheritanceAttribute_and_SystemTextJson_then_sc
   },", data);
         }
 
-#if !NET462
+#if !NETFRAMEWORK
 
         public class Apple2 : Fruit2
         {

diff --git a/src/NJsonSchema.Tests/Generation/SystemTextJson/SystemTextJsonOptionsConverterTests.cs b/src/NJsonSchema.Tests/Generation/SystemTextJson/SystemTextJsonOptionsConverterTests.cs
@@ -1,11 +1,11 @@
-#if !net462
+#if !NETFRAMEWORK
 
-using System.Linq;
-using Newtonsoft.Json.Converters;
-using NJsonSchema.Generation;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+
+using NJsonSchema.Generation;
+
 using Xunit;
 
 namespace NJsonSchema.Tests.Generation.SystemTextJson

diff --git a/src/NJsonSchema/JsonPathUtilities.cs b/src/NJsonSchema/JsonPathUtilities.cs
@@ -82,10 +82,8 @@ private static bool FindJsonPaths(object obj, Dictionary<object, string> searche
 
             var type = obj.GetType();
             if (type == typeof(string)
-#if !NETSTANDARD1_0
                 || type.IsPrimitive
                 || type.IsEnum
-#endif
                 || type == typeof(JValue)
                 || checkedObjects.Contains(obj)
             )

diff --git a/src/NJsonSchema/JsonSchema.cs b/src/NJsonSchema/JsonSchema.cs
@@ -106,13 +106,8 @@ public static Task<JsonSchema> FromFileAsync(string filePath, CancellationToken
         /// <exception cref="NotSupportedException">The System.IO.File API is not available on this platform.</exception>
         public static Task<JsonSchema> FromFileAsync(string filePath, Func<JsonSchema, JsonReferenceResolver> referenceResolverFactory, CancellationToken cancellationToken = default)
         {
-#if !NETSTANDARD1_0
             using var stream = File.OpenRead(filePath);
             return FromJsonAsync(stream, filePath, referenceResolverFactory, cancellationToken);
-#else
-            var json = DynamicApis.FileReadAllText(filePath);
-            return FromJsonAsync(json, filePath, referenceResolverFactory, cancellationToken);
-#endif
         }
 
         /// <summary>Loads a JSON Schema from a given URL (only available in .NET 4.x).</summary>