Add ifdef to support Net5.0 build with ECC support (#1367)

- for dev only ifdefs, but not added to target props
OPCFoundation · Apr 19, 2021 · c996e79 · c996e79
1 parent 88b16b3
commit c996e79
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 18 deletions.
diff --git a/Libraries/Opc.Ua.Security.Certificates/Extensions/X509SubjectAltNameExtension.cs b/Libraries/Opc.Ua.Security.Certificates/Extensions/X509SubjectAltNameExtension.cs
@@ -213,7 +213,7 @@ public override void CopyFrom(AsnEncodedData asnEncodedData)
         /// <summary>
         /// The OID for a Subject Alternate Name 2 extension.
         /// </summary>
-        public static string SubjectAltName2Oid = "2.5.29.17";
+        public const string SubjectAltName2Oid = "2.5.29.17";
 
         /// <summary>
         /// Gets the uris.
@@ -272,7 +272,7 @@ private string IPAddressToString(byte[] encodedIPAddress)
             }
         }
 
-#if NETSTANDARD2_1 || NET472
+#if NETSTANDARD2_1 || NET472 || NET5_0
         /// <summary>
         /// Encode the Subject Alternative name extension.
         /// </summary>

diff --git a/Libraries/Opc.Ua.Security.Certificates/Opc.Ua.Security.Certificates.csproj b/Libraries/Opc.Ua.Security.Certificates/Opc.Ua.Security.Certificates.csproj
@@ -20,6 +20,10 @@
     <DefineConstants>$(DefineConstants);ECC_SUPPORT</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <DefineConstants>$(DefineConstants);ECC_SUPPORT</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <PackageId>$(PackageId).Debug</PackageId>
   </PropertyGroup>

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/CertificateBuilder.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/CertificateBuilder.cs
@@ -26,7 +26,7 @@
  * The complete license agreement can be found here:
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
-#if !NETSTANDARD2_1 && !NET472
+#if !NETSTANDARD2_1 && !NET472 && !NET5_0
 
 using System;
 using System.Security.Cryptography;

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/CertificateFactoryRandomGenerator.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/CertificateFactoryRandomGenerator.cs
@@ -10,7 +10,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
-#if !NETSTANDARD2_1 && !NET472
+#if !NETSTANDARD2_1 && !NET472 && !NET5_0
 using System;
 using System.Security.Cryptography;
 using Org.BouncyCastle.Crypto.Prng;

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/CertificateFactoryX509Name.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/CertificateFactoryX509Name.cs
@@ -10,7 +10,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
-#if !NETSTANDARD2_1 && !NET472
+#if !NETSTANDARD2_1 && !NET472 && !NET5_0
 
 using Org.BouncyCastle.Asn1.X509;
 

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/PEMReader.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/PEMReader.cs
@@ -27,7 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
-#if !NETSTANDARD2_1
+#if !NETSTANDARD2_1 && !NET5_0
 using System;
 using System.Security.Cryptography;
 using System.IO;

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/PEMWriter.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/PEMWriter.cs
@@ -27,7 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
-#if !NETSTANDARD2_1 
+#if !NETSTANDARD2_1 && !NET5_0
 
 using System;
 using System.Security.Cryptography.X509Certificates;

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/X509Extensions.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/X509Extensions.cs
@@ -27,7 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
-#if !NETSTANDARD2_1 && !NET472
+#if !NETSTANDARD2_1 && !NET472 && !NET5_0
 
 using System;
 using System.Collections.Generic;

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/X509SignatureFactory.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/X509SignatureFactory.cs
@@ -26,7 +26,7 @@
  * The complete license agreement can be found here:
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
-#if !NETSTANDARD2_1 && !NET472
+#if !NETSTANDARD2_1 && !NET472 && !NET5_0
 
 using System;
 using System.Security.Cryptography;

diff --git a/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/X509Utils.cs b/Libraries/Opc.Ua.Security.Certificates/Org.BouncyCastle/X509Utils.cs
@@ -10,7 +10,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
-#if !NETSTANDARD2_1
+#if !NETSTANDARD2_1 && !NET5_0
 using System;
 using System.IO;
 using System.Linq;

diff --git a/Libraries/Opc.Ua.Security.Certificates/PEM/PEMReader.cs b/Libraries/Opc.Ua.Security.Certificates/PEM/PEMReader.cs
@@ -27,7 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET5_0
 
 using System;
 using System.Security.Cryptography;

diff --git a/Libraries/Opc.Ua.Security.Certificates/PEM/PEMWriter.cs b/Libraries/Opc.Ua.Security.Certificates/PEM/PEMWriter.cs
@@ -27,7 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET5_0
 
 using System;
 using System.Security.Cryptography.X509Certificates;

diff --git a/...tificates/System.Security.Cryptography.X509Certificates/RSAPkcs1X509SignatureGenerator.cs b/...tificates/System.Security.Cryptography.X509Certificates/RSAPkcs1X509SignatureGenerator.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if !NETSTANDARD2_1 && !NET472
+#if !NETSTANDARD2_1 && !NET472 && !NET5_0
 
 // This source code is intentionally copied from the .NET core runtime to close
 // a gap in the .NET 4.6 and the .NET Core 2.x runtime implementations.

diff --git a/...rity.Certificates/System.Security.Cryptography.X509Certificates/X509SignatureGenerator.cs b/...rity.Certificates/System.Security.Cryptography.X509Certificates/X509SignatureGenerator.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if !NETSTANDARD2_1 && !NET472
+#if !NETSTANDARD2_1 && !NET472 && !NET5_0
 
 // This source code is intentionally copied from the .NET core runtime to close
 // a gap in the .NET 4.6 and the .NET Core 2.x runtime implementations.

diff --git a/Libraries/Opc.Ua.Security.Certificates/X509Certificate/CertificateBuilder.cs b/Libraries/Opc.Ua.Security.Certificates/X509Certificate/CertificateBuilder.cs
@@ -27,7 +27,7 @@
  * http://opcfoundation.org/License/MIT/1.00/
  * ======================================================================*/
 
-#if NETSTANDARD2_1 || NET472
+#if NETSTANDARD2_1 || NET472 || NET5_0
 
 using System;
 using System.Security.Cryptography;

diff --git a/Stack/Opc.Ua.Core/Security/Certificates/CertificateFactory.cs b/Stack/Opc.Ua.Core/Security/Certificates/CertificateFactory.cs
@@ -272,7 +272,7 @@ DateTime nextUpdate
             return new X509CRL(crlBuilder.CreateForRSA(issuerCertificate));
         }
 
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET5_0
         /// <summary>
         /// Creates a certificate signing request from an existing certificate.
         /// </summary>

diff --git a/Stack/Opc.Ua.Core/Security/Certificates/X509CertificateStore.cs b/Stack/Opc.Ua.Core/Security/Certificates/X509CertificateStore.cs
@@ -130,7 +130,7 @@ public Task Add(X509Certificate2 certificate, string password = null)
                 store.Open(OpenFlags.ReadWrite);
                 if (!store.Certificates.Contains(certificate))
                 {
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET5_0
                     if (certificate.HasPrivateKey &&
                         (Environment.OSVersion.Platform == PlatformID.Win32NT))
                     {

diff --git a/Tests/Opc.Ua.Gds.Tests/PushTest.cs b/Tests/Opc.Ua.Gds.Tests/PushTest.cs
@@ -280,7 +280,7 @@ public void CreateSigningRequestNullParms()
         [Test, Order(402)]
         public void CreateSigningRequestRsaMinNullParms()
         {
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET5_0
             Assert.Ignore("SHA1 not supported on .NET Standard 2.1.");
 #endif
             ConnectPushClient(true);