diff --git a/src/Examples/Aml/AmlExample/AmlExample.csproj b/src/Examples/Aml/AmlExample/AmlExample.csproj index ab68935fb..e840e408a 100644 --- a/src/Examples/Aml/AmlExample/AmlExample.csproj +++ b/src/Examples/Aml/AmlExample/AmlExample.csproj @@ -11,8 +11,10 @@ - - + + + + diff --git a/src/Examples/DigitalIdentity/DigitalIdentity/DigitalIdentityExample.csproj b/src/Examples/DigitalIdentity/DigitalIdentity/DigitalIdentityExample.csproj index b24d78cf1..344bad9f9 100644 --- a/src/Examples/DigitalIdentity/DigitalIdentity/DigitalIdentityExample.csproj +++ b/src/Examples/DigitalIdentity/DigitalIdentity/DigitalIdentityExample.csproj @@ -17,18 +17,13 @@ - - - - - - - - - - - - + + + + + + + diff --git a/src/Examples/DocScan/DocScanExample/DocScanExample.csproj b/src/Examples/DocScan/DocScanExample/DocScanExample.csproj index 370040429..45791af8c 100644 --- a/src/Examples/DocScan/DocScanExample/DocScanExample.csproj +++ b/src/Examples/DocScan/DocScanExample/DocScanExample.csproj @@ -5,8 +5,9 @@ - - + + + diff --git a/src/Examples/Profile/CoreExample/CoreExample.csproj b/src/Examples/Profile/CoreExample/CoreExample.csproj index e65661230..660dc17ee 100644 --- a/src/Examples/Profile/CoreExample/CoreExample.csproj +++ b/src/Examples/Profile/CoreExample/CoreExample.csproj @@ -14,18 +14,13 @@ - - - - - - - - - - - - + + + + + + + diff --git a/src/Yoti.Auth/Anchors/AnchorCertificateParser.cs b/src/Yoti.Auth/Anchors/AnchorCertificateParser.cs index 364ec3f25..91d4fc2e0 100644 --- a/src/Yoti.Auth/Anchors/AnchorCertificateParser.cs +++ b/src/Yoti.Auth/Anchors/AnchorCertificateParser.cs @@ -22,11 +22,8 @@ public static AnchorVerifierSourceData GetTypesFromAnchor(ProtoBuf.Attribute.Anc var extensions = new List(); X509Certificate2 certificate = new X509Certificate2(byteString.ToByteArray()); - // certificate is only disposable in .NET 4.6+ -#if !NET452 using (certificate) { -#endif foreach (X509Extension x509Extension in certificate.Extensions.OfType()) { var extensionOid = x509Extension.Oid.Value; @@ -46,9 +43,7 @@ public static AnchorVerifierSourceData GetTypesFromAnchor(ProtoBuf.Attribute.Anc extensions = GetListOfStringsFromExtension(certificate, extensionOid); } -#if !NET452 } -#endif if (extensions.Count == 0) { return new AnchorVerifierSourceData(new HashSet { "" }, AnchorType.UNKNOWN); @@ -79,7 +74,7 @@ private static List GetListOfStringsFromExtension(X509Certificate2 certi foreach (object innerObj in obj) { Asn1TaggedObject seqObject = (Asn1TaggedObject)innerObj; - Asn1OctetString octetString = Asn1OctetString.GetInstance(obj: seqObject, isExplicit: false); + Asn1OctetString octetString = Asn1OctetString.GetInstance(seqObject, false); extensionStrings.Add(System.Text.Encoding.UTF8.GetString(octetString.GetOctets())); } diff --git a/src/Yoti.Auth/Yoti.Auth.csproj b/src/Yoti.Auth/Yoti.Auth.csproj index 31378ca5d..236b80f3b 100644 --- a/src/Yoti.Auth/Yoti.Auth.csproj +++ b/src/Yoti.Auth/Yoti.Auth.csproj @@ -1,11 +1,9 @@  - netstandard1.6;netstandard2.1;netcoreapp3.1;net6.0;net452;net462;net472;net48; + netstandard2.1;netcoreapp3.1;net6.0;net462;net472;net48; Yoti.Auth Yoti - $(PackageTargetFallback);dnxcore50 - 1.6.1 false false false @@ -31,26 +29,27 @@ - - true - - - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + + + + + + + True @@ -93,10 +92,6 @@ - - - - diff --git a/test/Yoti.Auth.Tests/Yoti.Auth.Tests.csproj b/test/Yoti.Auth.Tests/Yoti.Auth.Tests.csproj index 9f8e3811c..c2d48b784 100644 --- a/test/Yoti.Auth.Tests/Yoti.Auth.Tests.csproj +++ b/test/Yoti.Auth.Tests/Yoti.Auth.Tests.csproj @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive