started update to .net8

softawaregmbh · Feb 18, 2024 · f361582 · f361582
1 parent 52b1634
commit f361582
Show file tree

Hide file tree

Showing 20 changed files with 118 additions and 152 deletions.
diff --git a/softaware.Authentication.Basic.AspNetCore.Test/TestStartup.cs b/softaware.Authentication.Basic.AspNetCore.Test/TestStartup.cs
@@ -6,12 +6,8 @@
 
 namespace softaware.Authentication.Basic.AspNetCore.Test
 {
-    public class TestStartup
+    public class TestStartup(IWebHostEnvironment env)
     {
-        public TestStartup(IWebHostEnvironment env)
-        {
-        }
-
         /// <summary>
         ///  This method gets called by the runtime. Use this method to add services to the container.
         /// </summary>

diff --git a/softaware.Authentication.Basic.AspNetCore.Test/TestWebApplicationFactory.cs b/softaware.Authentication.Basic.AspNetCore.Test/TestWebApplicationFactory.cs
@@ -5,14 +5,10 @@
 
 namespace softaware.Authentication.Basic.AspNetCore.Test
 {
-    public class TestWebApplicationFactory : WebApplicationFactory<TestStartup>
+    public class TestWebApplicationFactory(IBasicAuthorizationProvider basicAuthorizationProvider)
+        : WebApplicationFactory<TestStartup>
     {
-        private readonly IBasicAuthorizationProvider basicAuthorizationProvider;
-
-        public TestWebApplicationFactory(IBasicAuthorizationProvider basicAuthorizationProvider)
-        {
-            this.basicAuthorizationProvider = basicAuthorizationProvider;
-        }
+        private readonly IBasicAuthorizationProvider basicAuthorizationProvider = basicAuthorizationProvider;
 
         protected override IWebHostBuilder CreateWebHostBuilder()
         {

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,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationHandler.cs b/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationHandler.cs
@@ -13,7 +13,9 @@
 
 namespace softaware.Authentication.Hmac.AspNetCore
 {
-    internal class BasicAuthenticationHandler : AuthenticationHandler<BasicAuthenticationSchemeOptions>
+    internal class BasicAuthenticationHandler(
+        IOptionsMonitor<BasicAuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder)
+        : AuthenticationHandler<BasicAuthenticationSchemeOptions>(options, logger, encoder)
     {
         private class ValidationResult
         {
@@ -24,11 +26,6 @@ private class ValidationResult
             public string Password { get; set; }
         }
 
-        public BasicAuthenticationHandler(IOptionsMonitor<BasicAuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
-            : base(options, logger, encoder, clock)
-        {
-        }
-
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
             if (this.Options.AuthorizationProvider == null)
@@ -51,13 +48,13 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
             if (validationResult.Valid)
             {
                 var claimsToSet = new List<Claim> 
-                { 
-                    new Claim(ClaimTypes.NameIdentifier, validationResult.Username) 
+                {
+                    new(ClaimTypes.NameIdentifier, validationResult.Username)
                 };
 
                 if (this.Options.AddPasswordAsClaim)
                 {
-                    claimsToSet.Add(new Claim(this.Options.PasswordClaimType, validationResult.Password));
+                    claimsToSet.Add(new(this.Options.PasswordClaimType, validationResult.Password));
                 }
 
                 var principal = new ClaimsPrincipal(new ClaimsIdentity(claimsToSet, BasicAuthenticationDefaults.AuthenticationType, ClaimTypes.NameIdentifier, ClaimTypes.Role));

diff --git a/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationPostConfigureOptions.cs b/softaware.Authentication.Basic.AspNetCore/BasicAuthenticationPostConfigureOptions.cs
@@ -3,14 +3,10 @@
 
 namespace softaware.Authentication.Basic.AspNetCore
 {
-    public class BasicAuthenticationPostConfigureOptions : IPostConfigureOptions<BasicAuthenticationSchemeOptions>
+    public class BasicAuthenticationPostConfigureOptions(IBasicAuthorizationProvider basicAuthorizationProvider = null)
+        : IPostConfigureOptions<BasicAuthenticationSchemeOptions>
     {
-        private readonly IBasicAuthorizationProvider basicAuthorizationProvider;
-
-        public BasicAuthenticationPostConfigureOptions(IBasicAuthorizationProvider basicAuthorizationProvider = null)
-        {
-            this.basicAuthorizationProvider = basicAuthorizationProvider;
-        }
+        private readonly IBasicAuthorizationProvider basicAuthorizationProvider = basicAuthorizationProvider;
 
         public void PostConfigure(string name, BasicAuthenticationSchemeOptions options)
         {

diff --git a/softaware.Authentication.Basic.AspNetCore/softaware.Authentication.Basic.AspNetCore.csproj b/softaware.Authentication.Basic.AspNetCore/softaware.Authentication.Basic.AspNetCore.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
-    <Version>4.0.0</Version>
+    <Version>5.0.0</Version>
     <PackageProjectUrl>https://github.com/softawaregmbh/library-authentication</PackageProjectUrl>
     <RepositoryUrl>https://github.com/softawaregmbh/library-authentication</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -16,18 +16,20 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PackageReleaseNotes>Remove support for net461</PackageReleaseNotes>
+    <PackageReleaseNotes>Update to net8.0</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="..\Assets\package-icon.png" Link="package-icon.png" Pack="true" PackagePath="/" />
   </ItemGroup>

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>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
-    <Version>2.0.0</Version>
+    <Version>3.0.0</Version>
     <PackageProjectUrl>https://github.com/softawaregmbh/library-authentication</PackageProjectUrl>
     <RepositoryUrl>https://github.com/softawaregmbh/library-authentication</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -22,7 +22,7 @@
     <Content Include="..\Assets\package-icon.png" Link="package-icon.png" Pack="true" PackagePath="/" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/softaware.Authentication.Basic/BasicAuthenticationClientConfiguration.cs b/softaware.Authentication.Basic/BasicAuthenticationClientConfiguration.cs
@@ -3,6 +3,7 @@
     public class BasicAuthenticationClientConfiguration
     {
         public string Username { get; set; }
+
         public string Password { get; set; }
     }
 }
diff --git a/softaware.Authentication.Basic/BasicAuthenticationDefaults.cs b/softaware.Authentication.Basic/BasicAuthenticationDefaults.cs
@@ -3,7 +3,9 @@
     public class BasicAuthenticationDefaults
     {
         public const string AuthenticationScheme = "Basic";
+
         public const string AuthenticationType = "Basic";
+
         public const string PasswordClaimType = "Password";
     }
 }
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>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
-    <Version>2.0.0</Version>
+    <Version>3.0.0</Version>
     <PackageProjectUrl>https://github.com/softawaregmbh/library-authentication</PackageProjectUrl>
     <RepositoryUrl>https://github.com/softawaregmbh/library-authentication</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/softaware.Authentication.Hmac.AspNetCore.Test/MiddlewareTest.cs b/softaware.Authentication.Hmac.AspNetCore.Test/MiddlewareTest.cs
@@ -82,7 +82,7 @@ public async Task Request_WithDeprecatedHmacAuthorizedAppsOption_Authorized()
                 "MNpx/353+rW+pqv8UbRTAtO1yoabl8/RFDAv/615u5w=");
 
             var response = await client.GetAsync("api/test");
-            Assert.True(response.StatusCode == HttpStatusCode.OK);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [Fact]
@@ -94,7 +94,7 @@ public async Task Request_WithDefaultAuthorizationProvider_Authorized()
                 "MNpx/353+rW+pqv8UbRTAtO1yoabl8/RFDAv/615u5w=");
 
             var response = await client.GetAsync("api/test");
-            Assert.True(response.StatusCode == HttpStatusCode.OK);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [Fact]
@@ -108,7 +108,7 @@ public async Task Request_Authorized_WithTrustProxy()
             client.DefaultRequestHeaders.Add("X-Forwarded-Proto", "http");
 
             var response = await client.GetAsync("api/test");
-            Assert.True(response.StatusCode == HttpStatusCode.OK);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
         [Fact]
@@ -122,7 +122,7 @@ public async Task Request_Unauthorized_WithTrustProxy()
             client.DefaultRequestHeaders.Add("X-Forwarded-Proto", "https");
 
             var response = await client.GetAsync("api/test");
-            Assert.True(response.StatusCode == HttpStatusCode.Unauthorized);
+            Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
         }
 
         [Theory]
@@ -241,7 +241,7 @@ private static HttpClient GetHttpClient(
                 handlers.Add(new RemoveHashingMethodDelegatingHandler());
             }
 
-            return factory.CreateDefaultClient(handlers.ToArray());
+            return factory.CreateDefaultClient([.. handlers]);
         }
 
         private static HttpClient GetHttpClientWithHmacAutenticatedAppsOption(IDictionary<string, string> hmacAuthenticatedApps, string appId, string apiKey)
@@ -250,6 +250,7 @@ private static HttpClient GetHttpClientWithHmacAutenticatedAppsOption(IDictionar
             {
                 o.HmacAuthenticatedApps = hmacAuthenticatedApps;
             });
+
             return factory.CreateDefaultClient(new ApiKeyDelegatingHandler(appId, apiKey));
         }
 

diff --git a/softaware.Authentication.Hmac.AspNetCore.Test/TestStartup.cs b/softaware.Authentication.Hmac.AspNetCore.Test/TestStartup.cs
@@ -6,12 +6,8 @@
 
 namespace softaware.Authentication.Hmac.AspNetCore.Test
 {
-    public class TestStartup
+    public class TestStartup(IWebHostEnvironment env)
     {
-        public TestStartup(IWebHostEnvironment env)
-        {
-        }
-
         /// <summary>
         ///  This method gets called by the runtime. Use this method to add services to the container.
         /// </summary>

diff --git a/softaware.Authentication.Hmac.AspNetCore.Test/TestWebApplicationFactory.cs b/softaware.Authentication.Hmac.AspNetCore.Test/TestWebApplicationFactory.cs
@@ -5,14 +5,10 @@
 
 namespace softaware.Authentication.Hmac.AspNetCore.Test
 {
-    public class TestWebApplicationFactory : WebApplicationFactory<TestStartup>
+    public class TestWebApplicationFactory(Action<HmacAuthenticationSchemeOptions> configureOptions)
+        : WebApplicationFactory<TestStartup>
     {
-        private readonly Action<HmacAuthenticationSchemeOptions> configureOptions;
-
-        public TestWebApplicationFactory(Action<HmacAuthenticationSchemeOptions> configureOptions)
-        {
-            this.configureOptions = configureOptions;
-        }
+        private readonly Action<HmacAuthenticationSchemeOptions> configureOptions = configureOptions;
 
         protected override IWebHostBuilder CreateWebHostBuilder()
         {

diff --git a/...ication.Hmac.AspNetCore.Test/TestWebApplicationFactoryWithDefaultAuthorizationProvider.cs b/...ication.Hmac.AspNetCore.Test/TestWebApplicationFactoryWithDefaultAuthorizationProvider.cs
@@ -7,14 +7,10 @@
 
 namespace softaware.Authentication.Hmac.AspNetCore.Test
 {
-    public class TestWebApplicationFactoryWithDefaultAuthorizationProvider : WebApplicationFactory<TestStartup>
+    public class TestWebApplicationFactoryWithDefaultAuthorizationProvider(IDictionary<string, string> hmacAuthenticatedApps)
+        : WebApplicationFactory<TestStartup>
     {
-        private readonly IDictionary<string, string> hmacAuthenticatedApps;
-
-        public TestWebApplicationFactoryWithDefaultAuthorizationProvider(IDictionary<string, string> hmacAuthenticatedApps)
-        {
-            this.hmacAuthenticatedApps = hmacAuthenticatedApps ?? throw new ArgumentNullException(nameof(hmacAuthenticatedApps));
-        }
+        private readonly IDictionary<string, string> hmacAuthenticatedApps = hmacAuthenticatedApps ?? throw new ArgumentNullException(nameof(hmacAuthenticatedApps));
 
         protected override IWebHostBuilder CreateWebHostBuilder()
         {

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,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="Xunit.Combinatorial" Version="1.5.25" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="Xunit.Combinatorial" Version="1.6.24" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>