Skip to content

Commit cdfd242

Browse files
malimingmaliming
committed
Update to NET 7.0.
1 parent 6a067d8 commit cdfd242

35 files changed

+648
-676
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Owl.reCAPTCHA
2-
Google reCAPTCHA for Asp Net Core 6.0 (v3 and v2)
2+
Google reCAPTCHA for ASP NET Core 7.0 (v3 and v2)
33

44
# Install-Package
55

‎demo/reCAPTCHA.Demo/Pages/Error.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@page
2-
@model ErrorModel
2+
@model reCAPTCHA.Demo.Pages.ErrorModel
33
@{
44
ViewData["Title"] = "Error";
55
}

‎demo/reCAPTCHA.Demo/Pages/Error.cshtml.cs

+15-16
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
using Microsoft.AspNetCore.Mvc.RazorPages;
44
using Microsoft.Extensions.Logging;
55

6-
namespace reCAPTCHA.Demo.Pages
6+
namespace reCAPTCHA.Demo.Pages;
7+
8+
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
9+
public class ErrorModel : PageModel
710
{
8-
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
9-
public class ErrorModel : PageModel
10-
{
11-
public string RequestId { get; set; }
11+
public string RequestId { get; set; }
1212

13-
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
13+
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
1414

15-
private readonly ILogger<ErrorModel> _logger;
15+
private readonly ILogger<ErrorModel> _logger;
1616

17-
public ErrorModel(ILogger<ErrorModel> logger)
18-
{
19-
_logger = logger;
20-
}
17+
public ErrorModel(ILogger<ErrorModel> logger)
18+
{
19+
_logger = logger;
20+
}
2121

22-
public void OnGet()
23-
{
24-
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
25-
}
22+
public void OnGet()
23+
{
24+
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
2625
}
27-
}
26+
}

‎demo/reCAPTCHA.Demo/Pages/Index.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@page
2-
@model IndexModel
2+
@model reCAPTCHA.Demo.Pages.IndexModel
33
@{
44
ViewData["Title"] = "Home page";
55
}

‎demo/reCAPTCHA.Demo/Pages/Index.cshtml.cs

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
using Microsoft.AspNetCore.Mvc.RazorPages;
22
using Microsoft.Extensions.Logging;
33

4-
namespace reCAPTCHA.Demo.Pages
4+
namespace reCAPTCHA.Demo.Pages;
5+
6+
public class IndexModel : PageModel
57
{
6-
public class IndexModel : PageModel
7-
{
8-
private readonly ILogger<IndexModel> _logger;
8+
private readonly ILogger<IndexModel> _logger;
99

10-
public IndexModel(ILogger<IndexModel> logger)
11-
{
12-
_logger = logger;
13-
}
10+
public IndexModel(ILogger<IndexModel> logger)
11+
{
12+
_logger = logger;
13+
}
1414

15-
public void OnGet()
16-
{
15+
public void OnGet()
16+
{
1717

18-
}
1918
}
20-
}
19+
}

‎demo/reCAPTCHA.Demo/Pages/Privacy.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@page
2-
@model PrivacyModel
2+
@model reCAPTCHA.Demo.Pages.PrivacyModel
33
@{
44
ViewData["Title"] = "Privacy Policy";
55
}

‎demo/reCAPTCHA.Demo/Pages/Privacy.cshtml.cs

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
using Microsoft.AspNetCore.Mvc.RazorPages;
22
using Microsoft.Extensions.Logging;
33

4-
namespace reCAPTCHA.Demo.Pages
4+
namespace reCAPTCHA.Demo.Pages;
5+
6+
public class PrivacyModel : PageModel
57
{
6-
public class PrivacyModel : PageModel
7-
{
8-
private readonly ILogger<PrivacyModel> _logger;
8+
private readonly ILogger<PrivacyModel> _logger;
99

10-
public PrivacyModel(ILogger<PrivacyModel> logger)
11-
{
12-
_logger = logger;
13-
}
10+
public PrivacyModel(ILogger<PrivacyModel> logger)
11+
{
12+
_logger = logger;
13+
}
1414

15-
public void OnGet()
16-
{
17-
}
15+
public void OnGet()
16+
{
1817
}
19-
}
18+
}

‎demo/reCAPTCHA.Demo/Pages/V2_Checkbox.cshtml.cs

+20-21
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,30 @@
44
using Owl.reCAPTCHA;
55
using Owl.reCAPTCHA.v2;
66

7-
namespace reCAPTCHA.Demo.Pages
7+
namespace reCAPTCHA.Demo.Pages;
8+
9+
public class V2_CheckboxModel : PageModel
810
{
9-
public class V2_CheckboxModel : PageModel
10-
{
11-
private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
11+
private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
1212

13-
public string Result { get; set; }
13+
public string Result { get; set; }
1414

15-
public V2_CheckboxModel(IreCAPTCHASiteVerifyV2 siteVerify)
16-
{
17-
_siteVerify = siteVerify;
18-
}
15+
public V2_CheckboxModel(IreCAPTCHASiteVerifyV2 siteVerify)
16+
{
17+
_siteVerify = siteVerify;
18+
}
1919

20-
public async Task OnPostAsync(string token)
20+
public async Task OnPostAsync(string token)
21+
{
22+
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
2123
{
22-
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
23-
{
24-
Response = token,
25-
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26-
});
24+
Response = token,
25+
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26+
});
2727

28-
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29-
{
30-
WriteIndented = true
31-
});
32-
}
28+
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29+
{
30+
WriteIndented = true
31+
});
3332
}
34-
}
33+
}

‎demo/reCAPTCHA.Demo/Pages/V2_Invisible.cshtml.cs

+20-21
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,30 @@
44
using Owl.reCAPTCHA;
55
using Owl.reCAPTCHA.v2;
66

7-
namespace reCAPTCHA.Demo.Pages
7+
namespace reCAPTCHA.Demo.Pages;
8+
9+
public class V2_InvisibleModel : PageModel
810
{
9-
public class V2_InvisibleModel : PageModel
10-
{
11-
private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
11+
private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
1212

13-
public string Result { get; set; }
13+
public string Result { get; set; }
1414

15-
public V2_InvisibleModel (IreCAPTCHASiteVerifyV2 siteVerify)
16-
{
17-
_siteVerify = siteVerify;
18-
}
15+
public V2_InvisibleModel (IreCAPTCHASiteVerifyV2 siteVerify)
16+
{
17+
_siteVerify = siteVerify;
18+
}
1919

20-
public async Task OnPostAsync(string token)
20+
public async Task OnPostAsync(string token)
21+
{
22+
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
2123
{
22-
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
23-
{
24-
Response = token,
25-
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26-
});
24+
Response = token,
25+
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26+
});
2727

28-
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29-
{
30-
WriteIndented = true
31-
});
32-
}
28+
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29+
{
30+
WriteIndented = true
31+
});
3332
}
34-
}
33+
}

‎demo/reCAPTCHA.Demo/Pages/V3.cshtml.cs

+20-21
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,30 @@
44
using Owl.reCAPTCHA;
55
using Owl.reCAPTCHA.v3;
66

7-
namespace reCAPTCHA.Demo.Pages
7+
namespace reCAPTCHA.Demo.Pages;
8+
9+
public class V3Model : PageModel
810
{
9-
public class V3Model : PageModel
10-
{
11-
private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
11+
private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
1212

13-
public string Result { get; set; }
13+
public string Result { get; set; }
1414

15-
public V3Model(IreCAPTCHASiteVerifyV3 siteVerify)
16-
{
17-
_siteVerify = siteVerify;
18-
}
15+
public V3Model(IreCAPTCHASiteVerifyV3 siteVerify)
16+
{
17+
_siteVerify = siteVerify;
18+
}
1919

20-
public async Task OnPostAsync(string token)
20+
public async Task OnPostAsync(string token)
21+
{
22+
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
2123
{
22-
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
23-
{
24-
Response = token,
25-
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26-
});
24+
Response = token,
25+
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26+
});
2727

28-
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29-
{
30-
WriteIndented = true
31-
});
32-
}
28+
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29+
{
30+
WriteIndented = true
31+
});
3332
}
34-
}
33+
}

‎demo/reCAPTCHA.Demo/Pages/V3_Programmatically.cshtml.cs

+20-21
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,30 @@
44
using Owl.reCAPTCHA;
55
using Owl.reCAPTCHA.v3;
66

7-
namespace reCAPTCHA.Demo.Pages
7+
namespace reCAPTCHA.Demo.Pages;
8+
9+
public class V3_ProgrammaticallyModel : PageModel
810
{
9-
public class V3_ProgrammaticallyModel : PageModel
10-
{
11-
private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
11+
private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
1212

13-
public string Result { get; set; }
13+
public string Result { get; set; }
1414

15-
public V3_ProgrammaticallyModel(IreCAPTCHASiteVerifyV3 siteVerify)
16-
{
17-
_siteVerify = siteVerify;
18-
}
15+
public V3_ProgrammaticallyModel(IreCAPTCHASiteVerifyV3 siteVerify)
16+
{
17+
_siteVerify = siteVerify;
18+
}
1919

20-
public async Task OnPostAsync(string token)
20+
public async Task OnPostAsync(string token)
21+
{
22+
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
2123
{
22-
var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
23-
{
24-
Response = token,
25-
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26-
});
24+
Response = token,
25+
RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
26+
});
2727

28-
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29-
{
30-
WriteIndented = true
31-
});
32-
}
28+
Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
29+
{
30+
WriteIndented = true
31+
});
3332
}
34-
}
33+
}

‎demo/reCAPTCHA.Demo/Pages/_ViewImports.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
@namespace reCAPTCHA.Demo.Pages
1+
@namespace reCAPTCHA.Demo.Pages ;
22
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
33
@addTagHelper *, Owl.reCAPTCHA

‎demo/reCAPTCHA.Demo/Program.cs

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
using Microsoft.AspNetCore.Hosting;
22
using Microsoft.Extensions.Hosting;
33

4-
namespace reCAPTCHA.Demo
4+
namespace reCAPTCHA.Demo;
5+
6+
public class Program
57
{
6-
public class Program
8+
public static void Main(string[] args)
79
{
8-
public static void Main(string[] args)
9-
{
10-
CreateHostBuilder(args).Build().Run();
11-
}
10+
CreateHostBuilder(args).Build().Run();
11+
}
1212

13-
public static IHostBuilder CreateHostBuilder(string[] args)
14-
{
15-
return Host.CreateDefaultBuilder(args)
16-
.ConfigureWebHostDefaults(webBuilder =>
17-
{
18-
webBuilder.UseStartup<Startup>();
19-
});
20-
}
13+
public static IHostBuilder CreateHostBuilder(string[] args)
14+
{
15+
return Host.CreateDefaultBuilder(args)
16+
.ConfigureWebHostDefaults(webBuilder =>
17+
{
18+
webBuilder.UseStartup<Startup>();
19+
});
2120
}
22-
}
21+
}

0 commit comments

Comments
 (0)