Skip to content

Commit 1b32530

Browse files
authored
Merge pull request #153 from CoreyKaylor/net6
Adding dotnet 6 target
2 parents 5a75828 + 1c4c5a9 commit 1b32530

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

.github/workflows/dotnetcoretest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup .NET Core
3131
uses: actions/[email protected]
3232
with:
33-
dotnet-version: 5.0.301
33+
dotnet-version: 6.0.x
3434
- name: Install dependencies
3535
working-directory: ${{ runner.workspace }}/Lightning.NET
3636
run: dotnet restore
@@ -39,9 +39,9 @@ jobs:
3939
run: dotnet build --configuration Release --no-restore
4040
- name: Test (Linux)
4141
working-directory: ${{ runner.workspace }}/Lightning.NET
42-
run: LD_LIBRARY_PATH=${{ runner.workspace}}/Lightning.NET/lmdb/libraries/liblmdb/:$LD_LIBRARY_PATH dotnet test -f net5.0 --no-restore --verbosity normal
42+
run: LD_LIBRARY_PATH=${{ runner.workspace}}/Lightning.NET/lmdb/libraries/liblmdb/:$LD_LIBRARY_PATH dotnet test -f net6.0 --no-restore --verbosity normal
4343
if: matrix.os == 'ubuntu-latest'
4444
- name: Test (Windows or Mac)
4545
working-directory: ${{ runner.workspace }}/Lightning.NET
46-
run: dotnet test -f net5.0 --no-restore --verbosity normal
46+
run: dotnet test -f net6.0 --no-restore --verbosity normal
4747
if: matrix.os == 'windows-latest' || matrix.os == 'macos-latest'

src/LightningDB.Benchmarks/LightningDB.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

src/LightningDB.Tests/EnvironmentTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void CanOpenEnvironmentMoreThan50Mb()
145145
}
146146

147147

148-
#if (NETCOREAPP3_1 || NET5_0)
148+
#if NETCOREAPP3_1 || NET5_0 || NET6_0
149149
[Fact(Skip = "Run manually, behavior will override all tests with auto resize")]
150150
public void CreateEnvironmentWithAutoResize()
151151
{

src/LightningDB.Tests/LightningDB.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-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
<AssemblyName>LightningDB.Tests</AssemblyName>
66
<PackageId>LightningDB.Tests</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

src/LightningDB/EnvironmentConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class EnvironmentConfiguration
99
private int? _maxReaders;
1010
private int? _maxDatabases;
1111

12-
#if NETCOREAPP3_1 || NET5_0
12+
#if NETCOREAPP3_1 || NET5_0 || NET6_0
1313
private bool? _autoResizeWindows;
1414

1515
public bool AutoResizeWindows

src/LightningDB/LightningDB.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>LightningDB</Description>
55
<VersionPrefix>0.14.0</VersionPrefix>
66
<Authors>Ilya Lukyanov;Corey Kaylor</Authors>
7-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
88
<AssemblyName>LightningDB</AssemblyName>
99
<PackageId>LightningDB</PackageId>
1010
<PackageLicenseFile>LICENSE</PackageLicenseFile>

src/LightningDB/LightningEnvironment.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public LightningEnvironment(string path, EnvironmentConfiguration configuration
2626
throw new ArgumentException("Invalid directory name");
2727

2828
var config = configuration ?? _config;
29-
#if NETCOREAPP3_1 || NET5_0
29+
#if NETCOREAPP3_1 || NET5_0 || NET6_0
3030
if (config.AutoResizeWindows)
3131
{
3232
LoadWindowsAutoResizeLibrary();

src/LightningDB/Native/Lmdb.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ internal static extern MDBResultCode mdb_env_open(IntPtr env, string path, Envir
162162
[DllImport(MDB_DLL_NAME, CallingConvention = CallingConvention.Cdecl)]
163163
public static extern MDBResultCode mdb_cursor_put(IntPtr cursor, ref MDBValue key, MDBValue[] value, CursorPutOptions flags);
164164

165-
#if NETCOREAPP3_1 || NET5_0
165+
#if NETCOREAPP3_1 || NET5_0 || NET6_0
166166

167167
static bool _shouldSetDllImportResolver = true;
168168
static object _syncRoot = new object();

src/SecondProcess/SecondProcess.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
66
<LightningDBTargetRuntimeRelativePath>.\</LightningDBTargetRuntimeRelativePath>
77
</PropertyGroup>
88

0 commit comments

Comments
 (0)