Dropping support for netcoreapp2.1.

Upgrading support for netcoreapp3.0 to netcoreapp3.1. Adding support for net5.0 and net6.0.
griesoft · Apr 12, 2022 · 7e5a4f4 · 7e5a4f4
1 parent bd3df95
commit 7e5a4f4
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 58 deletions.
diff --git a/docs/Griesoft.AspNetCore.ReCaptcha.xml b/docs/Griesoft.AspNetCore.ReCaptcha.xml
diff --git a/src/ReCaptcha/BackwardsCompatibility/NullableAttributes.cs b/src/ReCaptcha/BackwardsCompatibility/NullableAttributes.cs
@@ -1,5 +1,5 @@
 #define INTERNAL_NULLABLE_ATTRIBUTES
-#if !NETCOREAPP3_0
+#if NET461
 
 // 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/ReCaptcha.csproj b/src/ReCaptcha/ReCaptcha.csproj
@@ -1,69 +1,70 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net461</TargetFrameworks>
-    <RootNamespace>Griesoft.AspNetCore.ReCaptcha</RootNamespace>
-    <AssemblyName>Griesoft.AspNetCore.ReCaptcha</AssemblyName>
-    <Company>Griesinger Software</Company>
-    <Authors>Joonas Griesinger</Authors>
-    <Owners>jgdevlabs,jooni91</Owners>
-    <Title>ASP.NET Core reCAPTCHA Service</Title>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Nullable>enable</Nullable>
-    <LangVersion>8.0</LangVersion>
-    <Description>A Google reCPATCHA validation wrapper service for ASP.NET Core. With only a few simple setup steps you are ready to block bots from filling in and submitting forms on your website.</Description>
-    <Copyright>2020 © Griesinger Software</Copyright>
-    <PackageProjectUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</RepositoryUrl>
-    <NeutralLanguage>en</NeutralLanguage>
-    <PackageTags>aspnetcore;recaptcha;aspnetcoremvc;actionfilter;google;razor;recaptcha-v2;recaptcha-v3;taghelper</PackageTags>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>netcoreapp3.1;net461;net5.0;net6.0</TargetFrameworks>
+        <RootNamespace>Griesoft.AspNetCore.ReCaptcha</RootNamespace>
+        <AssemblyName>Griesoft.AspNetCore.ReCaptcha</AssemblyName>
+        <Company>Griesinger Software</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 reCPATCHA validation wrapper service for ASP.NET Core. With only a few simple setup steps you are ready to block bots from filling in and submitting forms on your website.</Description>
+        <Copyright>2020 © Griesinger Software</Copyright>
+        <PackageProjectUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</RepositoryUrl>
+        <NeutralLanguage>en</NeutralLanguage>
+        <PackageTags>aspnetcore;recaptcha;aspnetcoremvc;actionfilter;google;razor;recaptcha-v2;recaptcha-v3;taghelper</PackageTags>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>D:\repos\ReCaptcha\docs\Griesoft.AspNetCore.ReCaptcha.xml</DocumentationFile>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DocumentationFile>D:\repos\ReCaptcha\docs\Griesoft.AspNetCore.ReCaptcha.xml</DocumentationFile>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.1.0" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.1.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Localization\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Update="Localization\Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+    <ItemGroup>
+        <Folder Include="Properties\" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Localization\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Update="Localization\Resources.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
-    <NoWarn>$(NoWarn);8600;8601;8602;8603;8604</NoWarn>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
+        <NoWarn>$(NoWarn);8600;8601;8602;8603;8604</NoWarn>
+    </PropertyGroup>
 
 </Project>