diff --git a/OnePassword.NET.Tests/OnePassword.NET.Tests.csproj b/OnePassword.NET.Tests/OnePassword.NET.Tests.csproj index 25b2679..2b0b71f 100644 --- a/OnePassword.NET.Tests/OnePassword.NET.Tests.csproj +++ b/OnePassword.NET.Tests/OnePassword.NET.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable false diff --git a/OnePassword.NET/Common/CommonExtensions.cs b/OnePassword.NET/Common/CommonExtensions.cs index 1cb46f3..b8d9c3e 100644 --- a/OnePassword.NET/Common/CommonExtensions.cs +++ b/OnePassword.NET/Common/CommonExtensions.cs @@ -12,7 +12,7 @@ internal static class CommonExtensions /// A string representation of the enum field. /// Thrown when field is null. /// Thrown when field is not correctly annotated with a . - [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2090:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to 'target method'.", + [SuppressMessage("AssemblyLoadTrimming", "IL2090:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to 'target method'.", Justification = "https://github.com/dotnet/runtime/issues/97737")] internal static string ToEnumString(this TField field) where TField : Enum { diff --git a/OnePassword.NET/Common/JsonStringEnumConverterEx.cs b/OnePassword.NET/Common/JsonStringEnumConverterEx.cs index fbc8490..4f6eaa3 100644 --- a/OnePassword.NET/Common/JsonStringEnumConverterEx.cs +++ b/OnePassword.NET/Common/JsonStringEnumConverterEx.cs @@ -1,5 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Reflection; +using System.Text.Json; namespace OnePassword.Common; @@ -13,10 +14,10 @@ internal sealed class JsonStringEnumConverterEx : JsonConverter wh private readonly Dictionary _stringToEnum = []; /// Initializes a new instance of . - [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2090:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to 'target method'.", Justification = "https://github.com/dotnet/runtime/issues/97737")] + [SuppressMessage("AssemblyLoadTrimming", "IL2090:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to 'target method'.", Justification = "https://github.com/dotnet/runtime/issues/97737")] public JsonStringEnumConverterEx() { - foreach (var enumMemberValue in Enum.GetValues()) + foreach (TEnum enumMemberValue in Enum.GetValues(typeof(TEnum))) { var enumMemberName = enumMemberValue.ToString(); diff --git a/OnePassword.NET/OnePassword.NET.csproj b/OnePassword.NET/OnePassword.NET.csproj index 65d8ed5..fd8ea07 100644 --- a/OnePassword.NET/OnePassword.NET.csproj +++ b/OnePassword.NET/OnePassword.NET.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + netstandard2.1 OnePassword OnePassword.NET OnePassword.NET @@ -35,11 +35,12 @@ - - - - - + + + + + + True \ diff --git a/OnePassword.NET/OnePasswordManager.Items.cs b/OnePassword.NET/OnePasswordManager.Items.cs index f72d8c3..1b4618a 100644 --- a/OnePassword.NET/OnePasswordManager.Items.cs +++ b/OnePassword.NET/OnePasswordManager.Items.cs @@ -1,4 +1,5 @@ -using OnePassword.Common; +using System.Text.Json; +using OnePassword.Common; using OnePassword.Items; using OnePassword.Templates; using OnePassword.Vaults; diff --git a/OnePassword.NET/OnePasswordManager.cs b/OnePassword.NET/OnePasswordManager.cs index 5ddbe4e..8d47947 100644 --- a/OnePassword.NET/OnePasswordManager.cs +++ b/OnePassword.NET/OnePasswordManager.cs @@ -1,6 +1,7 @@ using System.Diagnostics; using System.IO.Compression; using System.Text; +using System.Text.Json; using System.Text.Json.Serialization.Metadata; using System.Text.RegularExpressions; using OnePassword.Common; diff --git a/OnePassword.NET/Templates/Template.cs b/OnePassword.NET/Templates/Template.cs index 5b7cade..ff2a75a 100644 --- a/OnePassword.NET/Templates/Template.cs +++ b/OnePassword.NET/Templates/Template.cs @@ -1,4 +1,5 @@ -using OnePassword.Common; +using System.Text.Json; +using OnePassword.Common; using OnePassword.Items; namespace OnePassword.Templates;