Merge pull request #10 from jgdevlabs/dev

Reducing dependencies
griesoft · Apr 26, 2022 · 5b9d40d · 5b9d40d
2 parents 7aa8212 + 39cab63
commit 5b9d40d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -95,7 +95,7 @@ jobs:
             - task: NuGetCommand@2
               inputs:
                 command: 'push'
-                packagesToPush: '$(Pipeline.Workspace)/**/*.nupkg;!$(Pipeline.Workspace)/**/*.symbols.nupkg'
+                packagesToPush: '$(Pipeline.Workspace)/**/*.nupkg;!$(Pipeline.Workspace)/**/*.snupkg'
                 nuGetFeedType: 'internal'
                 publishVstsFeed: 'f9036ec9-eb1c-4aff-a2b8-27fdaa573d0f/29b705d0-eac8-42a7-9230-4bcfe9f83688'
                 allowPackageConflicts: true

diff --git a/src/ReCaptcha/ReCaptcha.csproj b/src/ReCaptcha/ReCaptcha.csproj
@@ -26,18 +26,25 @@
         <AnalysisLevel>latest-recommended</AnalysisLevel>
     </PropertyGroup>
 
+    <ItemGroup Condition="$(TargetFramework)!='net461'">
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
         <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)=='net461'">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/tests/ReCaptcha.Tests/Filters/ValidateRecaptchaFilterTests.cs b/tests/ReCaptcha.Tests/Filters/ValidateRecaptchaFilterTests.cs
@@ -7,7 +7,6 @@
 using Griesoft.AspNetCore.ReCaptcha.Filters;
 using Griesoft.AspNetCore.ReCaptcha.Services;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;