Skip to content

Commit 0d6715d

Browse files
committed
net6.0 update
1 parent 46cc8d8 commit 0d6715d

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

RocksDbSharp/AutoNativeImport.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ public static T Import<T>(INativeLibImporter importer, string libName, string ve
386386
var basePaths = new string[] {
387387
nativeCodeBase,
388388
Path.GetDirectoryName(UriToPath(Transitional.CurrentFramework.GetBaseDirectory())),
389-
Path.GetDirectoryName(UriToPath(Assembly.GetEntryAssembly()?.CodeBase)),
389+
Path.GetDirectoryName(UriToPath(Assembly.GetEntryAssembly()?.Location)),
390390
Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location),
391-
Path.GetDirectoryName(UriToPath(typeof(PosixImporter).GetTypeInfo().Assembly.CodeBase)),
391+
Path.GetDirectoryName(UriToPath(typeof(PosixImporter).GetTypeInfo().Assembly.Location)),
392392
Path.GetDirectoryName(typeof(PosixImporter).GetTypeInfo().Assembly.Location),
393393
};
394394
var search = basePaths

RocksDbSharp/RocksDbSharp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Copyright>Copyright 2016</Copyright>
1919
<PackageReleaseNotes>.Net Bindings for RocksDb. See the Project Site for more information. (Note: Also install RocksDbNative package to have native binaries included with build)</PackageReleaseNotes>
2020
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
21-
<TargetFramework>netcoreapp3.1</TargetFramework>
21+
<TargetFramework>net6.0</TargetFramework>
2222
<LangVersion>8</LangVersion>
2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|AnyCPU'">
@@ -40,6 +40,6 @@
4040
<ItemGroup>
4141
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
4242
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
43-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
43+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
4444
</ItemGroup>
4545
</Project>

examples/ColumnFamilyExample/ColumnFamilyExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<PlatformTarget>x64</PlatformTarget>
66
<LangVersion>7.2</LangVersion>

examples/PrefixExample/PrefixExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<PlatformTarget>x64</PlatformTarget>
66
<AssemblyVersion>1.0.0</AssemblyVersion>

examples/SimpleExampleHighLevel/SimpleExampleHighLevel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<PlatformTarget>x64</PlatformTarget>
66
<LangVersion>7.2</LangVersion>

examples/SimpleExampleLowLevel/SimpleExampleLowLevel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<PlatformTarget>x64</PlatformTarget>
66
<LangVersion>7.2</LangVersion>

tests/RocksDbSharpTest/RocksDbSharpTest.csproj

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
55
<LangVersion>8</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
9-
<PackageReference Include="xunit" Version="2.2.0" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
11-
<PackageReference Include="xunit.runner.console" Version="2.2.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
9+
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="xunit.runner.console" Version="2.4.1">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
1218
</ItemGroup>
1319
<ItemGroup>
1420
<ProjectReference Include="..\..\RocksDbNative\RocksDbNative.csproj" />

0 commit comments

Comments
 (0)