Add support for net6.0 for AspNetCore.OData.NewtonsoftJson (#526)

* Add support for net6.0. * Update the test project.
OData · Mar 23, 2022 · a10e8e5 · a10e8e5
1 parent f3fa98f
commit a10e8e5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 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>
+ <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
  <RootNamespace>Microsoft.AspNetCore.OData.NewtonsoftJson</RootNamespace>
  <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
 

diff --git a/...NetCore.OData.NewtonsoftJson.Tests/Microsoft.AspNetCore.OData.NewtonsoftJson.Tests.csproj b/...NetCore.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>