Update to NET 7.0.

maliming · Jan 7, 2023 · cdfd242 · cdfd242
1 parent 6a067d8
commit cdfd242
Show file tree

Hide file tree

Showing 35 changed files with 648 additions and 676 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Owl.reCAPTCHA
-Google reCAPTCHA for Asp Net Core 6.0 (v3 and v2)
+Google reCAPTCHA for ASP NET Core 7.0 (v3 and v2)
 
 # Install-Package
 

diff --git a/demo/reCAPTCHA.Demo/Pages/Error.cshtml b/demo/reCAPTCHA.Demo/Pages/Error.cshtml
@@ -1,5 +1,5 @@
 @page
-@model ErrorModel
+@model reCAPTCHA.Demo.Pages.ErrorModel
 @{
     ViewData["Title"] = "Error";
 }

diff --git a/demo/reCAPTCHA.Demo/Pages/Error.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/Error.cshtml.cs
@@ -3,25 +3,24 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace reCAPTCHA.Demo.Pages
+namespace reCAPTCHA.Demo.Pages;
+
+[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+public class ErrorModel : PageModel
 {
-    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-    public class ErrorModel : PageModel
-    {
-        public string RequestId { get; set; }
+    public string RequestId { get; set; }
 
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-        private readonly ILogger<ErrorModel> _logger;
+    private readonly ILogger<ErrorModel> _logger;
 
-        public ErrorModel(ILogger<ErrorModel> logger)
-        {
-            _logger = logger;
-        }
+    public ErrorModel(ILogger<ErrorModel> logger)
+    {
+        _logger = logger;
+    }
 
-        public void OnGet()
-        {
-            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
-        }
+    public void OnGet()
+    {
+        RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
     }
-}
+}
diff --git a/demo/reCAPTCHA.Demo/Pages/Index.cshtml b/demo/reCAPTCHA.Demo/Pages/Index.cshtml
@@ -1,5 +1,5 @@
 @page
-@model IndexModel
+@model reCAPTCHA.Demo.Pages.IndexModel
 @{
     ViewData["Title"] = "Home page";
 }

diff --git a/demo/reCAPTCHA.Demo/Pages/Index.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/Index.cshtml.cs
@@ -1,20 +1,19 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace reCAPTCHA.Demo.Pages
+namespace reCAPTCHA.Demo.Pages;
+
+public class IndexModel : PageModel
 {
-    public class IndexModel : PageModel
-    {
-        private readonly ILogger<IndexModel> _logger;
+    private readonly ILogger<IndexModel> _logger;
 
-        public IndexModel(ILogger<IndexModel> logger)
-        {
-            _logger = logger;
-        }
+    public IndexModel(ILogger<IndexModel> logger)
+    {
+        _logger = logger;
+    }
 
-        public void OnGet()
-        {
+    public void OnGet()
+    {
 
-        }
     }
-}
+}
diff --git a/demo/reCAPTCHA.Demo/Pages/Privacy.cshtml b/demo/reCAPTCHA.Demo/Pages/Privacy.cshtml
@@ -1,5 +1,5 @@
 @page
-@model PrivacyModel
+@model reCAPTCHA.Demo.Pages.PrivacyModel
 @{
     ViewData["Title"] = "Privacy Policy";
 }

diff --git a/demo/reCAPTCHA.Demo/Pages/Privacy.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/Privacy.cshtml.cs
@@ -1,19 +1,18 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace reCAPTCHA.Demo.Pages
+namespace reCAPTCHA.Demo.Pages;
+
+public class PrivacyModel : PageModel
 {
-    public class PrivacyModel : PageModel
-    {
-        private readonly ILogger<PrivacyModel> _logger;
+    private readonly ILogger<PrivacyModel> _logger;
 
-        public PrivacyModel(ILogger<PrivacyModel> logger)
-        {
-            _logger = logger;
-        }
+    public PrivacyModel(ILogger<PrivacyModel> logger)
+    {
+        _logger = logger;
+    }
 
-        public void OnGet()
-        {
-        }
+    public void OnGet()
+    {
     }
-}
+}
diff --git a/demo/reCAPTCHA.Demo/Pages/V2_Checkbox.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/V2_Checkbox.cshtml.cs
@@ -4,31 +4,30 @@
 using Owl.reCAPTCHA;
 using Owl.reCAPTCHA.v2;
 
-namespace reCAPTCHA.Demo.Pages
+namespace reCAPTCHA.Demo.Pages;
+
+public class V2_CheckboxModel : PageModel
 {
-    public class V2_CheckboxModel : PageModel
-    {
-        private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
+    private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
 
-        public string Result { get; set; }
+    public string Result { get; set; }
 
-        public V2_CheckboxModel(IreCAPTCHASiteVerifyV2 siteVerify)
-        {
-            _siteVerify = siteVerify;
-        }
+    public V2_CheckboxModel(IreCAPTCHASiteVerifyV2 siteVerify)
+    {
+        _siteVerify = siteVerify;
+    }
 
-        public async Task OnPostAsync(string token)
+    public async Task OnPostAsync(string token)
+    {
+        var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
         {
-            var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
-            {
-                Response = token,
-                RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
-            });
+            Response = token,
+            RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
+        });
 
-            Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
-        }
+        Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
+        {
+            WriteIndented = true
+        });
     }
-}
+}
diff --git a/demo/reCAPTCHA.Demo/Pages/V2_Invisible.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/V2_Invisible.cshtml.cs
@@ -4,31 +4,30 @@
 using Owl.reCAPTCHA;
 using Owl.reCAPTCHA.v2;
 
-namespace reCAPTCHA.Demo.Pages
+namespace reCAPTCHA.Demo.Pages;
+
+public class V2_InvisibleModel : PageModel
 {
-    public class V2_InvisibleModel : PageModel
-    {
-        private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
+    private readonly IreCAPTCHASiteVerifyV2 _siteVerify;
 
-        public string Result { get; set; }
+    public string Result { get; set; }
 
-        public V2_InvisibleModel (IreCAPTCHASiteVerifyV2 siteVerify)
-        {
-            _siteVerify = siteVerify;
-        }
+    public V2_InvisibleModel (IreCAPTCHASiteVerifyV2 siteVerify)
+    {
+        _siteVerify = siteVerify;
+    }
 
-        public async Task OnPostAsync(string token)
+    public async Task OnPostAsync(string token)
+    {
+        var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
         {
-            var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
-            {
-                Response = token,
-                RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
-            });
+            Response = token,
+            RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
+        });
 
-            Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
-        }
+        Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
+        {
+            WriteIndented = true
+        });
     }
-}
+}
diff --git a/demo/reCAPTCHA.Demo/Pages/V3.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/V3.cshtml.cs
@@ -4,31 +4,30 @@
 using Owl.reCAPTCHA;
 using Owl.reCAPTCHA.v3;
 
-namespace reCAPTCHA.Demo.Pages
+namespace reCAPTCHA.Demo.Pages;
+
+public class V3Model : PageModel
 {
-    public class V3Model : PageModel
-    {
-        private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
+    private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
 
-        public string Result { get; set; }
+    public string Result { get; set; }
 
-        public V3Model(IreCAPTCHASiteVerifyV3 siteVerify)
-        {
-            _siteVerify = siteVerify;
-        }
+    public V3Model(IreCAPTCHASiteVerifyV3 siteVerify)
+    {
+        _siteVerify = siteVerify;
+    }
 
-        public async Task OnPostAsync(string token)
+    public async Task OnPostAsync(string token)
+    {
+        var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
         {
-            var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
-            {
-                Response = token,
-                RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
-            });
+            Response = token,
+            RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
+        });
 
-            Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
-        }
+        Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
+        {
+            WriteIndented = true
+        });
     }
-}
+}
diff --git a/demo/reCAPTCHA.Demo/Pages/V3_Programmatically.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/V3_Programmatically.cshtml.cs
@@ -4,31 +4,30 @@
 using Owl.reCAPTCHA;
 using Owl.reCAPTCHA.v3;
 
-namespace reCAPTCHA.Demo.Pages
+namespace reCAPTCHA.Demo.Pages;
+
+public class V3_ProgrammaticallyModel : PageModel
 {
-    public class V3_ProgrammaticallyModel : PageModel
-    {
-        private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
+    private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
 
-        public string Result { get; set; }
+    public string Result { get; set; }
 
-        public V3_ProgrammaticallyModel(IreCAPTCHASiteVerifyV3 siteVerify)
-        {
-            _siteVerify = siteVerify;
-        }
+    public V3_ProgrammaticallyModel(IreCAPTCHASiteVerifyV3 siteVerify)
+    {
+        _siteVerify = siteVerify;
+    }
 
-        public async Task OnPostAsync(string token)
+    public async Task OnPostAsync(string token)
+    {
+        var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
         {
-            var response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
-            {
-                Response = token,
-                RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
-            });
+            Response = token,
+            RemoteIp = HttpContext.Connection.RemoteIpAddress?.ToString()
+        });
 
-            Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
-        }
+        Result = JsonSerializer.Serialize(response, new JsonSerializerOptions
+        {
+            WriteIndented = true
+        });
     }
-}
+}
diff --git a/demo/reCAPTCHA.Demo/Pages/_ViewImports.cshtml b/demo/reCAPTCHA.Demo/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@namespace reCAPTCHA.Demo.Pages
+@namespace reCAPTCHA.Demo.Pages ;
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Owl.reCAPTCHA
diff --git a/demo/reCAPTCHA.Demo/Program.cs b/demo/reCAPTCHA.Demo/Program.cs
@@ -1,22 +1,21 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace reCAPTCHA.Demo
+namespace reCAPTCHA.Demo;
+
+public class Program
 {
-    public class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+        CreateHostBuilder(args).Build().Run();
+    }
 
-        public static IHostBuilder CreateHostBuilder(string[] args)
-        {
-            return Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-        }
+    public static IHostBuilder CreateHostBuilder(string[] args)
+    {
+        return Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
     }
-}
+}