Merge pull request #23 from griesoft/dev

jooni91 · web-flow · commit 4a46156cbc0a · 2024-01-23T12:56:28.000+01:00
Updating target frameworks
diff --git a/src/ReCaptcha/BackwardsCompatibility/NullableAttributes.cs b/src/ReCaptcha/BackwardsCompatibility/NullableAttributes.cs
@@ -1,5 +1,5 @@
 ﻿#define INTERNAL_NULLABLE_ATTRIBUTES
-#if NET461
+#if NET462
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
diff --git a/src/ReCaptcha/Extensions/TagHelperOutputExtensions.cs b/src/ReCaptcha/Extensions/TagHelperOutputExtensions.cs
@@ -58,7 +58,7 @@ internal static string AddQueryString(string uri, IEnumerable<KeyValuePair<strin
             return sb.ToString();
         }
 
-#if NET461
+#if NET462
         internal static void AddClass(this TagHelperOutput tagHelperOutput, string classValue, HtmlEncoder htmlEncoder)
         {
             if (tagHelperOutput == null)
diff --git a/src/ReCaptcha/Filters/ValidateRecaptchaFilter.cs b/src/ReCaptcha/Filters/ValidateRecaptchaFilter.cs
@@ -90,17 +90,17 @@ private bool ShouldShortCircuit(ActionExecutingContext context, ValidationRespon
         }
         private static bool TryGetRecaptchaToken(HttpRequest request, [NotNullWhen(true)] out string? token)
         {
-            if (request.Headers.ContainsKey(RecaptchaServiceConstants.TokenKeyName))
+            if (request.Headers.TryGetValue(RecaptchaServiceConstants.TokenKeyName, out var headerVal))
             {
-                token = request.Headers[RecaptchaServiceConstants.TokenKeyName];
+                token = headerVal;
             }
-            else if (request.HasFormContentType && request.Form.ContainsKey(RecaptchaServiceConstants.TokenKeyNameLower))
+            else if (request.HasFormContentType && request.Form.TryGetValue(RecaptchaServiceConstants.TokenKeyNameLower, out var formVal))
             {
-                token = request.Form[RecaptchaServiceConstants.TokenKeyNameLower];
+                token = formVal;
             }
-            else if (request.Query.ContainsKey(RecaptchaServiceConstants.TokenKeyNameLower))
+            else if (request.Query.TryGetValue(RecaptchaServiceConstants.TokenKeyNameLower, out var queryVal))
             {
-                token = request.Query[RecaptchaServiceConstants.TokenKeyNameLower];
+                token = queryVal;
             }
             else
             {
diff --git a/src/ReCaptcha/ReCaptcha.csproj b/src/ReCaptcha/ReCaptcha.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
         <RootNamespace>Griesoft.AspNetCore.ReCaptcha</RootNamespace>
         <AssemblyName>Griesoft.AspNetCore.ReCaptcha</AssemblyName>
-        <Company>Griesinger Software</Company>
+        <Company>Griesoft</Company>
         <Authors>Joonas Griesinger</Authors>
         <Owners>jgdevlabs,jooni91</Owners>
         <Title>ASP.NET Core reCAPTCHA Service</Title>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <Description>A Google reCAPTCHA service for ASP.NET Core. Keep bots away from submitting forms or other actions in just a few steps.</Description>
-        <Copyright>2022 © Griesinger Software</Copyright>
+        <Copyright>2024 © Griesoft</Copyright>
         <PackageProjectUrl>https://github.com/griesoft/aspnetcore-recaptcha</PackageProjectUrl>
         <RepositoryUrl>https://github.com/griesoft/aspnetcore-recaptcha</RepositoryUrl>
         <NeutralLanguage>en</NeutralLanguage>
@@ -26,25 +26,25 @@
         <AnalysisLevel>latest-recommended</AnalysisLevel>
     </PropertyGroup>
 
-    <ItemGroup Condition="$(TargetFramework)!='net461'">
+    <ItemGroup Condition="$(TargetFramework)!='net462'">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
-    <ItemGroup Condition="$(TargetFramework)=='net461'">
+    <ItemGroup Condition="$(TargetFramework)=='net462'">
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/ReCaptcha/TagHelpers/RecaptchaInvisibleTagHelper.cs b/src/ReCaptcha/TagHelpers/RecaptchaInvisibleTagHelper.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-#if !NET461
+#if !NET462
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 #else
 using Griesoft.AspNetCore.ReCaptcha.Extensions;
diff --git a/src/ReCaptcha/TagHelpers/RecaptchaTagHelper.cs b/src/ReCaptcha/TagHelpers/RecaptchaTagHelper.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-#if !NET461
+#if !NET462
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 #else
 using Griesoft.AspNetCore.ReCaptcha.Extensions;
diff --git a/src/ReCaptcha/TagHelpers/RecaptchaV3TagHelper.cs b/src/ReCaptcha/TagHelpers/RecaptchaV3TagHelper.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-#if !NET461
+#if !NET462
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 #else
 using Griesoft.AspNetCore.ReCaptcha.Extensions;
diff --git a/tests/ReCaptcha.Tests/ReCaptcha.Tests.csproj b/tests/ReCaptcha.Tests/ReCaptcha.Tests.csproj
@@ -1,25 +1,33 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
-    <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
+    <!--<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />-->
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="nunit" Version="4.0.1" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\ReCaptcha\ReCaptcha.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Using Include="NUnit.Framework.Legacy.ClassicAssert">
+      <Alias>Assert</Alias>
+    </Using>
+  </ItemGroup>
+
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ internal static string AddQueryString(string uri, IEnumerable<KeyValuePair<strin`
`58`	`58`	`return sb.ToString();`
`59`	`59`	`}`
`60`	`60`
`61`		`-#if NET461`
	`61`	`+#if NET462`
`62`	`62`	`internal static void AddClass(this TagHelperOutput tagHelperOutput, string classValue, HtmlEncoder htmlEncoder)`
`63`	`63`	`{`
`64`	`64`	`if (tagHelperOutput == null)`
Original file line number	Diff line number	Diff line change
`@@ -90,17 +90,17 @@ private bool ShouldShortCircuit(ActionExecutingContext context, ValidationRespon`
`90`	`90`	`}`
`91`	`91`	`private static bool TryGetRecaptchaToken(HttpRequest request, [NotNullWhen(true)] out string? token)`
`92`	`92`	`{`
`93`		`- if (request.Headers.ContainsKey(RecaptchaServiceConstants.TokenKeyName))`
	`93`	`+ if (request.Headers.TryGetValue(RecaptchaServiceConstants.TokenKeyName, out var headerVal))`
`94`	`94`	`{`
`95`		`- token = request.Headers[RecaptchaServiceConstants.TokenKeyName];`
	`95`	`+ token = headerVal;`
`96`	`96`	`}`
`97`		`- else if (request.HasFormContentType && request.Form.ContainsKey(RecaptchaServiceConstants.TokenKeyNameLower))`
	`97`	`+ else if (request.HasFormContentType && request.Form.TryGetValue(RecaptchaServiceConstants.TokenKeyNameLower, out var formVal))`
`98`	`98`	`{`
`99`		`- token = request.Form[RecaptchaServiceConstants.TokenKeyNameLower];`
	`99`	`+ token = formVal;`
`100`	`100`	`}`
`101`		`- else if (request.Query.ContainsKey(RecaptchaServiceConstants.TokenKeyNameLower))`
	`101`	`+ else if (request.Query.TryGetValue(RecaptchaServiceConstants.TokenKeyNameLower, out var queryVal))`
`102`	`102`	`{`
`103`		`- token = request.Query[RecaptchaServiceConstants.TokenKeyNameLower];`
	`103`	`+ token = queryVal;`
`104`	`104`	`}`
`105`	`105`	`else`
`106`	`106`	`{`