Add support for net6.0.

OData · Mar 15, 2022 · b27a64f · b27a64f
1 parent f08915b
commit b27a64f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -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/...icrosoft.AspNetCore.OData.NewtonsoftJson/Microsoft.AspNetCore.OData.NewtonsoftJson.csproj b/...icrosoft.AspNetCore.OData.NewtonsoftJson/Microsoft.AspNetCore.OData.NewtonsoftJson.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net5.0;net6.0</TargetFramework>
     <RootNamespace>Microsoft.AspNetCore.OData.NewtonsoftJson</RootNamespace>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>