Update for .NET standard 2.1

sharkadi-a · Feb 18, 2024 · 678427b · 678427b
1 parent 66ab864
commit 678427b
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 50 deletions.
diff --git a/src/JsonEasyNavigation/ArrayEnumeratorWrapper.cs b/src/JsonEasyNavigation/ArrayEnumeratorWrapper.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Collections;
 
 namespace JsonEasyNavigation
 {

diff --git a/src/JsonEasyNavigation/BoxingSafeConverter.cs b/src/JsonEasyNavigation/BoxingSafeConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 
 namespace JsonEasyNavigation
 {

diff --git a/src/JsonEasyNavigation/JsonEasyNavigation.csproj b/src/JsonEasyNavigation/JsonEasyNavigation.csproj
@@ -1,19 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>1.3.0</Version>
+        <Version>1.3.1</Version>
         <PackageIcon>logo.png</PackageIcon>
         <Title>JsonEasyNavigation</Title>
         <Authors>Sharkadi Andrey</Authors>
         <Description>This library provides a wrapper class around JsonElement (located in System.Text.Json) which allows to navigate through JSON DOM (domain object model) hierarchy using indexer-style syntax (as in collections and dictionaries) for properties and array alike. It also contains useful methods to get values without throwing exceptions. </Description>
         <Copyright>(c) Sharkadi Andrey</Copyright>
         <PackageProjectUrl>https://github.com/sharkadi-a/JsonEasyNavigation</PackageProjectUrl>
         <PackageTags>text.json json navigation indexer dictionary list collection DOM</PackageTags>
+	    <ImplicitUsings>enable</ImplicitUsings>
+	    <LangVersion>preview</LangVersion>
     </PropertyGroup>
+
     <PropertyGroup>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
     <ItemGroup>
@@ -25,11 +29,11 @@
     </ItemGroup>    
 
     <ItemGroup>
-        <None Include="..\..\README.md" Pack="true" PackagePath="" />
+        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.Text.Json" Version="5.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+      <PackageReference Include="System.Text.Json" Version="8.0.2" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/src/JsonEasyNavigation/JsonExtensions.cs b/src/JsonEasyNavigation/JsonExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-
-namespace JsonEasyNavigation
+namespace JsonEasyNavigation
 {
     /// <summary>
     /// Various <see cref="JsonDocument"/>, <see cref="JsonElement"/> and <see cref="JsonNavigationElement"/> extensions

diff --git a/src/JsonEasyNavigation/JsonNavigationElement.ReadOnlyDictionary.cs b/src/JsonEasyNavigation/JsonNavigationElement.ReadOnlyDictionary.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-
-namespace JsonEasyNavigation
+namespace JsonEasyNavigation
 {
     public readonly partial struct JsonNavigationElement : IReadOnlyDictionary<string, JsonNavigationElement>
     {

diff --git a/src/JsonEasyNavigation/JsonNavigationElement.ReadOnlyList.cs b/src/JsonEasyNavigation/JsonNavigationElement.ReadOnlyList.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Collections;
 
 namespace JsonEasyNavigation
 {

diff --git a/src/JsonEasyNavigation/JsonNavigationElement.cs b/src/JsonEasyNavigation/JsonNavigationElement.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Buffers;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-
-namespace JsonEasyNavigation
+namespace JsonEasyNavigation
 {
     /// <summary>
     /// Represents a wrapper around <see cref="JsonElement"/>, which allows to navigate it's

diff --git a/src/JsonEasyNavigation/ObjectEnumeratorWrapper.cs b/src/JsonEasyNavigation/ObjectEnumeratorWrapper.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
+using System.Collections;
 
 namespace JsonEasyNavigation
 {

diff --git a/src/JsonEasyNavigation/PrimitiveValueExtractor.cs b/src/JsonEasyNavigation/PrimitiveValueExtractor.cs
@@ -1,8 +1,4 @@
-using System;
-using System.IO;
-using System.Text.Json;
-
-namespace JsonEasyNavigation
+namespace JsonEasyNavigation
 {
     internal static class PrimitiveValueExtractor
     {

diff --git a/src/JsonEasyNavigation/PropertyPathVisitor.cs b/src/JsonEasyNavigation/PropertyPathVisitor.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
-using System.Text.Json;
-
-namespace JsonEasyNavigation
+namespace JsonEasyNavigation
 {
     internal static class PropertyPathVisitor
     {

diff --git a/src/JsonEasyNavigation/Usings.cs b/src/JsonEasyNavigation/Usings.cs
@@ -0,0 +1 @@
+global using System.Text.Json;