Merge pull request #21 from digipost/dotnetstandard2.0

Endrer target for Digipost.Api.Client.Shared til .netStandard2.0

.github/workflows/build.yml

@@ -0,0 +1,21 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.101
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+    - name: Test
+      run: dotnet test --no-restore --verbosity normal

.travis.yml

@@ -8,9 +8,9 @@ git:
 
 matrix:
   include:
-    - dotnet: 2.2.104
+    - dotnet: 3.1.101
       mono: none
-      env: DOTNETCORE=2
+      env: DOTNETCORE=3
 
 before_install:
   - sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules

Digipost.Api.Client.Shared.Tests/Certificate/CertificateValidatorTests.cs

@@ -46,7 +46,7 @@ public void Returns_ok_if_valid_certificate_and_chain()
                 var funksjoneltTestmiljøSertifikater = FunksjoneltTestmiljøSertifikater();
 
                 //Act
-                var result = ValidateCertificateAndChainInternal(GetPostenCertificate(), "984661185", funksjoneltTestmiljøSertifikater);
+                var result = ValidateCertificateAndChainInternal(GetPostenTestCertificate(), "984661185", funksjoneltTestmiljøSertifikater);
 
                 //Assert
                 Assert.Equal(Valid, result.Type);
@@ -77,7 +77,7 @@ public void Calls_validate_certificate_overload_with_no_organization_number()
             public void Ignores_issued_to_organization_if_no_organization_number()
             {
                 //Act
-                var result = ValidateCertificate(GetPostenCertificate(), string.Empty);
+                var result = ValidateCertificate(GetPostenTestCertificate(), string.Empty);
 
                 //Assert
                 Assert.Equal(Valid, result.Type);
@@ -105,7 +105,7 @@ public void Returns_ok_if_valid()
                 const string certificateOrganizationNumber = "984661185";
 
                 //Act
-                var result = ValidateCertificate(GetPostenCertificate(), certificateOrganizationNumber);
+                var result = ValidateCertificate(GetPostenTestCertificate(), certificateOrganizationNumber);
 
                 //Assert
                 Assert.Equal(Valid, result.Type);
@@ -160,12 +160,12 @@ public void Returns_ok_if_valid()
                 //Arrange
 
                 //Act
-                var result = ValidateCertificate(GetPostenCertificate());
+                var result = ValidateCertificate(GetPostenTestCertificate());
 
                 //Assert
                 Assert.Equal(Valid, result.Type);
                 Assert.Contains("is a valid certificate", result.Message);
             }
         }
     }
-}
+}

Digipost.Api.Client.Shared.Tests/Digipost.Api.Client.Shared.Tests.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Digipost.Api.Client.Shared.Tests</RootNamespace>
         <AssemblyName>Digipost.Api.Client.Shared.Tests</AssemblyName>
         <ProjectGuid>{E1EAFDDF-FC6F-4A4C-892F-1CBF1EF2A015}</ProjectGuid>

Digipost.Api.Client.Shared/Digipost.Api.Client.Shared.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Digipost.Api.Client.Shared</RootNamespace>
         <AssemblyName>Digipost.Api.Client.Shared</AssemblyName>
         <ProjectGuid>{641FD6C2-5880-4262-A44C-8EC66AA16291}</ProjectGuid>

Digipost.Api.Client.Shared/Resources/Certificate/CertificateResource.cs

@@ -43,17 +43,17 @@ public static X509Certificate2 GetValidSelfSignedTestCertificate()
 
             public static X509Certificate2 TestIntegrasjonssertifikat()
             {
-                return GetPostenCertificate();
+                return GetPostenTestCertificate();
             }
 
             public static X509Certificate2 GetEnhetstesterSelvsignertSertifikat()
             {
                 return GetCertificate("UnitTests", "difi-enhetstester.cer");
             }
 
-            public static X509Certificate2 GetPostenCertificate()
+            public static X509Certificate2 GetPostenTestCertificate()
             {
-                return GetCertificate("UnitTests", "PostenNorgeAs.cer");
+                return GetFunksjoneltTestmiljøMottakerSertifikatOppslagstjenesten();
             }
 
             internal static X509Certificate2 GetAvsenderEnhetstesterSertifikat()
@@ -102,4 +102,4 @@ public static List<X509Certificate2> GetDifiProductionChain()
             }
         }
     }
-}
+}

Digipost.Api.Client.Shared/Resources/Certificate/Data/UnitTests/produksjonsmottakersertifikatFraOppslagstjenesten.pem

@@ -1,28 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE1DCCA7ygAwIBAgILCvh8weEQoai3nQIwDQYJKoZIhvcNAQELBQAwSzELMAkG
+MIIE8zCCA9ugAwIBAgILEDT7PWQIyW3oBSUwDQYJKoZIhvcNAQELBQAwSzELMAkG
 A1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQD
-DBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNzA0MTkxMjA3MjNaFw0yMDA0MTky
+DBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0yMDAzMzAwNjM4MThaFw0yMzAzMzAy
 MTU5MDBaMGgxCzAJBgNVBAYTAk5PMRgwFgYDVQQKDA9QT1NURU4gTk9SR0UgQVMx
 ETAPBgNVBAsMCERpZ2lwb3N0MRgwFgYDVQQDDA9QT1NURU4gTk9SR0UgQVMxEjAQ
 BgNVBAUTCTk4NDY2MTE4NTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOGEAbqaiYThx0k7RL6xX4nUhpPwuN7+hc5LG0PR6554HRr5aq//8g8/rkNNT2oT
-iZKAVphwYzQzdwsMtGGsBIYkuVo410HKfqnnRrYdJ9lj+rQt8QjXB1IhMUF+e4w6
-LqPCqnQA4k59si4yER/9YSatkQy7peGjFeu5t9EUee1TQKtJx5Ny0LZf1sUIIsJB
-1zX4HAUtlgtxQ8PLPkTVUmrUjKnFTYXy1A9Pe1wn+v1+x157NISQmj74paohCtTo
-l9i6jSwReLweD61QoHsiQ3fg3J9a3YPjBYzLrYwuKZnnJGioRe04pMNb98qMQd3m
-0OJ9jP35fl7rGiFcasD1jiECAwEAAaOCAZowggGWMAkGA1UdEwQCMAAwHwYDVR0j
-BBgwFoAUzMP4B7ecbXpO9acrHQX5s0cckdEwHQYDVR0OBBYEFN6TAVkTb9rUaEXB
-KJcXcaqOkOabMA4GA1UdDwEB/wQEAwIGQDAVBgNVHSAEDjAMMAoGCGCEQgEaAQMC
-MIGlBgNVHR8EgZ0wgZowL6AtoCuGKWh0dHA6Ly9jcmwuYnV5cGFzcy5uby9jcmwv
-QlBDbGFzczNDQTMuY3JsMGegZaBjhmFsZGFwOi8vbGRhcC5idXlwYXNzLm5vL2Rj
-PUJ1eXBhc3MsZGM9Tk8sQ049QnV5cGFzcyUyMENsYXNzJTIwMyUyMENBJTIwMz9j
-ZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MHoGCCsGAQUFBwEBBG4wbDAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AuYnV5cGFzcy5uby9vY3NwL0JQQ2xhc3MzQ0EzMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LmJ1eXBhc3Mubm8vY3J0L0JQQ2xhc3MzQ0Ez
-LmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAXo/25xSsPmsnE18wFncCzKgpilLTwQdo
-SPsEUha9B7JGxw8KrC5sEOgtWcG9+Hx1UHsN2JGvXFxW8pqD9+9X9c3WXRXybp21
-T2zWikEddkkdB54SPq6anstTHID+PeIHg/j1JiKzZ53jNopihwO4M1JmNuM7VZBo
-mgo0MIyMbYUd7m3pjtgXfWRfg1tW0SFyEJGO7ybSaf/luXkc2GG7A68jE+m1GYhY
-kLXGODFNWrZGJqTCz4VwaPKi3CaQglJa8B2774bR5JcpHQTmXiY1Ypk7hVmr2Tme
-4/G+pdKmMwINNgt7CMsqeE85gK/PB2bH3r4I1oJuVi92v8TPL/3PcA==
------END CERTIFICATE-----
+ALX2DndYf3RiGj35mXFQppKuWVAFOZ5TlZ58zEX1pYf82YRNY7HAzSmzigb6ggrM
+PIsaF+egvUeho4h5iwUPA0FlEwN0dIfTyj4eHvJCgIAbwAMzynkigZkm15rU5Hq/
+Su96eTtRaCBIFEuKNRukX1hZY6ifXKNnEFeGZYh6oT0z1+VtdwyRIXDYQNUp2OT0
+4ThOP9Mv1jtGpVyUlw1xPQ3DwBu2FPHN5jxyjspSO+nU7do4rV9Qybn94PVzSvIH
+HUY/eRJ0+/iZEZwWAUyozGxToVMyy1XuI/t0WOkwu5omamKgAZu6piwqzMVQP1eg
+UuWpAUqNaQPdZTyu3TZ7GvUCAwEAAaOCAbkwggG1MAkGA1UdEwQCMAAwHwYDVR0j
+BBgwFoAUzMP4B7ecbXpO9acrHQX5s0cckdEwHQYDVR0OBBYEFPjhs66prlFxyabk
+fjihHsNZVNNKMA4GA1UdDwEB/wQEAwIGQDAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwQwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0fBIGdMIGaMC+g
+LaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBn
+oGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENO
+PUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0
+aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3Nw
+LmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQEL
+BQADggEBAIGWq/gewM1nMhbnhw1ZsWXp9hD3o6YgfgcX8GjweMSO54CwKl2Dlp8c
+1/KHo2sEUelosHOYwO006hw6qg8COVrBRbMvLYts8nuM2GHudPcEQIYoMo0H4QQn
+/wJ09O+ipUEHTmKOIkyFyxrvrftItO61sF0we1aE7CjrR8ItYUXy82dtR6UXJK0j
+lirfva5XAB2L4Fspsg21iwqC+H75O/K5mJTtnlelArufe7iv5Uy4A9kGXiy/SfAy
+cnzPnTypPL+Jwc9SOX4qIodVY55sq29XWklgSj/hCCIAiR4LNg5M1cN0IAIIQdPw
+qE+G9vSLLyzSyO+jHwOgSXiEohE5cUk=
+-----END CERTIFICATE-----

Digipost.Api.Client.Shared/Resources/Certificate/Data/UnitTests/testmottakersertifikatFraOppslagstjenesten.pem

@@ -1,29 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIE7jCCA9agAwIBAgIKGBZrmEgzTHzeJjANBgkqhkiG9w0BAQsFADBRMQswCQYD
-VQQGEwJOTzEdMBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIzAhBgNVBAMM
-GkJ1eXBhc3MgQ2xhc3MgMyBUZXN0NCBDQSAzMB4XDTE0MDQyNDEyMzA1MVoXDTE3
-MDQyNDIxNTkwMFowVTELMAkGA1UEBhMCTk8xGDAWBgNVBAoMD1BPU1RFTiBOT1JH
-RSBBUzEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5ODQ2NjEx
-ODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLCxU4oBhtGmJxXZWb
-dWdzO2uA3eRNW/kPdddL1HYl1iXLV/g+H2Q0ELadWLggkS+1kOd8/jKxEN++biMm
-mDqqCWbzNdmEd1j4lctSlH6M7tt0ywmXIYdZMz5kxcLAMNXsaqnPdikI9uPJZQEL
-3Kc8hXhXISvpzP7gYOvKHg41uCxu1xCZQOM6pTlNbxemBYqvES4fRh2xvB9aMjwk
-B4Nz8jrIsyoPI89i05OmGMkI5BPZt8NTa40Yf3yU+SQECW0GWalB5cxaTMeB01tq
-slUzBJPV3cQx+AhtQG4hkOhQnAMDJramSPVtwbEnqOjQ+lyNmg5GQ4FJO02ApKJT
-ZDTHAgMBAAGjggHCMIIBvjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFD+u9XgLkqNw
-IDVfWvr3JKBSAfBBMB0GA1UdDgQWBBQ1gsJfVC7KYGiWVLP7ZwzppyVYTTAOBgNV
-HQ8BAf8EBAMCBLAwFgYDVR0gBA8wDTALBglghEIBGgEAAwIwgbsGA1UdHwSBszCB
-sDA3oDWgM4YxaHR0cDovL2NybC50ZXN0NC5idXlwYXNzLm5vL2NybC9CUENsYXNz
-M1Q0Q0EzLmNybDB1oHOgcYZvbGRhcDovL2xkYXAudGVzdDQuYnV5cGFzcy5uby9k
-Yz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBUZXN0NCUy
-MENBJTIwMz9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGKBggrBgEFBQcBAQR+
-MHwwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwLnRlc3Q0LmJ1eXBhc3Mubm8vb2Nz
-cC9CUENsYXNzM1Q0Q0EzMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnRlc3Q0LmJ1
-eXBhc3Mubm8vY3J0L0JQQ2xhc3MzVDRDQTMuY2VyMA0GCSqGSIb3DQEBCwUAA4IB
-AQCe67UOZ/VSwcH2ov1cOSaWslL7JNfqhyNZWGpfgX1c0Gh+KkO3eVkMSozpgX6M
-4eeWBWJGELMiVN1LhNaGxBU9TBMdeQ3SqK219W6DXRJ2ycBtaVwQ26V5tWKRN4Ul
-RovYYiY+nMLx9VrLOD4uoP6fm9GE5Fj0vSMMPvOEXi0NsN+8MUm3HWoBeUCLyFpe
-7/EPsS/Wud5bb0as/E2zIztRodxfNsoiXNvWaP2ZiPWFunIjK1H/8EcktEW1paiP
-d8AZek/QQoG0MKPfPIJuqH+WJU3a8J8epMDyVfaek+4+l9XOeKwVXNSOP/JSwgpO
-JNzTdaDOM+uVuk75n2191Fd7
------END CERTIFICATE-----
+MIIFEzCCA/ugAwIBAgILAjxB9SVPXmdWRC4wDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSMwIQYDVQQD
+DBpCdXlwYXNzIENsYXNzIDMgVGVzdDQgQ0EgMzAeFw0yMDAyMDYxNTE4MTlaFw0y
+MzAyMDYyMjU5MDBaMFoxCzAJBgNVBAYTAk5PMRgwFgYDVQQKDA9QT1NURU4gTk9S
+R0UgQVMxHTAbBgNVBAMMFFBPU1RFTiBOT1JHRSBBUyBURVNUMRIwEAYDVQQFEwk5
+ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNN7USaqHT
+oBlPzAzIS/42kiEFrTl3i0CmUkD3kM/SVje3DR1j+0WaM4M1mjqIlHJE9fD+VnB4
+aBZ52FZFJOGPdwQfhRTV82dNrrKKXU5KWBfBMNKZKxgTdf2NxwipaQntWihf46qq
+UGJUrwc1VJZwZ/eJQKk5uOT2zLcasVcORspPe1YluB8ywekSyjhIl9y4Q5qm55iW
+/XOJ5yAtW0Ioxka7jI96KYkY717eQoBNiTbT86TgZOSK9+4rQykvoN/EJ07C6Jwp
+SsUOmucAbA4MvdhbuW66nSsEX5GgCSiezTmZYj1GDh9Ayc3+vkztqzwli9TQTOtR
+TVfRlVV9su5tAgMBAAGjggHhMIIB3TAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFD+u
+9XgLkqNwIDVfWvr3JKBSAfBBMB0GA1UdDgQWBBSoWMK0d93zknJEqymNE8cjZELN
+6zAOBgNVHQ8BAf8EBAMCBkAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwME
+MBYGA1UdIAQPMA0wCwYJYIRCARoBAAMCMIG7BgNVHR8EgbMwgbAwN6A1oDOGMWh0
+dHA6Ly9jcmwudGVzdDQuYnV5cGFzcy5uby9jcmwvQlBDbGFzczNUNENBMy5jcmww
+daBzoHGGb2xkYXA6Ly9sZGFwLnRlc3Q0LmJ1eXBhc3Mubm8vZGM9QnV5cGFzcyxk
+Yz1OTyxDTj1CdXlwYXNzJTIwQ2xhc3MlMjAzJTIwVGVzdDQlMjBDQSUyMDM/Y2Vy
+dGlmaWNhdGVSZXZvY2F0aW9uTGlzdDCBigYIKwYBBQUHAQEEfjB8MDsGCCsGAQUF
+BzABhi9odHRwOi8vb2NzcC50ZXN0NC5idXlwYXNzLm5vL29jc3AvQlBDbGFzczNU
+NENBMzA9BggrBgEFBQcwAoYxaHR0cDovL2NydC50ZXN0NC5idXlwYXNzLm5vL2Ny
+dC9CUENsYXNzM1Q0Q0EzLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAvncMUKkMn0se
+CDETOwGdJSxFlswFESTFHToFcnOsoySSqLwTdH4iRt+fF6PwTtd7bz3QgEJgU2V/
+3/jIOfcgH49H1JXNaNSWPZw/gs6vRobIuoozLOfW0dTdXpmrks/9wIBFgK0hwm6G
+6JhP8zj6Iyd6lFEDyTTMx85bqj0yQlWnpV5ngwHzwLYB3L0NgNuiYp5Dg1/QH9j/
+19kLE99HhfLzSiOKgpRC5QP7Lvj76Gz6TpklqF3A6iUFZuJ6gWU/2uTloAmclDc4
+LaJtvjaKcSEzf0TbFBe+b7SeFSAx7MvHt0NANDa4X31DpP4XG262w5ScpNJferdP
+Or9IVNyjAA==
+-----END CERTIFICATE-----

Directory.Build.props

@@ -1,13 +1,12 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
 
         <Version>0.0.0.0</Version>
         <AssemblyVersion>0.0.0.0</AssemblyVersion>
 
         <Authors>Digipost AS</Authors>
         <Company>Posten Norge AS</Company>
-        <Copyright>Copyright © 2019 Posten Norge AS</Copyright>
+        <Copyright>Copyright © 2020 Posten Norge AS</Copyright>
 
         <PackageProjectUrl>https://github.com/digipost/api-client-shared-dotnet</PackageProjectUrl>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

SolutionItems/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 [assembly: AssemblyTrademark("Posten Norge AS")]
 [assembly: AssemblyProduct("Api Client Shared")]
 [assembly: AssemblyDescription("Digipost common library for API integration.")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.0.0.0")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyCopyright("© 2015-2019 Posten Norge AS")]
+[assembly: AssemblyCopyright("© 2015-2020 Posten Norge AS")]