Merge pull request #14 from griesoft/dev

Repo URL meta changes and other small fixes
griesoft · May 2, 2022 · 0a7dd3f · 0a7dd3f
2 parents 4160fed + 257f986
commit 0a7dd3f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 27 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [griesoft] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: griesoft
@@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.paypal.me/griesoft'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -83,7 +83,7 @@ jobs:
     dependsOn: 
       - BuildPack
       - Test
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+    condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master'))
     environment: Development
     strategy:
       runOnce:
@@ -98,22 +98,4 @@ jobs:
                 packagesToPush: '$(Pipeline.Workspace)/**/*.nupkg;!$(Pipeline.Workspace)/**/*.snupkg'
                 nuGetFeedType: 'internal'
                 publishVstsFeed: 'f9036ec9-eb1c-4aff-a2b8-27fdaa573d0f/29b705d0-eac8-42a7-9230-4bcfe9f83688'
-                allowPackageConflicts: true
-
-  - job: BumpPatch
-    displayName: Bump the version patch
-    dependsOn:
-      - PushToTestFeed
-    condition: and(succeeded(), eq(variables['Build.SOurceBranch'], 'refs/heads/master'))
-    steps:
-      - task: DownloadFile@1
-        displayName: 'Download version bump script'
-        inputs:
-          FileUrl: 'https://gist.githubusercontent.com/jooni91/d3e5ca575402eb3454dd1c1a4a4d998e/raw/d13c90d62ad0d614df9c5129c47a51c19e9460cb/update-patch-version-code-script.ps1'
-
-      - task: PowerShell@2
-        displayName: 'Run version bump script'
-        inputs:
-          targetType: filePath
-          filePath: './update-patch-version-code-script.ps1'
-          arguments: '$(System.AccessToken)'
+                allowPackageConflicts: true
diff --git a/src/ReCaptcha/Extensions/TagHelperOutputExtensions.cs b/src/ReCaptcha/Extensions/TagHelperOutputExtensions.cs
@@ -58,6 +58,7 @@ internal static string AddQueryString(string uri, IEnumerable<KeyValuePair<strin
             return sb.ToString();
         }
 
+#if NET461
         internal static void AddClass(this TagHelperOutput tagHelperOutput, string classValue, HtmlEncoder htmlEncoder)
         {
             if (tagHelperOutput == null)
@@ -135,5 +136,6 @@ private static string ExtractClassValue(TagHelperAttribute classAttribute, HtmlE
             var currentClassValue = extractedClassValue ?? string.Empty;
             return currentClassValue;
         }
+#endif
     }
 }
diff --git a/src/ReCaptcha/ReCaptcha.csproj b/src/ReCaptcha/ReCaptcha.csproj
@@ -13,8 +13,8 @@
         <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>
-        <PackageProjectUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/jgdevlabs/aspnetcore-recaptcha</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/griesoft/aspnetcore-recaptcha</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/griesoft/aspnetcore-recaptcha</RepositoryUrl>
         <NeutralLanguage>en</NeutralLanguage>
         <PackageTags>aspnetcore;recaptcha;aspnetcoremvc;recaptcha-v2;recaptcha-v3</PackageTags>
         <IncludeSymbols>true</IncludeSymbols>

diff --git a/src/ReCaptcha/TagHelpers/RecaptchaInvisibleTagHelper.cs b/src/ReCaptcha/TagHelpers/RecaptchaInvisibleTagHelper.cs
@@ -1,12 +1,17 @@
 using System;
 using System.Text.Encodings.Web;
 using Griesoft.AspNetCore.ReCaptcha.Configuration;
-using Griesoft.AspNetCore.ReCaptcha.Extensions;
 using Griesoft.AspNetCore.ReCaptcha.Localization;
 using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
+#if !NET461
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+#else
+using Griesoft.AspNetCore.ReCaptcha.Extensions;
+#endif
+
 namespace Griesoft.AspNetCore.ReCaptcha.TagHelpers
 {
     /// <summary>

diff --git a/src/ReCaptcha/TagHelpers/RecaptchaTagHelper.cs b/src/ReCaptcha/TagHelpers/RecaptchaTagHelper.cs
@@ -1,10 +1,15 @@
 using System;
 using System.Text.Encodings.Web;
 using Griesoft.AspNetCore.ReCaptcha.Configuration;
-using Griesoft.AspNetCore.ReCaptcha.Extensions;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
+#if !NET461
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+#else
+using Griesoft.AspNetCore.ReCaptcha.Extensions;
+#endif
+
 namespace Griesoft.AspNetCore.ReCaptcha.TagHelpers
 {
     /// <summary>

diff --git a/src/ReCaptcha/TagHelpers/RecaptchaV3TagHelper.cs b/src/ReCaptcha/TagHelpers/RecaptchaV3TagHelper.cs
@@ -1,12 +1,17 @@
 using System;
 using System.Text.Encodings.Web;
 using Griesoft.AspNetCore.ReCaptcha.Configuration;
-using Griesoft.AspNetCore.ReCaptcha.Extensions;
 using Griesoft.AspNetCore.ReCaptcha.Localization;
 using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
+#if !NET461
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+#else
+using Griesoft.AspNetCore.ReCaptcha.Extensions;
+#endif
+
 namespace Griesoft.AspNetCore.ReCaptcha.TagHelpers
 {
     /// <summary>