Merge branch 'main' of https://github.com/deveel/deveel.repository

deveel · Feb 21, 2024 · 6484e76 · 6484e76
2 parents a3fa119 + 59486e1
commit 6484e76
Show file tree

Hide file tree

Showing 26 changed files with 195 additions and 75 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,51 +1,71 @@
 name: Repository CI/CD
 
+permissions:
+  contents: read
+  packages: write
+
 on:
   push:
     branches: [ "main" ]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dotnet: [ '6.0.x', '7.0.x', '8.0.x' ]
 
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup .NET Framework
-      uses: actions/setup-dotnet@v3
+    - uses: actions/checkout@v4
+
+    - name: Emit .NET 6.0 Framework Version
+      if: matrix.dotnet == '6.0.x'
+      run: echo "DOTNET_FX_VERSION=net6.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 7.0 Framework Version
+      if: matrix.dotnet == '7.0.x'
+      run: echo "DOTNET_FX_VERSION=net7.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 8.0 Framework Version
+      if: matrix.dotnet == '8.0.x'
+      run: echo "DOTNET_FX_VERSION=net8.0" >> $GITHUB_ENV
+
+    - name: Setup .NET ${{ matrix.dotnet }} Framework
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-            6.0.x
-            7.0.x
+        dotnet-version: ${{ matrix.dotnet }}
 
     - name: Install SQLite Spatial
       run: sudo apt-get install -y libsqlite3-mod-spatialite
 
-    - name: Add Deveel GitHub NuGet Source
-      run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text
+    # - name: Add Deveel GitHub NuGet Source
+    #   run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text
 
     - name: Restore dependencies
       run: dotnet restore
 
     - name: Build
-      run: dotnet build --no-restore --version-suffix $GITHUB_RUN_ID -c Release
+      run: dotnet build --no-restore --version-suffix $GITHUB_RUN_ID -c Release -f ${{ env.DOTNET_FX_VERSION }}
 
     - name: Test
-      run: dotnet test --no-build --verbosity normal -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+      run: dotnet test --no-build --verbosity normal -c Release -f ${{ env.DOTNET_FX_VERSION }} /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
 
-    - name: Collect to Codecov
-      uses: codecov/codecov-action@v3
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
+    # - name: Collect to Codecov
+    #   uses: codecov/codecov-action@v3
+    #   with:
+    #     token: ${{ secrets.CODECOV_TOKEN }}
 
+  pack:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
     - name: Pack NuGet
       run: dotnet pack --version-suffix $GITHUB_RUN_ID -c Release --no-build --no-restore --include-symbols -o ./nuget
 
     - name: Push NutGet
-      run: dotnet nuget push ./nuget/*.nupkg -s "Deveel GitHub" --skip-duplicate --api-key ${{secrets.DEVEEL_NUGET_TOKEN}}
+      run: dotnet nuget push ./nuget/*.nupkg -s "https://nuget.pkg.github.com/deveel/index.json" --skip-duplicate --api-key ${{secrets.GITHUB_TOKEN}}
 
   clean:
     name: "Clean Old Packages"
-    needs: build
+    needs: pack
     uses: ./.github/workflows/clean-packages.yml
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -6,31 +6,40 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dotnet: [ '6.0.x', '7.0.x', '8.0.x' ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+
+    - name: Emit .NET 6.0 Framework Version
+      if: matrix.dotnet == '6.0.x'
+      run: echo "DOTNET_FX_VERSION=net6.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 7.0 Framework Version
+      if: matrix.dotnet == '7.0.x'
+      run: echo "DOTNET_FX_VERSION=net7.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 8.0 Framework Version
+      if: matrix.dotnet == '8.0.x'
+      run: echo "DOTNET_FX_VERSION=net8.0" >> $GITHUB_ENV
 
-    - name: Setup .NET Framework
-      uses: actions/setup-dotnet@v3
+    - name: Setup .NET ${{ matrix.dotnet }} Framework
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-            6.0.x
-            7.0.x
+        dotnet-version: ${{ matrix.dotnet }}
 
     - name: Install SQLite Spatial
       run: sudo apt-get install -y libsqlite3-mod-spatialite
 
-    - name: Add Deveel GitHub NuGet Source
-      run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text
-
     - name: Restore dependencies
       run: dotnet restore
 
     - name: Build
-      run: dotnet build --no-restore --version-suffix $GITHUB_RUN_ID -c Release
+      run: dotnet build --no-restore --version-suffix $GITHUB_RUN_ID -c Release -f ${{ env.DOTNET_FX_VERSION }}
 
     - name: Test
-      run: dotnet test --no-build --verbosity normal -c Release
+      run: dotnet test --no-build --no-restore -c Release -f ${{ env.DOTNET_FX_VERSION }} --verbosity normal
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,5 +1,9 @@
 name: Repository Release
 
+permissions:
+  contents: read
+  packages: write
+
 on:
   push:
     tags:
@@ -8,16 +12,30 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        dotnet-version: [ '6.0.x', '7.0.x', '8.0.x' ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+
+    - name: Emit .NET 6.0 Framework Version
+      if: matrix.dotnet == '6.0.x'
+      run: echo "DOTNET_FX_VERSION=net6.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 7.0 Framework Version
+      if: matrix.dotnet == '7.0.x'
+      run: echo "DOTNET_FX_VERSION=net7.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 8.0 Framework Version
+      if: matrix.dotnet == '8.0.x'
+      run: echo "DOTNET_FX_VERSION=net8.0" >> $GITHUB_ENV
 
-    - name: Setup .NET Framework
-      uses: actions/setup-dotnet@v3
+    - name: Setup .NET ${{ matrix.dotnet-version }} Framework
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-            6.0.x
-            7.0.x
+        dotnet-version: ${{ matrix.dotnet-version }}
 
     - name: Get tag
       id: tag
@@ -28,8 +46,8 @@ jobs:
     - name: Install SQLite Spatial
       run: sudo apt-get install -y libsqlite3-mod-spatialite
 
-    - name: Add Deveel GitHub NuGet Source
-      run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text
+    # - name: Add Deveel GitHub NuGet Source
+    #   run: dotnet nuget add source "https://nuget.pkg.github.com/deveel/index.json" -n "Deveel GitHub" -u ${{ secrets.DEVEEL_NUGET_USER }} -p ${{ secrets.DEVEEL_NUGET_TOKEN }} --store-password-in-clear-text
 
     - name: Restore dependencies
       run: dotnet restore
@@ -45,11 +63,15 @@ jobs:
       with:
         token: ${{ secrets.DEVEEL_CODECOV_TOKEN }}
 
+  publish:
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
     - name: Pack NuGet
       run: dotnet pack -p:PackageVersion=${{steps.tag.outputs.tag}} -c Release -o ./nuget
 
     - name: Push Github Nuget
-      run: dotnet nuget push ./nuget/*.nupkg -s "Deveel GitHub" --skip-duplicate --api-key ${{secrets.DEVEEL_NUGET_TOKEN}}
+      run: dotnet nuget push ./nuget/*.nupkg -s "https://nuget.pkg.github.com/deveel/index.json" --skip-duplicate --api-key ${{secrets.GITHUB_TOKEN}}
 
     - name: Push to Github.org
       run: dotnet nuget push ./nuget/**/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json
diff --git a/.github/workflows/tfm.yml b/.github/workflows/tfm.yml
@@ -0,0 +1,25 @@
+name: "Emit TFM"
+
+on:
+  workflow_call:
+    inputs:
+      dotnet-version:
+        description: "The .NET Framework version to obtain the TFM"
+        required: true
+        type: string
+
+jobs:
+  emit:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Emit .NET 6.0 Framework Version
+      if: ${{ inputs.dotnet-version}} == '6.0.x'
+      run: echo "DOTNET_FX_VERSION=net6.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 7.0 Framework Version
+      if: ${{ inputs.dotnet-version}} == '7.0.x'
+      run: echo "DOTNET_FX_VERSION=net7.0" >> $GITHUB_ENV
+
+    - name: Emit .NET 8.0 Framework Version
+      if: ${{ inputs.dotnet-version}} == '8.0.x'
+      run: echo "DOTNET_FX_VERSION=net8.0" >> $GITHUB_ENV
diff --git a/src/Deveel.Repository.Core/Deveel.Repository.Core.csproj b/src/Deveel.Repository.Core/Deveel.Repository.Core.csproj
@@ -15,6 +15,12 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.1" />
   </ItemGroup>

diff --git a/src/Deveel.Repository.DynamicLinq/Deveel.Repository.DynamicLinq.csproj b/src/Deveel.Repository.DynamicLinq/Deveel.Repository.DynamicLinq.csproj
@@ -10,6 +10,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
   </ItemGroup>
 </Project>
diff --git a/src/Deveel.Repository.EntityFramework/Deveel.Repository.EntityFramework.csproj b/src/Deveel.Repository.EntityFramework/Deveel.Repository.EntityFramework.csproj
@@ -12,10 +12,12 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
   </ItemGroup>
-
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
+  </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Finbuckle.MultiTenant.EntityFrameworkCore" Version="6.12.0" />
+		<PackageReference Include="Finbuckle.MultiTenant.EntityFrameworkCore" Version="6.13.1" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Deveel.Repository.Core\Deveel.Repository.Core.csproj" />

diff --git a/src/Deveel.Repository.Finbuckle.MultiTenant/Deveel.Repository.Finbuckle.MultiTenant.csproj b/src/Deveel.Repository.Finbuckle.MultiTenant/Deveel.Repository.Finbuckle.MultiTenant.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Title>Deveel Repository Finbuckle Multi-Tenant Extension</Title>
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finbuckle.MultiTenant" Version="6.12.0" />
+    <PackageReference Include="Finbuckle.MultiTenant" Version="6.13.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Deveel.Repository.Manager.EasyCaching/Deveel.Repository.Manager.EasyCaching.csproj b/src/Deveel.Repository.Manager.EasyCaching/Deveel.Repository.Manager.EasyCaching.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyCaching.Core" Version="1.9.1" />
+    <PackageReference Include="EasyCaching.Core" Version="1.9.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Deveel.Repository.Manager/Deveel.Repository.Manager.csproj b/src/Deveel.Repository.Manager/Deveel.Repository.Manager.csproj
@@ -6,7 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

diff --git a/src/Deveel.Repsotiory.MongoFramework/Deveel.Repository.MongoFramework.csproj b/src/Deveel.Repsotiory.MongoFramework/Deveel.Repository.MongoFramework.csproj
@@ -12,9 +12,11 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+  </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Finbuckle.MultiTenant" Version="6.12.0" />
 		<PackageReference Include="MongoFramework" Version="0.29.0" />
 	</ItemGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,15 +1,15 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <RootNamespace>Deveel</RootNamespace>
-    <VersionPrefix>1.2.8</VersionPrefix>
+    <VersionPrefix>1.3.0</VersionPrefix>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <!-- NuGet Metadata and Commands -->
     <Authors>Antonello Provenzano</Authors>
     <Company>Deveel AS</Company>
-    <Copyright>(C) 2022-2023 Deveel AS</Copyright>
+    <Copyright>(C) 2022-2024 Antonello Provenzano</Copyright>
     <PackageProjectUrl>https://github.com/deveel/deveel.repository</PackageProjectUrl>
     <RepositoryUrl>https://github.com/deveel/deveel.repository</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -24,7 +24,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="'$(TargetFramework)' != 'net8.0'"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" Condition="'$(TargetFramework)' == 'net8.0'"/>
+
   </ItemGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

diff --git a/test/Deveel.Repository.Core.XUnit/Deveel.Repository.Core.XUnit.csproj b/test/Deveel.Repository.Core.XUnit/Deveel.Repository.Core.XUnit.csproj
@@ -14,7 +14,11 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
-
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+  </ItemGroup>
+
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Deveel.Repository.Core\Deveel.Repository.Core.csproj" />
   </ItemGroup>

diff --git a/test/Deveel.Repository.EntityFramework.XUnit/Data/EntityManagementTestSuite.cs b/test/Deveel.Repository.EntityFramework.XUnit/Data/EntityManagementTestSuite.cs
@@ -56,7 +56,7 @@ public override async Task DisposeAsync() {
 
 			await dbContext.DisposeAsync();
 
-			await base.DisposeAsync();
+			// await base.DisposeAsync();
 		}
 	}
 }