update targetFrameworks, removed obsolete HmacAuthenticatedApps in hm…

…ac options
softawaregmbh · Feb 19, 2024 · 2d66796 · 2d66796
1 parent 09c15d6
commit 2d66796
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 37 deletions.
diff --git a/...uthentication.Basic.AspNetCore.Test/softaware.Authentication.Basic.AspNetCore.Test.csproj b/...uthentication.Basic.AspNetCore.Test/softaware.Authentication.Basic.AspNetCore.Test.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>

diff --git a/softaware.Authentication.Basic.AspNetCore/softaware.Authentication.Basic.AspNetCore.csproj b/softaware.Authentication.Basic.AspNetCore/softaware.Authentication.Basic.AspNetCore.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-
     <Version>5.0.0</Version>
     <PackageProjectUrl>https://github.com/softawaregmbh/library-authentication</PackageProjectUrl>
     <RepositoryUrl>https://github.com/softawaregmbh/library-authentication</RepositoryUrl>

diff --git a/softaware.Authentication.Basic.Client/softaware.Authentication.Basic.Client.csproj b/softaware.Authentication.Basic.Client/softaware.Authentication.Basic.Client.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-
-    <Version>3.0.0</Version>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <LangVersion>Latest</LangVersion>
+    <Version>2.1.0</Version>
     <PackageProjectUrl>https://github.com/softawaregmbh/library-authentication</PackageProjectUrl>
     <RepositoryUrl>https://github.com/softawaregmbh/library-authentication</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/softaware.Authentication.Basic/softaware.Authentication.Basic.csproj b/softaware.Authentication.Basic/softaware.Authentication.Basic.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-
-    <Version>3.0.0</Version>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <LangVersion>Latest</LangVersion>
+    <Version>2.1.0</Version>
     <PackageProjectUrl>https://github.com/softawaregmbh/library-authentication</PackageProjectUrl>
     <RepositoryUrl>https://github.com/softawaregmbh/library-authentication</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/softaware.Authentication.Hmac.AspNetCore.Test/MiddlewareTest.cs b/softaware.Authentication.Hmac.AspNetCore.Test/MiddlewareTest.cs
@@ -263,7 +263,7 @@ private static HttpClient GetHttpClientWithHmacAutenticatedAppsOption(IDictionar
         {
             var factory = new TestWebApplicationFactory(o =>
             {
-                o.HmacAuthenticatedApps = hmacAuthenticatedApps;
+                o.AuthorizationProvider = new MemoryHmacAuthenticationProvider(hmacAuthenticatedApps);
             });
 
             return factory.CreateDefaultClient(new ApiKeyDelegatingHandler(appId, apiKey));

diff --git a/....Authentication.Hmac.AspNetCore.Test/softaware.Authentication.Hmac.AspNetCore.Test.csproj b/....Authentication.Hmac.AspNetCore.Test/softaware.Authentication.Hmac.AspNetCore.Test.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>

diff --git a/softaware.Authentication.Hmac.AspNetCore/AuthenticationSchemeOptions.cs b/softaware.Authentication.Hmac.AspNetCore/AuthenticationSchemeOptions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication;
 using softaware.Authentication.Hmac.AuthorizationProvider;
 
 namespace softaware.Authentication.Hmac.AspNetCore
@@ -16,21 +14,6 @@ public class HmacAuthenticationSchemeOptions : AuthenticationSchemeOptions
         /// </summary>
         public bool TrustProxy { get; set; }
 
-        private IDictionary<string, string> hmacAuthenticatedApps = new Dictionary<string, string>();
-
-        [Obsolete("Please use the MemoryHmacAuthenticationProvider for configuring the HMAC apps in-memory. This property will be removed in future versions of this package.", error: false)]
-        public IDictionary<string, string> HmacAuthenticatedApps
-        {
-            get { return this.hmacAuthenticatedApps; }
-            set
-            {
-                this.hmacAuthenticatedApps = value;
-
-                // temporary backwards compatible solution as long as we support HmacAuthenticatedApps.
-                this.AuthorizationProvider = new MemoryHmacAuthenticationProvider(this.hmacAuthenticatedApps);
-            }
-        }
-
         public IHmacAuthorizationProvider AuthorizationProvider { get; set; }
 
         public HmacAuthenticationSchemeOptions()

diff --git a/softaware.Authentication.Hmac.AspNetCore/softaware.Authentication.Hmac.AspNetCore.csproj b/softaware.Authentication.Hmac.AspNetCore/softaware.Authentication.Hmac.AspNetCore.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>softaware gmbh</Authors>
     <Company>softaware gmbh</Company>

diff --git a/softaware.Authentication.Hmac.Client/softaware.Authentication.Hmac.Client.csproj b/softaware.Authentication.Hmac.Client/softaware.Authentication.Hmac.Client.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <LangVersion>Latest</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company>softaware gmbh</Company>
     <Authors>softaware gmbh</Authors>
     <Description>A client library for HMAC authentication.</Description>
-    <Version>3.0.0</Version>
+    <Version>2.1.0</Version>
     <RepositoryUrl>https://github.com/softawaregmbh/library-authentication</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>softaware, authentication, HMAC</PackageTags>

diff --git a/softaware.Authentication.Hmac/softaware.Authentication.Hmac.csproj b/softaware.Authentication.Hmac/softaware.Authentication.Hmac.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-	<LangVersion>Latest</LangVersion>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+	  <LangVersion>Latest</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>softaware gmbh</Authors>
     <Company>softaware gmbh</Company>
@@ -10,7 +10,7 @@
     <RepositoryType>git</RepositoryType>
     <PackageTags>softaware, authentication, HMAC</PackageTags>
     <PackageProjectUrl>https://github.com/softawaregmbh/library-authentication</PackageProjectUrl>
-    <Version>3.0.0</Version>
+    <Version>2.1.0</Version>
 	<Description>Core library for HMAC authentication</Description>
     <PackageIcon>package-icon.png</PackageIcon>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>