Skip to content

Commit 7e5a4f4

Browse files
jooni91jooni91
committed
Dropping support for netcoreapp2.1.
Upgrading support for netcoreapp3.0 to netcoreapp3.1. Adding support for net5.0 and net6.0.
1 parent bd3df95 commit 7e5a4f4

File tree

3 files changed

+69
-58
lines changed

3 files changed

+69
-58
lines changed

‎docs/Griesoft.AspNetCore.ReCaptcha.xml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ReCaptcha/BackwardsCompatibility/NullableAttributes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define INTERNAL_NULLABLE_ATTRIBUTES
2-
#if !NETCOREAPP3_0
2+
#if NET461
33

44
// Licensed to the .NET Foundation under one or more agreements.
55
// The .NET Foundation licenses this file to you under the MIT license.

‎src/ReCaptcha/ReCaptcha.csproj‎

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,70 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net461</TargetFrameworks>
5-
<RootNamespace>Griesoft.AspNetCore.ReCaptcha</RootNamespace>
6-
<AssemblyName>Griesoft.AspNetCore.ReCaptcha</AssemblyName>
7-
<Company>Griesinger Software</Company>
8-
<Authors>Joonas Griesinger</Authors>
9-
<Owners>jgdevlabs,jooni91</Owners>
10-
<Title>ASP.NET Core reCAPTCHA Service</Title>
11-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
12-
<Nullable>enable</Nullable>
13-
<LangVersion>8.0</LangVersion>
14-
<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>
15-
<Copyright>2020 © Griesinger Software</Copyright>
16-
<PackageProjectUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</PackageProjectUrl>
17-
<RepositoryUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</RepositoryUrl>
18-
<NeutralLanguage>en</NeutralLanguage>
19-
<PackageTags>aspnetcore;recaptcha;aspnetcoremvc;actionfilter;google;razor;recaptcha-v2;recaptcha-v3;taghelper</PackageTags>
20-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp3.1;net461;net5.0;net6.0</TargetFrameworks>
5+
<RootNamespace>Griesoft.AspNetCore.ReCaptcha</RootNamespace>
6+
<AssemblyName>Griesoft.AspNetCore.ReCaptcha</AssemblyName>
7+
<Company>Griesinger Software</Company>
8+
<Authors>Joonas Griesinger</Authors>
9+
<Owners>jgdevlabs,jooni91</Owners>
10+
<Title>ASP.NET Core reCAPTCHA Service</Title>
11+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
12+
<Nullable>enable</Nullable>
13+
<LangVersion>latest</LangVersion>
14+
<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>
15+
<Copyright>2020 © Griesinger Software</Copyright>
16+
<PackageProjectUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</PackageProjectUrl>
17+
<RepositoryUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</RepositoryUrl>
18+
<NeutralLanguage>en</NeutralLanguage>
19+
<PackageTags>aspnetcore;recaptcha;aspnetcoremvc;actionfilter;google;razor;recaptcha-v2;recaptcha-v3;taghelper</PackageTags>
20+
</PropertyGroup>
2121

22-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
23-
<DocumentationFile>D:\repos\ReCaptcha\docs\Griesoft.AspNetCore.ReCaptcha.xml</DocumentationFile>
24-
</PropertyGroup>
22+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
23+
<DocumentationFile>D:\repos\ReCaptcha\docs\Griesoft.AspNetCore.ReCaptcha.xml</DocumentationFile>
24+
</PropertyGroup>
2525

26-
<ItemGroup>
27-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
28-
<PrivateAssets>all</PrivateAssets>
29-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30-
</PackageReference>
31-
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
32-
</ItemGroup>
26+
<ItemGroup>
27+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30+
</PackageReference>
31+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
32+
</ItemGroup>
3333

34-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
35-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
36-
</ItemGroup>
34+
<ItemGroup Condition="'$(TargetFramework)' != 'net461'">
35+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
36+
</ItemGroup>
3737

38-
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
39-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
41-
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
42-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.0" />
43-
<PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.1.0" />
44-
</ItemGroup>
38+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
39+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
41+
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
42+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.0" />
43+
<PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.1.0" />
44+
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
45+
</ItemGroup>
4546

46-
<ItemGroup>
47-
<EmbeddedResource Update="Localization\Resources.resx">
48-
<Generator>ResXFileCodeGenerator</Generator>
49-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
50-
</EmbeddedResource>
51-
</ItemGroup>
47+
<ItemGroup>
48+
<EmbeddedResource Update="Localization\Resources.resx">
49+
<Generator>ResXFileCodeGenerator</Generator>
50+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
51+
</EmbeddedResource>
52+
</ItemGroup>
5253

53-
<ItemGroup>
54-
<Folder Include="Properties\" />
55-
</ItemGroup>
54+
<ItemGroup>
55+
<Folder Include="Properties\" />
56+
</ItemGroup>
5657

57-
<ItemGroup>
58-
<Compile Update="Localization\Resources.Designer.cs">
59-
<DesignTime>True</DesignTime>
60-
<AutoGen>True</AutoGen>
61-
<DependentUpon>Resources.resx</DependentUpon>
62-
</Compile>
63-
</ItemGroup>
58+
<ItemGroup>
59+
<Compile Update="Localization\Resources.Designer.cs">
60+
<DesignTime>True</DesignTime>
61+
<AutoGen>True</AutoGen>
62+
<DependentUpon>Resources.resx</DependentUpon>
63+
</Compile>
64+
</ItemGroup>
6465

65-
<PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
66-
<NoWarn>$(NoWarn);8600;8601;8602;8603;8604</NoWarn>
67-
</PropertyGroup>
66+
<PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
67+
<NoWarn>$(NoWarn);8600;8601;8602;8603;8604</NoWarn>
68+
</PropertyGroup>
6869

6970
</Project>

0 commit comments

Comments
 (0)