Merge pull request #104 from koculu/upgrade-to-net-90

Upgrade to the net 9.0.
koculu · Nov 14, 2024 · c660862 · c660862
2 parents 82774e0 + 807fe6a
commit c660862
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 70 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -2,35 +2,35 @@ name: Build and Test
 
 on:
   push:
-    branches: [ "main" ]    
+    branches: ['main']
     paths-ignore:
-    - '*.md'
+      - '*.md'
   pull_request:
-    branches: [ "main" ]
+    branches: ['main']
     paths-ignore:
-    - '*.md'
+      - '*.md'
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          8.0.x
-          7.0.x
-          6.0.x
-    - name: Display dotnet version
-      run: dotnet --version
-    - name: Restore dependencies
-      working-directory: ./src
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-      working-directory: ./src
-    - name: Test
-      run: dotnet test --no-build --configuration Release --verbosity normal
-      working-directory: ./src
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            9.0.x
+            8.0.x
+            7.0.x
+            6.0.x
+      - name: Display dotnet version
+        run: dotnet --version
+      - name: Restore dependencies
+        working-directory: ./src
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+        working-directory: ./src
+      - name: Test
+        run: dotnet test --no-build --configuration Release --verbosity normal
+        working-directory: ./src
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -4,34 +4,34 @@ on:
   workflow_dispatch:
     inputs:
       name:
-        description: "When you press run workflow, the nuget package will be published."
-        default: "I understand."
+        description: 'When you press run workflow, the nuget package will be published.'
+        default: 'I understand.'
 jobs:
   build:
-
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          8.0.x
-          7.0.x
-          6.0.x
-    - name: Display dotnet version
-      run: dotnet --version
-    - name: Restore dependencies
-      working-directory: ./src
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-      working-directory: ./src
-    - name: Test
-      run: dotnet test --no-build --configuration Release --verbosity normal
-      working-directory: ./src
-    - name: Publish the package to nuget.org
-      run: dotnet nuget push ZoneTree/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
-      env:
-        NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
-      working-directory: ./src
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            9.0.x
+            8.0.x
+            7.0.x
+            6.0.x
+      - name: Display dotnet version
+        run: dotnet --version
+      - name: Restore dependencies
+        working-directory: ./src
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+        working-directory: ./src
+      - name: Test
+        run: dotnet test --no-build --configuration Release --verbosity normal
+        working-directory: ./src
+      - name: Publish the package to nuget.org
+        run: dotnet nuget push ZoneTree/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
+        working-directory: ./src
diff --git a/src/Playground/Playground.csproj b/src/Playground/Playground.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <Configurations>Debug;Release;ReleaseWithDoc</Configurations>

diff --git a/src/ZoneTree.UnitTests/SafeBplusTreeTests.cs b/src/ZoneTree.UnitTests/SafeBplusTreeTests.cs
@@ -148,15 +148,13 @@ public void BTreeIteratorParallelInserts(BTreeLockMode lockMode)
             {
                 var key = random.Next();
                 tree.AddOrUpdate(key,
-                    AddOrUpdateResult (ref int value) =>
+                    void (ref int value) =>
                     {
                         value = key + key;
-                        return AddOrUpdateResult.ADDED;
                     },
-                    AddOrUpdateResult (ref int value) =>
+                    void (ref int value) =>
                     {
                         value = key + key;
-                        return AddOrUpdateResult.UPDATED;
                     }, out _);
             });
         });
@@ -203,15 +201,13 @@ public void BTreeReverseIteratorParallelInserts(BTreeLockMode lockMode)
             {
                 var key = random.Next();
                 tree.AddOrUpdate(key,
-                    AddOrUpdateResult (ref int x) =>
+                    void (ref int x) =>
                     {
                         x = key + key;
-                        return AddOrUpdateResult.ADDED;
                     },
-                    AddOrUpdateResult (ref int y) =>
+                    void (ref int y) =>
                     {
                         y = key + key;
-                        return AddOrUpdateResult.UPDATED;
                     }, out _);
             });
         });

diff --git a/src/ZoneTree.UnitTests/ZoneTree.UnitTests.csproj b/src/ZoneTree.UnitTests/ZoneTree.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
 

diff --git a/src/ZoneTree/Collections/BTree/BTree.Write.cs b/src/ZoneTree/Collections/BTree/BTree.Write.cs
@@ -95,9 +95,9 @@ public bool TryInsert(in TKey key, in TValue value, out long opIndex)
         }
     }
 
-    public delegate AddOrUpdateResult AddDelegate(ref TValue value);
+    public delegate void AddDelegate(ref TValue value);
 
-    public delegate AddOrUpdateResult UpdateDelegate(ref TValue value);
+    public delegate void UpdateDelegate(ref TValue value);
 
     public AddOrUpdateResult AddOrUpdate(
         in TKey key,

diff --git a/src/ZoneTree/Directory.Build.props b/src/ZoneTree/Directory.Build.props
@@ -5,8 +5,8 @@
     <Authors>Ahmed Yasin Koculu</Authors>
     <PackageId>ZoneTree</PackageId>
     <Title>ZoneTree</Title>
-    <ProductVersion>1.8.3.0</ProductVersion>
-    <Version>1.8.3.0</Version>
+    <ProductVersion>1.8.4.0</ProductVersion>
+    <Version>1.8.4.0</Version>
     <Authors>Ahmed Yasin Koculu</Authors>
     <AssemblyTitle>ZoneTree</AssemblyTitle>
     <Description>ZoneTree is a persistent, high-performance, transactional, ACID-compliant ordered key-value database for NET. It can operate in memory or on local/cloud storage.</Description>

diff --git a/src/ZoneTree/Segments/InMemory/MutableSegment.cs b/src/ZoneTree/Segments/InMemory/MutableSegment.cs
@@ -224,17 +224,15 @@ public AddOrUpdateResult Delete(in TKey key, out long opIndex)
 
             var status = BTree
                 .AddOrUpdate(key,
-                    AddOrUpdateResult (ref TValue x) =>
+                    void (ref TValue x) =>
                     {
                         MarkValueDeleted(ref x);
                         insertedValue = x;
-                        return AddOrUpdateResult.ADDED;
                     },
-                    AddOrUpdateResult (ref TValue x) =>
+                    void (ref TValue x) =>
                     {
                         MarkValueDeleted(ref x);
                         insertedValue = x;
-                        return AddOrUpdateResult.UPDATED;
                     }, out opIndex);
             WriteAheadLog.Append(in key, in insertedValue, opIndex);
             return status;

diff --git a/src/ZoneTree/ZoneTree.csproj b/src/ZoneTree/ZoneTree.csproj
@@ -4,7 +4,7 @@
     <Deterministic>true</Deterministic>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <RepositoryUrl>https://github.com/koculu/ZoneTree</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <ImplicitUsings>enable</ImplicitUsings>