From 90ed54486e3de7a6d75b5a0c409c71d2b0762c12 Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 10:17:06 +0100
Subject: [PATCH 1/8] add net6.0 target

---
 .github/workflows/ci-cd.yml                              | 6 +++---
 src/HybridModelBinding/HybridModelBinding.csproj         | 9 +++++++--
 src/HybridModelBinding/ModelBinding/BodyValueProvider.cs | 2 ++
 .../ModelBinding/HeaderValueProvider.cs                  | 2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 503ae43..8e8789e 100755
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -27,12 +27,12 @@ jobs:
           dotnet-version: '3.1.100'
 
       - name: Build project
-        run: dotnet build -c Release -f netstandard2.1 -o bin/ src/HybridModelBinding
+        run: dotnet build -c Release src/HybridModelBinding
 
       - name: Create NuGet-package
         if: steps.needs_packaging.outputs.value == 'true'
-        run: dotnet pack --no-build -p:OutputPath=../../bin/ src/HybridModelBinding
+        run: dotnet pack --no-build src/HybridModelBinding
 
       - name: Publish NuGet-package
         if: steps.needs_packaging.outputs.value == 'true'
-        run: dotnet nuget push -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_TOKEN}} -n true bin\*.nupkg
+        run: dotnet nuget push -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_TOKEN}} -n true src/HybridModelBinding/bin/*.nupkg
diff --git a/src/HybridModelBinding/HybridModelBinding.csproj b/src/HybridModelBinding/HybridModelBinding.csproj
index bd6d87f..47c3d16 100755
--- a/src/HybridModelBinding/HybridModelBinding.csproj
+++ b/src/HybridModelBinding/HybridModelBinding.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <Description>Provides the ability to bind models using both ModelBinder and ValueProvider in ASP.NET Core.</Description>
         <Authors>Bill Boga</Authors>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
         <AssemblyName>HybridModelBinding</AssemblyName>
         <PackageId>HybridModelBinding</PackageId>
         <MinVerMinimumMajorMinor>0.18</MinVerMinimumMajorMinor>
@@ -12,11 +12,16 @@
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
         <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
         <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+        <UserSecretsId>56b9ce4e-e8a6-4bdd-93ea-2e005b3cdb87</UserSecretsId>
     </PropertyGroup>
-    <ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
     </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
     <ItemGroup>
       <PackageReference Include="MinVer" Version="2.0.0">
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
index 8fd6f8f..772f3a0 100755
--- a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
@@ -1,6 +1,8 @@
 using HybridModelBinding.Extensions;
 using Microsoft.AspNetCore.Http;
+#if NETSTANDARD2_1_OR_GREATER
 using Microsoft.AspNetCore.Mvc.Internal;
+#endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Newtonsoft.Json.Linq;
 using System;
diff --git a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
index 6d32935..a51817e 100644
--- a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Http;
+#if NETSTANDARD2_1_OR_GREATER
 using Microsoft.AspNetCore.Mvc.Internal;
+#endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System;
 using System.Collections.Generic;

From 9a406c054ccefeadc566482fb8b2161b5c805a83 Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 10:22:44 +0100
Subject: [PATCH 2/8] lower the requirement to netcoreapp3.1

---
 src/HybridModelBinding/HybridModelBinding.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/HybridModelBinding/HybridModelBinding.csproj b/src/HybridModelBinding/HybridModelBinding.csproj
index 47c3d16..7f9468e 100755
--- a/src/HybridModelBinding/HybridModelBinding.csproj
+++ b/src/HybridModelBinding/HybridModelBinding.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <Description>Provides the ability to bind models using both ModelBinder and ValueProvider in ASP.NET Core.</Description>
         <Authors>Bill Boga</Authors>
-        <TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;netstandard2.1</TargetFrameworks>
         <AssemblyName>HybridModelBinding</AssemblyName>
         <PackageId>HybridModelBinding</PackageId>
         <MinVerMinimumMajorMinor>0.18</MinVerMinimumMajorMinor>
@@ -18,7 +18,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
     </ItemGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>

From b80f85a538e08760691302653708f1fef4d9a6a9 Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 21:08:50 +0100
Subject: [PATCH 3/8] debug build take 1

---
 .github/workflows/ci-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 8e8789e..c320254 100755
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.100'
+          dotnet-version: '3.1.x'
 
       - name: Build project
         run: dotnet build -c Release src/HybridModelBinding

From 193862ac46c93f078ca8dc2a6b81d1d985f7f54f Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 21:18:45 +0100
Subject: [PATCH 4/8] fix build

---
 src/HybridModelBinding/ModelBinding/BodyValueProvider.cs   | 2 +-
 src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
index 772f3a0..652c27e 100755
--- a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
@@ -1,6 +1,6 @@
 using HybridModelBinding.Extensions;
 using Microsoft.AspNetCore.Http;
-#if NETSTANDARD2_1_OR_GREATER
+#if (NETSTANDARD2_1_OR_GREATER || NETCORAPP3_1)
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
diff --git a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
index a51817e..2ddb083 100644
--- a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-#if NETSTANDARD2_1_OR_GREATER
+#if (NETSTANDARD2_1_OR_GREATER || NETCORAPP3_1)
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;

From 74a0a1b6b83b63e2d6e288960b2d34e73cbc106f Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 21:23:07 +0100
Subject: [PATCH 5/8] typo

---
 src/HybridModelBinding/ModelBinding/BodyValueProvider.cs   | 2 +-
 src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
index 652c27e..292e1d1 100755
--- a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
@@ -1,6 +1,6 @@
 using HybridModelBinding.Extensions;
 using Microsoft.AspNetCore.Http;
-#if (NETSTANDARD2_1_OR_GREATER || NETCORAPP3_1)
+#if (NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1)
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
diff --git a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
index 2ddb083..c3537a1 100644
--- a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-#if (NETSTANDARD2_1_OR_GREATER || NETCORAPP3_1)
+#if (NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1)
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;

From b4c631ca570b385b67624fb8aa29f8158e4fbbc0 Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 21:27:17 +0100
Subject: [PATCH 6/8] take N

---
 src/HybridModelBinding/ModelBinding/BodyValueProvider.cs   | 2 +-
 src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
index 292e1d1..f0cc697 100755
--- a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
@@ -1,6 +1,6 @@
 using HybridModelBinding.Extensions;
 using Microsoft.AspNetCore.Http;
-#if (NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1)
+#if (NETSTANDARD)
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
diff --git a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
index c3537a1..e337136 100644
--- a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-#if (NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1)
+#if (NETSTANDARD)
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;

From 2e59ac0a160c9bcaab587d65ad12d123c9d80b0a Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 21:49:35 +0100
Subject: [PATCH 7/8] cosmetic

---
 src/HybridModelBinding/ModelBinding/BodyValueProvider.cs   | 2 +-
 src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
index f0cc697..ee2622f 100755
--- a/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/BodyValueProvider.cs
@@ -1,6 +1,6 @@
 using HybridModelBinding.Extensions;
 using Microsoft.AspNetCore.Http;
-#if (NETSTANDARD)
+#if NETSTANDARD
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
diff --git a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
index e337136..ae53d7b 100644
--- a/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
+++ b/src/HybridModelBinding/ModelBinding/HeaderValueProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-#if (NETSTANDARD)
+#if NETSTANDARD
 using Microsoft.AspNetCore.Mvc.Internal;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;

From c36302d3db46ad646c771c585033bad62aff5018 Mon Sep 17 00:00:00 2001
From: Egor <egor.topal@reedexpo.co.uk>
Date: Thu, 24 Oct 2024 22:24:20 +0100
Subject: [PATCH 8/8] bump Microsoft.AspNetCore.Http to a non-vulnerable
 version

---
 src/HybridModelBinding/HybridModelBinding.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/HybridModelBinding/HybridModelBinding.csproj b/src/HybridModelBinding/HybridModelBinding.csproj
index 7f9468e..b12768e 100755
--- a/src/HybridModelBinding/HybridModelBinding.csproj
+++ b/src/HybridModelBinding/HybridModelBinding.csproj
@@ -17,6 +17,7 @@
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.34" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />