Merge pull request #23 from difi/dotnetstandard2.0

.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

Difi.Felles.Utility.Resources/Certificate/CertificateResource.cs

@@ -58,7 +58,7 @@ public static X509Certificate2 GetEnhetstesterSelvsignertSertifikat()
 
             public static X509Certificate2 GetPostenCertificate()
             {
-                return GetCertificate("UnitTests", "PostenNorgeAs.cer");
+                return GetFunksjoneltTestmiljøMottakerSertifikatOppslagstjenesten();
             }
 
             internal static X509Certificate2 GetAvsenderEnhetstesterSertifikat()
@@ -107,4 +107,4 @@ public static List<X509Certificate2> GetDifiProductionChain()
             }
         }
     }
-}
+}

Difi.Felles.Utility.Resources/Certificate/Data/UnitTests/produksjonsmottakersertifikatFraOppslagstjenesten.pem

@@ -1,28 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE1DCCA7ygAwIBAgILA+jTV+nCPcYeg9wwDQYJKoZIhvcNAQELBQAwSzELMAkG
+MIIE8zCCA9ugAwIBAgILEDT7PWQIyW3oBSUwDQYJKoZIhvcNAQELBQAwSzELMAkG
 A1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQD
-DBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNDA2MjQxMjU0NDlaFw0xNzA2MjQy
+DBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0yMDAzMzAwNjM4MThaFw0yMzAzMzAy
 MTU5MDBaMGgxCzAJBgNVBAYTAk5PMRgwFgYDVQQKDA9QT1NURU4gTk9SR0UgQVMx
 ETAPBgNVBAsMCERpZ2lwb3N0MRgwFgYDVQQDDA9QT1NURU4gTk9SR0UgQVMxEjAQ
 BgNVBAUTCTk4NDY2MTE4NTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AK1twtu2WT2T5GPYtwm8kbdCKkTu1qIIm7T+11RWk9NjQG+IqWZhJYUj+Myx/uoZ
-oYxcjgoeLDilQq5pFJA9Oq0I26ZLuv8fi25660GlNfB07J0j9lbJs8uFxV/4+MUf
-6zZ+h9JthTpa5HGkQSImm+UJ+AMLaaxXY8+P7RcPeVPPQIN2A212dSTVruMWbOP4
-DF5683kIXfizuyI8bAC2Ytp3Mxy6bQdEBNc8gNSUmTRBTrqxmkfenM1fGknrMUvV
-tYmT/OGm+6tWvIspIsGYOqFVTaMQUPlOEF6eqkXEnCRIbEZNNtVb7L9o60R2SNKf
-X6OnJRTJjFmJ4DzCP4GfBCsCAwEAAaOCAZowggGWMAkGA1UdEwQCMAAwHwYDVR0j
-BBgwFoAUzMP4B7ecbXpO9acrHQX5s0cckdEwHQYDVR0OBBYEFC4S7wHxmoiYgbix
-YfsK3uBZIEXqMA4GA1UdDwEB/wQEAwIEsDAVBgNVHSAEDjAMMAoGCGCEQgEaAQMC
-MIGlBgNVHR8EgZ0wgZowL6AtoCuGKWh0dHA6Ly9jcmwuYnV5cGFzcy5uby9jcmwv
-QlBDbGFzczNDQTMuY3JsMGegZaBjhmFsZGFwOi8vbGRhcC5idXlwYXNzLm5vL2Rj
-PUJ1eXBhc3MsZGM9Tk8sQ049QnV5cGFzcyUyMENsYXNzJTIwMyUyMENBJTIwMz9j
-ZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MHoGCCsGAQUFBwEBBG4wbDAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AuYnV5cGFzcy5uby9vY3NwL0JQQ2xhc3MzQ0EzMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LmJ1eXBhc3Mubm8vY3J0L0JQQ2xhc3MzQ0Ez
-LmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAYxPhuUmFnazKTqlpBtCIxcEt0wWHLEpv
-5LRUGzcTts+O/JuUSrg3Hbwj1pNjXktZVwiGl1xn54Aq+q/NXopnESkcTNCWSyOw
-fQ3nNOpeTypw5qPXg+D16GxAFeFCf+ln3VMgveTT+nAp37aFUqtLCc6VEnGnTB9V
-d+4xpWxQ15Pb2SsougTwX8q9E7cAn0S/nnKDECLbwn+pNfjNys1T90sGZqjaDT4O
-2DzIBVI5ubwMsG8+LCI4NhYcoiiKvgjNu9IMKGIYIoktyXNMKSGo5ZnPCE27Q54U
-8MoXZAJn4jWMa0kV92iO0yNaOFJ732QKimgVJ7wsrBYv9K8+ZEhxmg==
------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-----

Difi.Felles.Utility.Resources/Certificate/Data/UnitTests/testmottakersertifikatFraOppslagstjenesten.pem

@@ -1,25 +1,30 @@
------BEGIN CERTIFICATE-----
-MIIE7jCCA9agAwIBAgIKGBZrmEgzTHzeJjANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIzAhBgNVBAMMGkJ1eXBhc3MgQ2xhc3MgMyBU
-ZXN0NCBDQSAzMB4XDTE0MDQyNDEyMzA1MVoXDTE3MDQyNDIxNTkwMFowVTELMAkGA1UEBhMCTk8x
-GDAWBgNVBAoMD1BPU1RFTiBOT1JHRSBBUzEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYD
-VQQFEwk5ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLCxU4oBhtGmJx
-XZWbdWdzO2uA3eRNW/kPdddL1HYl1iXLV/g+H2Q0ELadWLggkS+1kOd8/jKxEN++biMmmDqqCWbz
-NdmEd1j4lctSlH6M7tt0ywmXIYdZMz5kxcLAMNXsaqnPdikI9uPJZQEL3Kc8hXhXISvpzP7gYOvK
-Hg41uCxu1xCZQOM6pTlNbxemBYqvES4fRh2xvB9aMjwkB4Nz8jrIsyoPI89i05OmGMkI5BPZt8NT
-a40Yf3yU+SQECW0GWalB5cxaTMeB01tqslUzBJPV3cQx+AhtQG4hkOhQnAMDJramSPVtwbEnqOjQ
-+lyNmg5GQ4FJO02ApKJTZDTHAgMBAAGjggHCMIIBvjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFD+u
-9XgLkqNwIDVfWvr3JKBSAfBBMB0GA1UdDgQWBBQ1gsJfVC7KYGiWVLP7ZwzppyVYTTAOBgNVHQ8B
-Af8EBAMCBLAwFgYDVR0gBA8wDTALBglghEIBGgEAAwIwgbsGA1UdHwSBszCBsDA3oDWgM4YxaHR0
-cDovL2NybC50ZXN0NC5idXlwYXNzLm5vL2NybC9CUENsYXNzM1Q0Q0EzLmNybDB1oHOgcYZvbGRh
-cDovL2xkYXAudGVzdDQuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBD
-bGFzcyUyMDMlMjBUZXN0NCUyMENBJTIwMz9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGKBggr
-BgEFBQcBAQR+MHwwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwLnRlc3Q0LmJ1eXBhc3Mubm8vb2Nz
-cC9CUENsYXNzM1Q0Q0EzMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnRlc3Q0LmJ1eXBhc3Mubm8v
-Y3J0L0JQQ2xhc3MzVDRDQTMuY2VyMA0GCSqGSIb3DQEBCwUAA4IBAQCe67UOZ/VSwcH2ov1cOSaW
-slL7JNfqhyNZWGpfgX1c0Gh+KkO3eVkMSozpgX6M4eeWBWJGELMiVN1LhNaGxBU9TBMdeQ3SqK21
-9W6DXRJ2ycBtaVwQ26V5tWKRN4UlRovYYiY+nMLx9VrLOD4uoP6fm9GE5Fj0vSMMPvOEXi0NsN+8
-MUm3HWoBeUCLyFpe7/EPsS/Wud5bb0as/E2zIztRodxfNsoiXNvWaP2ZiPWFunIjK1H/8EcktEW1
-paiPd8AZek/QQoG0MKPfPIJuqH+WJU3a8J8epMDyVfaek+4+l9XOeKwVXNSOP/JSwgpOJNzTdaDO
-M+uVuk75n2191Fd7
------END CERTIFICATE-----
+-----BEGIN 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-----

Difi.Felles.Utility.Resources/Difi.Felles.Utility.Resources.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Difi.Felles.Utility.Resources</RootNamespace>
         <ProjectGuid>{D7E13B5F-026B-41CE-8250-C9BFBCE82E43}</ProjectGuid>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -36,7 +36,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0-beta.2" />
+      <PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">

Difi.Felles.Utility.Tester/Difi.Felles.Utility.Tester.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Difi.Felles.Utility.Tester</RootNamespace>
         <ProjectGuid>{8DB9B89B-DA70-419A-9725-F9CAD57E2782}</ProjectGuid>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -57,8 +57,8 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0-beta.2" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+      <PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
       <PackageReference Include="xunit.assert" Version="2.4.1" />
       <PackageReference Include="xunit.core" Version="2.4.1" />
       <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

Difi.Felles.Utility/Difi.Felles.Utility.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Difi.Felles.Utility</RootNamespace>
         <ProjectGuid>{A66AC380-1D57-4DBD-9FD3-839919FBAF02}</ProjectGuid>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -53,8 +53,8 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0-beta.2" />
-      <PackageReference Include="System.Security.Cryptography.Xml" Version="4.5.0" />
+      <PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
+      <PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.0" />
     </ItemGroup>
 
 </Project>