Merge pull request #192 from difi/upgrade-dep

Oppgraderer sdp-shared og difi-felles-utility pga ny signingkey
difi · Nov 11, 2016 · ee28ccd · ee28ccd
2 parents 83e9a8d + a3ef3f3
commit ee28ccd
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 49 deletions.
diff --git a/Difi.SikkerDigitalPost.Klient.Domene/Difi.SikkerDigitalPost.Klient.Domene.csproj b/Difi.SikkerDigitalPost.Klient.Domene/Difi.SikkerDigitalPost.Klient.Domene.csproj
@@ -40,12 +40,12 @@
     <AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApiClientShared, Version=1.2.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\api-client-shared.1.2.0\lib\net45\ApiClientShared.dll</HintPath>
+    <Reference Include="ApiClientShared, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\api-client-shared.2.0.0\lib\net45\ApiClientShared.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Difi.Felles.Utility, Version=0.9.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\difi-felles-utility-dotnet.0.9.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
+    <Reference Include="Difi.Felles.Utility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\difi-felles-utility-dotnet.1.0.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Difi.SikkerDigitalPost.Klient.Domene/packages.config b/Difi.SikkerDigitalPost.Klient.Domene/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="api-client-shared" version="1.2.0" targetFramework="net45" />
-  <package id="difi-felles-utility-dotnet" version="0.9.0" targetFramework="net45" />
+  <package id="api-client-shared" version="2.0.0" targetFramework="net45" />
+  <package id="difi-felles-utility-dotnet" version="1.0.0" targetFramework="net45" />
 </packages>
diff --git a/Difi.SikkerDigitalPost.Klient.Resources/Difi.SikkerDigitalPost.Klient.Resources.csproj b/Difi.SikkerDigitalPost.Klient.Resources/Difi.SikkerDigitalPost.Klient.Resources.csproj
@@ -37,8 +37,8 @@
     <AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApiClientShared, Version=1.2.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\api-client-shared.1.2.0\lib\net45\ApiClientShared.dll</HintPath>
+    <Reference Include="ApiClientShared, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\api-client-shared.2.0.0\lib\net45\ApiClientShared.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Difi.SikkerDigitalPost.Klient.Resources/packages.config b/Difi.SikkerDigitalPost.Klient.Resources/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="api-client-shared" version="1.2.0" targetFramework="net45" />
+  <package id="api-client-shared" version="2.0.0" targetFramework="net45" />
 </packages>
diff --git a/Difi.SikkerDigitalPost.Klient.Tester/Difi.SikkerDigitalPost.Klient.Tester.csproj b/Difi.SikkerDigitalPost.Klient.Tester/Difi.SikkerDigitalPost.Klient.Tester.csproj
@@ -45,8 +45,8 @@
     <AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApiClientShared, Version=1.2.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\api-client-shared.1.2.0\lib\net45\ApiClientShared.dll</HintPath>
+    <Reference Include="ApiClientShared, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\api-client-shared.2.0.0\lib\net45\ApiClientShared.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
@@ -57,8 +57,8 @@
       <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Difi.Felles.Utility, Version=0.9.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\difi-felles-utility-dotnet.0.9.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
+    <Reference Include="Difi.Felles.Utility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\difi-felles-utility-dotnet.1.0.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.5.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">

diff --git a/Difi.SikkerDigitalPost.Klient.Tester/packages.config b/Difi.SikkerDigitalPost.Klient.Tester/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="api-client-shared" version="1.2.0" targetFramework="net45" />
+  <package id="api-client-shared" version="2.0.0" targetFramework="net45" />
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
   <package id="CompareNETObjects" version="3.05.0.0" targetFramework="net45" />
-  <package id="difi-felles-utility-dotnet" version="0.9.0" targetFramework="net45" />
+  <package id="difi-felles-utility-dotnet" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />

diff --git a/Difi.SikkerDigitalPost.Klient.Testklient/App.config b/Difi.SikkerDigitalPost.Klient.Testklient/App.config
@@ -42,15 +42,17 @@
     </root>
   </log4net>
   <runtime>
+
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="ApiClientShared" publicKeyToken="683b8efceae684a6" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.0.5941.27271" newVersion="1.0.5941.27271" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
-      </dependentAssembly>
+
+        <dependentAssembly>
+
+            <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+
+            <bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
+
+        </dependentAssembly>
+
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Difi.SikkerDigitalPost.Klient.Testklient/Difi.SikkerDigitalPost.Klient.Testklient.csproj b/Difi.SikkerDigitalPost.Klient.Testklient/Difi.SikkerDigitalPost.Klient.Testklient.csproj
@@ -39,8 +39,8 @@
     <AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApiClientShared, Version=1.2.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\api-client-shared.1.2.0\lib\net45\ApiClientShared.dll</HintPath>
+    <Reference Include="ApiClientShared, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\api-client-shared.2.0.0\lib\net45\ApiClientShared.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
@@ -55,8 +55,8 @@
       <HintPath>..\packages\Common.Logging.Log4Net1213.3.3.1\lib\net40\Common.Logging.Log4Net1213.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Difi.Felles.Utility, Version=0.9.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\difi-felles-utility-dotnet.0.9.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
+    <Reference Include="Difi.Felles.Utility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\difi-felles-utility-dotnet.1.0.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">

diff --git a/Difi.SikkerDigitalPost.Klient.Testklient/packages.config b/Difi.SikkerDigitalPost.Klient.Testklient/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="api-client-shared" version="1.2.0" targetFramework="net45" />
+  <package id="api-client-shared" version="2.0.0" targetFramework="net45" />
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Log4Net1213" version="3.3.1" targetFramework="net45" />
-  <package id="difi-felles-utility-dotnet" version="0.9.0" targetFramework="net45" />
+  <package id="difi-felles-utility-dotnet" version="1.0.0" targetFramework="net45" />
   <package id="log4net" version="2.0.5" targetFramework="net45" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="net45" />
 </packages>
diff --git a/Difi.SikkerDigitalPost.Klient/Api/SikkerDigitalPostKlient.cs b/Difi.SikkerDigitalPost.Klient/Api/SikkerDigitalPostKlient.cs
@@ -61,6 +61,7 @@ private void ValidateDatabehandlerCertificateAndThrowIfInvalid(Databehandler dat
             if (valideringsResultat.Type != CertificateValidationType.Valid)
             {
                 throw new SecurityException($"Sertifikatet som brukes for { nameof(Databehandler) } er ikke gyldig. Prøver du å sende med et testsertifikat i produksjonsmiljø eller omvendt? Grunnen er '{valideringsResultat.Type.ToNorwegianString()}', beskrivelse: '{valideringsResultat.Message}'");
+
             }
         }
 

diff --git a/Difi.SikkerDigitalPost.Klient/Difi.SikkerDigitalPost.Klient.csproj b/Difi.SikkerDigitalPost.Klient/Difi.SikkerDigitalPost.Klient.csproj
@@ -44,8 +44,8 @@
     <AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApiClientShared, Version=1.2.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\api-client-shared.1.2.0\lib\net45\ApiClientShared.dll</HintPath>
+    <Reference Include="ApiClientShared, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\api-client-shared.2.0.0\lib\net45\ApiClientShared.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
@@ -56,8 +56,8 @@
       <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Difi.Felles.Utility, Version=0.9.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
-      <HintPath>..\packages\difi-felles-utility-dotnet.0.9.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
+    <Reference Include="Difi.Felles.Utility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6e6972f540d5419a, processorArchitecture=MSIL">
+      <HintPath>..\packages\difi-felles-utility-dotnet.1.0.0\lib\net45\Difi.Felles.Utility.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -69,7 +69,10 @@
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http">
+      <HintPath>..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.Http.Formatting.Extension.5.2.3.0\lib\System.Net.Http.Extensions.dll</HintPath>
       <Private>True</Private>
@@ -82,6 +85,10 @@
       <HintPath>..\packages\System.Net.Http.Formatting.Extension.5.2.3.0\lib\System.Net.Http.Primitives.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Net.Http.WebRequest">
+      <HintPath>..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Security" />
     <Reference Include="System.Xml.Linq" />
@@ -247,7 +254,9 @@
     <None Include="C:\Keys\signingkey.snk">
       <Link>signingkey.snk</Link>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Difi.SikkerDigitalPost.Klient/packages.config b/Difi.SikkerDigitalPost.Klient/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="api-client-shared" version="1.2.0" targetFramework="net45" />
+  <package id="api-client-shared" version="2.0.0" targetFramework="net45" />
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
-  <package id="difi-felles-utility-dotnet" version="0.9.0" targetFramework="net45" />
+  <package id="difi-felles-utility-dotnet" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="2.0.20126.16343" targetFramework="net45" />
   <package id="System.Net.Http.Formatting.Extension" version="5.2.3.0" targetFramework="net45" />
 </packages>
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("1.11.0")]
-[assembly: AssemblyFileVersion("1.11.0")]
-[assembly: AssemblyInformationalVersion("1.11.0")]
+[assembly: AssemblyVersion("1.11.1")]
+[assembly: AssemblyFileVersion("1.11.1")]
+[assembly: AssemblyInformationalVersion("1.11.1")]
 [assembly: AssemblyCopyright("© 2015-2016 Direktoratet for forvaltning og IKT (Difi)")]
 [assembly: AssemblyCulture("")]
diff --git a/difi-sikker-digital-post-klient.nuspec b/difi-sikker-digital-post-klient.nuspec
@@ -13,14 +13,12 @@
         <tags>Posten SikkerDigitalPost Sikker Post eBoks Digipost Difi</tags>
         <dependencies>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="difi-felles-utility-dotnet" version="[0.8.0.27738,1.0)" />
-                <dependency id="api-client-shared" version="[1.0.5968.19413,2.0)" />
+                <dependency id="difi-felles-utility-dotnet" version="[1.0.0,2.0.0)" />
+                <dependency id="api-client-shared" version="[2.0.0,3.0.0)" />
                 <dependency id="Common.Logging" version="[3.3.1,3.4)" />
                 <dependency id="Common.Logging.Core" version="[3.3.1,3.4)" />
-                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.3,6)" />
-                <dependency id="System.Net.Formatting.Extension" version="[5.2.3,6)" />
-                <dependency id="System.Net.Http" version="[2.0.20126.16343,4.1.0]" />
-                <dependency id="Newtonsoft.Json" version="[6.0.4,7)" />              
+                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.3,6)" /> 
+                <dependency id="System.Net.Http.Formatting.Extension" version="[5.2.3,6)" />                          
             </group>
         </dependencies>
     </metadata>
@@ -30,4 +28,4 @@
         <file src="Difi.SikkerDigitalPost.Klient\bin\Release\Difi.SikkerDigitalPost.Klient.Domene.xml" target="lib\net45\Difi.SikkerDigitalPost.Klient.Domene.xml" />
         <file src="Difi.SikkerDigitalPost.Klient\bin\Release\Difi.SikkerDigitalPost.Klient.xml" target="lib\net45\Difi.SikkerDigitalPost.Klient.xml" />
     </files>
-</package>
+</package>
-Original file line number
+Diff line change
@@ Expand Up @@
                 if (valideringsResultat.Type != CertificateValidationType.Valid)
                 {
                     throw new SecurityException($"Sertifikatet som brukes for { nameof(Databehandler) } er ikke gyldig. Prøver du å sende med et testsertifikat i produksjonsmiljø eller omvendt? Grunnen er '{valideringsResultat.Type.ToNorwegianString()}', beskrivelse: '{valideringsResultat.Message}'");
                 }
             }
@@ Expand Down @@