.NET 6.0 compatibility + OC 1.2.0-preview-16640 (#25)

* .NET 6.0 compatibility / upgrade to OC  1.2.0-preview-16631

* Modify yml to use .net 6.0

* Update to 1.2.0-preview-16640

Fix incorrect refs.

Co-authored-by: Seth Cleaver <seth.c@kast.io>

Author: scleaver

.github/workflows/build.yml

@@ -18,6 +18,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

.github/workflows/publish.yml

@@ -13,6 +13,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

Directory.Build.targets

@@ -2,22 +2,22 @@
 
   <ItemGroup>
     <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Update="NJsonSchema" Version="10.6.4" />
-    <PackageReference Update="NSwag.AspNetCore" Version="13.15.3" />
-    <PackageReference Update="OrchardCore.Application.Cms.Targets" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.ContentFields" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.ContentManagement" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.ContentManagement.Abstractions" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Contents.Core" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.ContentTypes.Abstractions" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.DisplayManagement" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Flows" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Html" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Lists" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Infrastructure" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Logging.NLog" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Module.Targets" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.ResourceManagement" Version="1.2.0-preview-16625" />
-    <PackageReference Update="OrchardCore.Theme.Targets" Version="1.2.0-preview-16625" />
+    <PackageReference Update="NJsonSchema" Version="10.6.6" />
+    <PackageReference Update="NSwag.AspNetCore" Version="13.15.5" />
+    <PackageReference Update="OrchardCore.Application.Cms.Targets" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.ContentFields" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.ContentManagement" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.ContentManagement.Abstractions" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Contents.Core" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.ContentTypes.Abstractions" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.DisplayManagement" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Flows" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Html" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Lists" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Infrastructure" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Logging.NLog" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Module.Targets" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.ResourceManagement" Version="1.2.0-preview-16640" />
+    <PackageReference Update="OrchardCore.Theme.Targets" Version="1.2.0-preview-16640" />
   </ItemGroup>
 </Project>  

src/Directory.Build.props

@@ -1,5 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+  </PropertyGroup>
+
   <PropertyGroup>
     <PackageTags>openapi;swagger;orchardcore;</PackageTags>
     <VersionPrefix>1.0.0</VersionPrefix>

src/ThisNetWorks.OrchardCore.OpenApi.Abstractions/ThisNetWorks.OrchardCore.OpenApi.Abstractions.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>ThisNetWorks.OrchardCore.OpenApi</RootNamespace>
   </PropertyGroup>
 

src/ThisNetWorks.OrchardCore.OpenApi/ThisNetWorks.OrchardCore.OpenApi.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

tests/ThisNetWorks.OrchardCore.OpenApi.Tests/ThisNetWorks.OrchardCore.OpenApi.Tests.csproj

@@ -1,16 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>