From 991a619136399b73f427757daef69a763c364e34 Mon Sep 17 00:00:00 2001
From: David W <1511024+marabooy@users.noreply.github.com>
Date: Tue, 15 Mar 2022 13:51:50 +0300
Subject: [PATCH 1/2] Add support for net6.0.

---
 ...crosoft.AspNetCore.OData.NewtonsoftJson.Nightly.nuspec | 8 +++++++-
 ...crosoft.AspNetCore.OData.NewtonsoftJson.Release.nuspec | 6 ++++++
 .../Microsoft.AspNetCore.OData.NewtonsoftJson.csproj      | 2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Nightly.nuspec b/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Nightly.nuspec
index 2448e13c5..04a3cc777 100644
--- a/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Nightly.nuspec
+++ b/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Nightly.nuspec
@@ -16,12 +16,18 @@
     <icon>images\odata.png</icon>
     <repository type="git" url="https://github.com/OData/AspNetCoreOData.git" branch="master" />
     <dependencies>
-        <group targetFramework=".net5.0">
+      <group targetFramework=".net6.0">
+        <dependency id="Microsoft.AspNetCore.OData" version="$VersionFullSemantic$-Nightly$NightlyBuildVersion$" />
+      </group>
+      <group targetFramework=".net5.0">
         <dependency id="Microsoft.AspNetCore.OData" version="$VersionFullSemantic$-Nightly$NightlyBuildVersion$" />
       </group>
     </dependencies>
   </metadata>
   <files>
+    <file src="$ProductRoot$\net6.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net6.0" />
+    <file src="$ProductRoot$\net6.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net6.0" />
+    <file src="$ProductRoot$\net6.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net6.0" />
     <file src="$ProductRoot$\net5.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net5.0" />
     <file src="$ProductRoot$\net5.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net5.0" />
     <file src="$ProductRoot$\net5.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net5.0" />
diff --git a/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Release.nuspec b/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Release.nuspec
index d597deab1..8206c46a8 100644
--- a/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Release.nuspec
+++ b/src/Microsoft.AspNetCore.OData.NewtonsoftJson.Release.nuspec
@@ -19,9 +19,15 @@
       <group targetFramework=".net5.0">
         <dependency id="Microsoft.AspNetCore.OData" version="$VersionNuGetSemantic$" />
       </group>
+      <group targetFramework=".net6.0">
+        <dependency id="Microsoft.AspNetCore.OData" version="$VersionNuGetSemantic$" />
+      </group>
     </dependencies>
   </metadata>
   <files>
+    <file src="$ProductRoot$\net6.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net6.0" />
+    <file src="$ProductRoot$\net6.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net6.0" />
+    <file src="$ProductRoot$\net6.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net6.0" />
     <file src="$ProductRoot$\net5.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net5.0" />
     <file src="$ProductRoot$\net5.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net5.0" />
     <file src="$ProductRoot$\net5.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net5.0" />
diff --git a/src/Microsoft.AspNetCore.OData.NewtonsoftJson/Microsoft.AspNetCore.OData.NewtonsoftJson.csproj b/src/Microsoft.AspNetCore.OData.NewtonsoftJson/Microsoft.AspNetCore.OData.NewtonsoftJson.csproj
index 8059cf321..09f359833 100644
--- a/src/Microsoft.AspNetCore.OData.NewtonsoftJson/Microsoft.AspNetCore.OData.NewtonsoftJson.csproj
+++ b/src/Microsoft.AspNetCore.OData.NewtonsoftJson/Microsoft.AspNetCore.OData.NewtonsoftJson.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <RootNamespace>Microsoft.AspNetCore.OData.NewtonsoftJson</RootNamespace>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
 

From 75e04bff8face492705cf376a3881541310badfa Mon Sep 17 00:00:00 2001
From: David W <1511024+marabooy@users.noreply.github.com>
Date: Thu, 17 Mar 2022 11:22:46 +0300
Subject: [PATCH 2/2] Update the test project.

---
 .../Microsoft.AspNetCore.OData.NewtonsoftJson.Tests.csproj      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests.csproj b/test/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests.csproj
index e310af12a..4f2af9721 100644
--- a/test/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests.csproj
+++ b/test/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>