From 683e6e61965ad7e6d51fd9d57116e5de3156baa1 Mon Sep 17 00:00:00 2001 From: Jordan van Gogh Date: Thu, 4 Apr 2019 18:25:41 +0200 Subject: [PATCH 1/2] import certificate dotnet core fix --- Saml/Saml.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Saml/Saml.cs b/Saml/Saml.cs index a940184..1e60d67 100644 --- a/Saml/Saml.cs +++ b/Saml/Saml.cs @@ -75,8 +75,7 @@ public void LoadCertificate(byte[] certificate) { try { - cert = new X509Certificate2(); - cert.Import(certificate); + cert = new X509Certificate2(certificate); } catch (Exception ex) { throw new LoadCertificateException("Failed to load certificate", ex); From 9b00c51c1fc745f440469dac53e06fd612b7e71f Mon Sep 17 00:00:00 2001 From: Jordan van Gogh Date: Thu, 4 Apr 2019 19:20:20 +0200 Subject: [PATCH 2/2] converted project to netstandard2.0 --- .gitignore | 4 +- Saml/Properties/AssemblyInfo.cs | 29 +------------ Saml/Saml.csproj | 77 +++++---------------------------- 3 files changed, 14 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index 120d22f..40b40a8 100644 --- a/.gitignore +++ b/.gitignore @@ -552,4 +552,6 @@ StdErr*.txt StdOut*.txt Screenshots/ -*.png \ No newline at end of file +*.png + +Saml/nuget/ \ No newline at end of file diff --git a/Saml/Properties/AssemblyInfo.cs b/Saml/Properties/AssemblyInfo.cs index 6660bad..584d618 100644 --- a/Saml/Properties/AssemblyInfo.cs +++ b/Saml/Properties/AssemblyInfo.cs @@ -1,18 +1,4 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Saml")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Saml")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +using System.Runtime.InteropServices; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -21,16 +7,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("bd60888a-63cb-4256-8b6f-bbdd6197db66")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Saml/Saml.csproj b/Saml/Saml.csproj index d4877bf..e5ae83a 100644 --- a/Saml/Saml.csproj +++ b/Saml/Saml.csproj @@ -1,69 +1,12 @@  - - - - Debug - AnyCPU - {BD60888A-63CB-4256-8B6F-BBDD6197DB66} - Library - Properties - Saml - Saml - v4.0 - 512 - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - Designer - - - - - rmdir /Q /S $(ProjectDir)nuget & mkdir $(ProjectDir)nuget - -mkdir $(ProjectDir)nuget\lib - -copy $(TargetPath) $(ProjectDir)nuget\lib - -copy $(ProjectDir)Saml.nuspec $(ProjectDir)nuget - -cd $(ProjectDir)nuget - -$(ProjectDir)nuget.exe pack Saml.nuspec - + + + netstandard2.0 + + + + + + + \ No newline at end of file