merge dev fix version conflict

OpenCL.NetCore.Tests/OpenCL.NetCore.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

OpenCL.NetCore/OpenCL.NetCore.csproj

@@ -1,13 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Authors>Gabe C</Authors>
+    <Authors>FracturedCode,Ananth B</Authors>
     <Description>.NET bindings for OpenCL that are easy-to-use and true to the original API. There is no OOP abstraction, nor will there ever be. OpenCL.Net is meant to be small, fast (with as little explicit marshaling as possible) and .NET friendly at the same time.</Description>
     <PackageLicenseFile>LICENSE-EPL1.0.txt</PackageLicenseFile>
     <RepositoryUrl>https://github.com/FracturedCodes/OpenCL.NetCore</RepositoryUrl>
-    <Version>1.1</Version>
+    <Version>1.2.0</Version>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,6 +20,10 @@
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
     <None Include="FodyWeavers.xsd" />
   </ItemGroup>
 

README.md

@@ -11,7 +11,7 @@ little explicit marshaling as possible) and .NET friendly at the same time.
 OpenCL.NetCore is a fork of [OpenCL.Net by Ananth B](https://github.com/dgsantana/OpenCL.NET/). The main purpose of this project is to modernize OpenCL.Net by giving it proper VS projects and MSTests in .NET Core.
 It still needs some testing and debugging.
 
-### .NET 5 is here
+### .NET 6 is here
 Well, the new naming convention of .NET certainly has me questioning my decision to name 
 this project OpenCL.NetCore. For now, I will keep the name despite the project being updated for .NET 5.