From 3fed5cbf39f1512b023952bfca9303df448f3433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sondre=20Eikanger=20Kval=C3=B8?=
 <zapodot@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:27:19 +0100
Subject: [PATCH] Update dependencies (#162)

Oppdaterer avhengigheter. Setter target til net6.0 (i tillegg til netstandard2.0)
---
 Jenkinsfile                                               | 4 ++--
 .../KS.Fiks.Maskinporten.Client.Tests.csproj              | 2 +-
 .../MaskinportenClientConfigurationFactoryTests.cs        | 8 ++++----
 .../KS.Fiks.Maskinporten.Client.csproj                    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3dda2f3..5a0f5d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,3 @@
-dotnetLibPipeline{
-    componentTestProject = "fiks-maskinporten-client-dotnet-integration-tests"
+dotnetLibPipeline {
+    componentTestProject = "fiks-maskinporten-client-dotnet-integration-tests" 
 }
\ No newline at end of file
diff --git a/KS.Fiks.Maskinporten.Client.Tests/KS.Fiks.Maskinporten.Client.Tests.csproj b/KS.Fiks.Maskinporten.Client.Tests/KS.Fiks.Maskinporten.Client.Tests.csproj
index 64ae5a0..b380dd0 100644
--- a/KS.Fiks.Maskinporten.Client.Tests/KS.Fiks.Maskinporten.Client.Tests.csproj
+++ b/KS.Fiks.Maskinporten.Client.Tests/KS.Fiks.Maskinporten.Client.Tests.csproj
@@ -4,7 +4,7 @@
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
         <RootNamespace>KS.Fiks.Maskinporten.Client.Tests</RootNamespace>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
 
     </PropertyGroup>
 
diff --git a/KS.Fiks.Maskinporten.Client.Tests/MaskinportenClientConfigurationFactoryTests.cs b/KS.Fiks.Maskinporten.Client.Tests/MaskinportenClientConfigurationFactoryTests.cs
index b23ba94..45ef363 100644
--- a/KS.Fiks.Maskinporten.Client.Tests/MaskinportenClientConfigurationFactoryTests.cs
+++ b/KS.Fiks.Maskinporten.Client.Tests/MaskinportenClientConfigurationFactoryTests.cs
@@ -49,8 +49,8 @@ public void CreateTestConfigurationWithKeyPair()
                 .Be(MaskinportenClientConfigurationFactory.TEST_TOKEN_ENDPOINT);
             maskinportenClientConfiguration.Audience.Should().Be(MaskinportenClientConfigurationFactory.TEST_AUDIENCE);
             maskinportenClientConfiguration.Issuer.Should().Be(issuer);
-            maskinportenClientConfiguration.PrivateKey.Should().Be(privateKey);
-            maskinportenClientConfiguration.PublicKey.Should().Be(publicKey);
+            maskinportenClientConfiguration.PrivateKey.Should().BeEquivalentTo(privateKey);
+            maskinportenClientConfiguration.PublicKey.Should().BeEquivalentTo(publicKey);
             maskinportenClientConfiguration.KeyIdentifier.Should().Be(keyIdentifier);
         }
 
@@ -83,8 +83,8 @@ public void CreateProdConfigurationWithKeyPair()
                 .Be(MaskinportenClientConfigurationFactory.PROD_TOKEN_ENDPOINT);
             maskinportenClientConfiguration.Audience.Should().Be(MaskinportenClientConfigurationFactory.PROD_AUDIENCE);
             maskinportenClientConfiguration.Issuer.Should().Be(issuer);
-            maskinportenClientConfiguration.PrivateKey.Should().Be(privateKey);
-            maskinportenClientConfiguration.PublicKey.Should().Be(publicKey);
+            maskinportenClientConfiguration.PrivateKey.Should().BeEquivalentTo(privateKey);
+            maskinportenClientConfiguration.PublicKey.Should().BeEquivalentTo(publicKey);
             maskinportenClientConfiguration.KeyIdentifier.Should().Be(keyIdentifier);
         }
     }
diff --git a/KS.Fiks.Maskinporten.Client/KS.Fiks.Maskinporten.Client.csproj b/KS.Fiks.Maskinporten.Client/KS.Fiks.Maskinporten.Client.csproj
index 43103ad..37f5d04 100644
--- a/KS.Fiks.Maskinporten.Client/KS.Fiks.Maskinporten.Client.csproj
+++ b/KS.Fiks.Maskinporten.Client/KS.Fiks.Maskinporten.Client.csproj
@@ -14,7 +14,7 @@
         <RepositoryType>git</RepositoryType>
         <PackageTags>FIKS</PackageTags>
         <VersionPrefix>1.1.9</VersionPrefix>
-        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -25,7 +25,7 @@
         <AssemblyOriginatorKeyFile>maskinporten.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="JWT" Version="10.1.1" />
+        <PackageReference Include="JWT" Version="10.1.0" />
         <PackageReference Include="KS.Fiks.QA" Version="1.0.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />