update build and tests

loresoft · May 10, 2024 · 7d0c78a · 7d0c78a
1 parent e4d2e1e
commit 7d0c78a
Show file tree

Hide file tree

Showing 20 changed files with 243 additions and 275 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,15 +1,57 @@
 version: 2
 updates:
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "01:00"   
-  open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "01:00"
+      timezone: "America/Chicago"
+    open-pull-requests-limit: 10
 
-- package-ecosystem: nuget
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "11:00"
-  open-pull-requests-limit: 10
+  - package-ecosystem: nuget
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "02:00"
+      timezone: "America/Chicago"
+    open-pull-requests-limit: 10
+    groups:
+      Azure:
+        patterns:
+          - "Azure.*"
+          - "Microsoft.Azure.*"
+          - "Microsoft.Extensions.Azure"
+      AspNetCoreHealthChecks:
+        patterns:
+          - "AspNetCore.HealthChecks.*"
+      AspNetCore:
+        patterns:
+          - "Microsoft.AspNetCore.*"
+          - "Microsoft.Extensions.Features"
+      MicrosoftExtensions:
+        patterns:
+          - "Microsoft.Extensions.*"
+      EntityFrameworkCore:
+        patterns:
+          - "Microsoft.EntityFrameworkCore.*"
+      OpenTelemetry:
+        patterns:
+          - "OpenTelemetry.*"
+      Serilog:
+        patterns:
+          - "Serilog"
+          - "Serilog.*"
+      Hangfire:
+        patterns:
+          - "Hangfire"
+          - "Hangfire.*"
+      Testcontainers:
+        patterns:
+          - "Testcontainers.*"
+      xUnit:
+        patterns:
+          - "xunit"
+          - "xunit.assert"
+          - "xunit.core"
+          - "xunit.extensibility.*"
+          - "xunit.runner.*"
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -3,7 +3,9 @@ name: Build
 env:
   DOTNET_NOLOGO: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  BUILD_PATH: '${{github.workspace}}/artifacts'
+  DOTNET_ENVIRONMENT: github
+  ASPNETCORE_ENVIRONMENT: github
+  BUILD_PATH: "${{github.workspace}}/artifacts"
   COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
 on:
@@ -12,103 +14,92 @@ on:
       - master
       - develop
     tags:
-      - 'v*'
+      - "v*"
   pull_request:
     branches:
       - master
       - develop
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
 
     services:
       mongodb:
         image: mongo:latest
         ports:
-        - 27017:27017
+          - 27017:27017
         volumes:
-        - mongo_data:/data/db
-        - mongo_config:/data/configdb
+          - mongo_data:/data/db
+          - mongo_config:/data/configdb
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v3
-      with:
-          dotnet-version: | 
-                6.0.x
-                7.0.x
-
-    - name: Restore Dependencies
-      run: dotnet restore
-
-    - name: Build Solution
-      run: dotnet build --no-restore --configuration Release
-
-    - name: Run Test
-      run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings
-
-    - name: Generate Coverage 
-      uses: danielpalme/[email protected]
-      with:
-        reports: '${{github.workspace}}/test/*/TestResults/*/coverage.info'
-        targetdir: ${{env.BUILD_PATH}}
-        reporttypes: lcov
-
-    - name: Report Coverage
-      if: success()
-      uses: coverallsapp/github-action@v2
-      with:
-          file: artifacts/lcov.info
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Restore Dependencies
+        run: dotnet restore
+
+      - name: Build Solution
+        run: dotnet build --no-restore --configuration Release
+
+      - name: Run Test
+        run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings
+
+      - name: Report Coverage
+        if: success()
+        uses: coverallsapp/github-action@v2
+        with:
+          file: "${{github.workspace}}/test/*/TestResults/*/coverage.info"
           format: lcov
 
-    - name: Create Packages
-      if: success() && github.event_name != 'pull_request'
-      run: dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore --output "${{env.BUILD_PATH}}"
+      - name: Create Packages
+        if: success() && github.event_name != 'pull_request'
+        run: dotnet pack --configuration Release --no-build --output "${{env.BUILD_PATH}}"
 
-    - name: Upload Packages
-      if: success() && github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v3
-      with:
-        name: packages
-        path: '${{env.BUILD_PATH}}'
+      - name: Upload Packages
+        if: success() && github.event_name != 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: packages
+          path: "${{env.BUILD_PATH}}"
 
   deploy:
     runs-on: ubuntu-latest
     needs: build
     if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
 
     steps:
-    - name: Download Artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: packages
-
-    - name: Publish Packages GitHub
-      run: |
-        for package in $(find -name "*.nupkg"); do
-          echo "${0##*/}": Pushing $package...
-          dotnet nuget push $package --source https://nuget.pkg.github.com/loresoft/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
-        done
-
-    - name: Publish Packages feedz
-      run: |
-        for package in $(find -name "*.nupkg"); do
-          echo "${0##*/}": Pushing $package...
-          dotnet nuget push $package --source https://f.feedz.io/loresoft/open/nuget/index.json --api-key ${{ secrets.FEEDDZ_KEY }} --skip-duplicate
-        done
-
-    - name: Publish Packages Nuget
-      if: startsWith(github.ref, 'refs/tags/v')
-      run: |
-        for package in $(find -name "*.nupkg"); do
-          echo "${0##*/}": Pushing $package...
-          dotnet nuget push $package --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
-        done
-
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: packages
+
+      - name: Publish Packages GitHub
+        run: |
+          for package in $(find -name "*.nupkg"); do
+            echo "${0##*/}": Pushing $package...
+            dotnet nuget push $package --source https://nuget.pkg.github.com/loresoft/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
+          done
+
+      - name: Publish Packages feedz
+        run: |
+          for package in $(find -name "*.nupkg"); do
+            echo "${0##*/}": Pushing $package...
+            dotnet nuget push $package --source https://f.feedz.io/loresoft/open/nuget/index.json --api-key ${{ secrets.FEEDDZ_KEY }} --skip-duplicate
+          done
+
+      - name: Publish Packages Nuget
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          for package in $(find -name "*.nupkg"); do
+            echo "${0##*/}": Pushing $package...
+            dotnet nuget push $package --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
+          done
diff --git a/MongoDB.Abstracts.sln b/MongoDB.Abstracts.sln
@@ -12,10 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{AEBC64A5
 		coverlet.runsettings = coverlet.runsettings
 		src\Directory.Build.props = src\Directory.Build.props
 		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C480AF26-E87F-4ACA-9F34-047BDAE3A769}"
-	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
 	EndProjectSection
 EndProject

diff --git a/coverlet.runsettings b/coverlet.runsettings
@@ -5,8 +5,6 @@
       <DataCollector friendlyName="XPlat code coverage">
         <Configuration>
           <Format>lcov</Format>
-          <ExcludeByAttribute>Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute,TestSDKAutoGeneratedCode</ExcludeByAttribute>
-          <SkipAutoProps>true</SkipAutoProps>
         </Configuration>
       </DataCollector>
     </DataCollectors>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,14 +16,18 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <DebugType>portable</DebugType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  <PropertyGroup Label="Debug">
+    <DebugType>embedded</DebugType>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>false</IncludeSymbols>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Options">
+    <DefaultLanguage>en-US</DefaultLanguage>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <NoWarn>1591</NoWarn>
@@ -32,10 +36,9 @@
   <PropertyGroup>
     <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MongoDB.Abstracts/MongoDB.Abstracts.csproj b/src/MongoDB.Abstracts/MongoDB.Abstracts.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>MongoDB.Abstracts</AssemblyName>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.20.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.25.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MongoDB.Abstracts/MongoQuery.cs b/src/MongoDB.Abstracts/MongoQuery.cs
@@ -195,8 +195,7 @@ protected virtual IMongoCollection<TEntity> CreateCollection()
     /// <returns></returns>
     protected virtual IMongoCollection<TEntity> CreateCollection(IMongoDatabase database, string collectionName)
     {
-        var mongoCollection = database.GetCollection<TEntity>(collectionName);
-        return mongoCollection;
+        return database.GetCollection<TEntity>(collectionName);
     }
 
     /// <summary>

diff --git a/test/MongoDB.Abstracts.Tests/CommentRepositoryTest.cs b/test/MongoDB.Abstracts.Tests/CommentRepositoryTest.cs
@@ -1,24 +1,17 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-using Bogus;
-
-using FluentAssertions;
-
 using Microsoft.Extensions.DependencyInjection;
 
 using MongoDB.Abstracts.Tests.Models;
 using MongoDB.Bson;
 
-using Xunit;
-using Xunit.Abstractions;
-
 namespace MongoDB.Abstracts.Tests;
 
 
-public class CommentRepositoryTest : TestServiceBase
+public class CommentRepositoryTest : DatabaseTestBase
 {
-    public CommentRepositoryTest(ITestOutputHelper outputHelper) : base(outputHelper)
+    public CommentRepositoryTest(ITestOutputHelper output, DatabaseFixture databaseFixture) : base(output, databaseFixture)
     {
     }
 

diff --git a/test/MongoDB.Abstracts.Tests/DatabaseCollection.cs b/test/MongoDB.Abstracts.Tests/DatabaseCollection.cs
@@ -0,0 +1,7 @@
+namespace MongoDB.Abstracts.Tests;
+
+[CollectionDefinition(CollectionName)]
+public class DatabaseCollection : ICollectionFixture<DatabaseFixture>
+{
+    public const string CollectionName = "DatabaseCollection";
+}
diff --git a/test/MongoDB.Abstracts.Tests/DatabaseFixture.cs b/test/MongoDB.Abstracts.Tests/DatabaseFixture.cs
@@ -0,0 +1,29 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+using XUnit.Hosting;
+
+namespace MongoDB.Abstracts.Tests;
+
+public class DatabaseFixture : TestApplicationFixture
+{
+    protected override void ConfigureApplication(HostApplicationBuilder builder)
+    {
+        base.ConfigureApplication(builder);
+
+        var services = builder.Services;
+
+        services.AddSingleton(sp =>
+        {
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var connectionString = configuration.GetConnectionString("MongoUnitTest");
+            return MongoFactory.GetDatabaseFromConnectionString(connectionString);
+        });
+
+        services.AddSingleton(typeof(IMongoEntityQuery<>), typeof(MongoEntityQuery<>));
+        services.AddSingleton(typeof(IMongoEntityRepository<>), typeof(MongoEntityRepository<>));
+
+        services.AddMongoDBAbstractsTests();
+    }
+}