Skip to content

Commit c8bf467

Browse files
committed
merge dev fix version conflict
2 parents 9552522 + 9693fa3 commit c8bf467

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

OpenCL.NetCore/OpenCL.NetCore.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Authors>Gabe C</Authors>
6+
<Authors>FracturedCode,Ananth B</Authors>
77
<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>
88
<PackageLicenseFile>LICENSE-EPL1.0.txt</PackageLicenseFile>
99
<RepositoryUrl>https://github.com/FracturedCodes/OpenCL.NetCore</RepositoryUrl>
10-
<Version>1.1</Version>
10+
<Version>1.2.0</Version>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
@@ -19,6 +20,10 @@
1920
<Pack>True</Pack>
2021
<PackagePath></PackagePath>
2122
</None>
23+
<None Include="..\README.md">
24+
<Pack>True</Pack>
25+
<PackagePath>\</PackagePath>
26+
</None>
2227
<None Include="FodyWeavers.xsd" />
2328
</ItemGroup>
2429

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ little explicit marshaling as possible) and .NET friendly at the same time.
1111
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.
1212
It still needs some testing and debugging.
1313

14-
### .NET 5 is here
14+
### .NET 6 is here
1515
Well, the new naming convention of .NET certainly has me questioning my decision to name
1616
this project OpenCL.NetCore. For now, I will keep the name despite the project being updated for .NET 5.
1717

0 commit comments

Comments
 (0)