Merge pull request #223 from difi/dotnetstandard2.0

Endre target til .NET Standard 2.0
difi · May 7, 2020 · 1076925 · 1076925
2 parents c222cf7 + 21e0515
commit 1076925
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 29 deletions.
diff --git a/.travis.yml b/.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

diff --git a/Difi.SikkerDigitalPost.Klient.Docs/Difi.SikkerDigitalPost.Klient.Docs.csproj b/Difi.SikkerDigitalPost.Klient.Docs/Difi.SikkerDigitalPost.Klient.Docs.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Difi.SikkerDigitalPost.Klient.Docs</RootNamespace>
         <AssemblyName>Difi.SikkerDigitalPost.Klient.Docs</AssemblyName>
         <ProjectGuid>{880298B2-689E-4202-B73E-BF8BD07096F2}</ProjectGuid>

diff --git a/Difi.SikkerDigitalPost.Klient.Domene/Difi.SikkerDigitalPost.Klient.Domene.csproj b/Difi.SikkerDigitalPost.Klient.Domene/Difi.SikkerDigitalPost.Klient.Domene.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Difi.SikkerDigitalPost.Klient.Domene</RootNamespace>
         <AssemblyName>Difi.SikkerDigitalPost.Klient.Domene</AssemblyName>
         <ProjectGuid>{C231BA31-5C58-4D8A-9040-DC604B6755E4}</ProjectGuid>
@@ -44,15 +44,9 @@
 
     <ItemGroup>
       <PackageReference Include="BouncyCastle" Version="1.8.5" />
-      <PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
-      <PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
-      <PackageReference Include="System.Security.Cryptography.Xml" Version="4.5.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Digipost.Api.Client.Shared, Version=3.0.0.0, Culture=neutral, PublicKeyToken=13a04c7692843c1c">
-        <HintPath>..\..\..\.nuget\packages\api-client-shared\3.0.0\lib\net46\Digipost.Api.Client.Shared.dll</HintPath>
-      </Reference>
+      <PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
+      <PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
+      <PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.0" />
     </ItemGroup>
 
 </Project>
diff --git a/Difi.SikkerDigitalPost.Klient.Resources/Difi.SikkerDigitalPost.Klient.Resources.csproj b/Difi.SikkerDigitalPost.Klient.Resources/Difi.SikkerDigitalPost.Klient.Resources.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Difi.SikkerDigitalPost.Klient.Resources</RootNamespace>
         <AssemblyName>Difi.SikkerDigitalPost.Klient.Resources</AssemblyName>
         <ProjectGuid>{1B519AE0-E22F-4691-9399-33D9D04526E6}</ProjectGuid>
@@ -58,8 +58,8 @@
 
     <ItemGroup>
       <PackageReference Include="BouncyCastle" Version="1.8.5" />
-      <PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
-      <PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
+      <PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
+      <PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/Difi.SikkerDigitalPost.Klient.Tester/Difi.SikkerDigitalPost.Klient.Tester.csproj b/Difi.SikkerDigitalPost.Klient.Tester/Difi.SikkerDigitalPost.Klient.Tester.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Difi.SikkerDigitalPost.Klient.Tester</RootNamespace>
         <AssemblyName>Difi.SikkerDigitalPost.Klient.Tester</AssemblyName>
         <ProjectGuid>{CBBA18B2-B8AA-4EDC-831C-B908BBF9CEC0}</ProjectGuid>
@@ -39,8 +39,8 @@
     <ItemGroup>
         <PackageReference Include="BouncyCastle" Version="1.8.5" />
         <PackageReference Include="CompareNETObjects" Version="4.62.0" />
-        <PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
-        <PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
+        <PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
+        <PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
         <PackageReference Include="xunit.assert" Version="2.4.1" />
         <PackageReference Include="xunit.core" Version="2.4.1" />

diff --git a/Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs b/Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs
@@ -62,4 +62,4 @@ public void Send_on_behalf_of()
                 .ConfirmReceipt();
         }
     }
-}
+}
diff --git a/Difi.SikkerDigitalPost.Klient/Difi.SikkerDigitalPost.Klient.csproj b/Difi.SikkerDigitalPost.Klient/Difi.SikkerDigitalPost.Klient.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Difi.SikkerDigitalPost.Klient</RootNamespace>
         <AssemblyName>Difi.SikkerDigitalPost.Klient</AssemblyName>
         <ProjectGuid>{A55CAB23-63C7-4E1D-951E-24936601180D}</ProjectGuid>
@@ -89,15 +89,15 @@
 
     <ItemGroup>
         <PackageReference Include="BouncyCastle" Version="1.8.5" />
-        <PackageReference Include="Difi.Felles.Utility" Version="3.0.2" />
-        <PackageReference Include="Digipost.Api.Client.Shared" Version="5.0.0" />
+        <PackageReference Include="Difi.Felles.Utility" Version="4.0.0" />
+        <PackageReference Include="Digipost.Api.Client.Shared" Version="6.0.0" />
         <PackageReference Include="log4net" Version="2.0.8" />
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview8.19405.4" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
         <PackageReference Include="NLog.Extensions.Logging" Version="1.5.2" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
-        <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.2" />
+        <PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/SolutionItems/SharedAssemblyInfo.cs b/SolutionItems/SharedAssemblyInfo.cs
@@ -4,8 +4,8 @@
 [assembly: AssemblyTrademark("Direktoratet for forvaltning og IKT (Difi)")]
 [assembly: AssemblyProduct("Difi Opppslagstjeneste Klient")]
 [assembly: AssemblyDescription("Klientbibliotek for integrasjon mot Oppslagstjenesten for kontakt og reservasjonregisteret")]
-[assembly: AssemblyVersion("2.1.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
-[assembly: AssemblyInformationalVersion("2.1.0")]
-[assembly: AssemblyCopyright("� 2015-2019 Direktoratet for forvaltning og IKT (Difi)")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("4.0.0")]
+[assembly: AssemblyFileVersion("4.0.0")]
+[assembly: AssemblyInformationalVersion("4.0.0")]
+[assembly: AssemblyCopyright("� 2015-2020 Direktoratet for forvaltning og IKT (Difi)")]
+[assembly: AssemblyCulture("")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,4 +62,4 @@ public void Send_on_behalf_of() @@
                     .ConfirmReceipt();
             }
         }
-    }
+    }