Merge pull request #1437 from json-api-dotnet/merge-master-v5.5.1-into-openapi

Merge master (v5.5.1) into openapi

Author: bkoelman

.github/workflows/build.yml

@@ -23,10 +23,6 @@ concurrency:
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
-  # The Windows runner image has PostgreSQL pre-installed and sets the PGPASSWORD environment variable to "root".
-  # This conflicts with the default password "postgres", which is used by ikalnytskyi/action-setup-postgres.
-  # Because action-setup-postgres forgets to update the environment variable accordingly, we do so here.
-  PGPASSWORD: "postgres"
 
 jobs:
   build-and-test:
@@ -42,7 +38,7 @@ jobs:
     - name: Tune GitHub-hosted runner network
       uses: smorimoto/tune-github-hosted-runner-network@v1
     - name: Setup PostgreSQL
-      uses: ikalnytskyi/action-setup-postgres@v4
+      uses: ikalnytskyi/action-setup-postgres@v5
       with:
         username: postgres
         password: postgres
@@ -131,6 +127,13 @@ jobs:
       run: |
         dotnet build --no-restore --configuration Release /p:VersionSuffix=$env:PACKAGE_VERSION_SUFFIX
     - name: Test
+      env:
+        # Override log levels, to reduce logging output when running tests in ci-build.
+        Logging__LogLevel__Microsoft.Hosting.Lifetime: 'None'
+        Logging__LogLevel__Microsoft.AspNetCore.Hosting.Diagnostics: 'None'
+        Logging__LogLevel__Microsoft.Extensions.Hosting.Internal.Host: 'None'
+        Logging__LogLevel__Microsoft.EntityFrameworkCore.Database.Command: 'None'
+        Logging__LogLevel__JsonApiDotNetCore: 'None'
       run: |
         dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;summary.includeSkippedTests=true"
     - name: Upload coverage to codecov.io

Directory.Build.props

@@ -27,6 +27,6 @@
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
     <RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
-    <JsonApiDotNetCoreVersionPrefix>5.5.1</JsonApiDotNetCoreVersionPrefix>
+    <JsonApiDotNetCoreVersionPrefix>5.5.2</JsonApiDotNetCoreVersionPrefix>
   </PropertyGroup>
 </Project>

test/DapperTests/IntegrationTests/DapperTestContext.cs

@@ -69,6 +69,10 @@ private WebApplicationFactory<TodoItem> CreateFactory()
             {
                 if (_testOutputHelper != null)
                 {
+#if !DEBUG
+                    // Reduce logging output when running tests in ci-build.
+                    loggingBuilder.ClearProviders();
+#endif
                     loggingBuilder.Services.AddSingleton<ILoggerProvider>(_ => new XUnitLoggerProvider(_testOutputHelper, "DapperExample."));
                 }
             });

test/TestBuildingBlocks/IntegrationTestContext.cs

@@ -83,8 +83,8 @@ private WebApplicationFactory<TStartup> CreateFactory()
             });
         });
 
-        // We have placed an appsettings.json in the TestBuildingBlock project folder and set the content root to there. Note that controllers
-        // are not discovered in the content root but are registered manually using IntegrationTestContext.UseController.
+        // We have placed an appsettings.json in the TestBuildingBlocks project directory and set the content root to there. Note that
+        // controllers are not discovered in the content root, but are registered manually using IntegrationTestContext.UseController.
         WebApplicationFactory<TStartup> factoryWithConfiguredContentRoot =
             factory.WithWebHostBuilder(builder => builder.UseSolutionRelativeContentRoot($"test/{nameof(TestBuildingBlocks)}"));
 
@@ -161,8 +161,8 @@ protected override IHostBuilder CreateHostBuilder()
                 .CreateDefaultBuilder(null)
                 .ConfigureAppConfiguration(builder =>
                 {
-                    // For tests asserting on log output, we discard the logging settings from appsettings.json.
-                    // But using appsettings.json for all other tests makes it easy to quickly toggle when debugging.
+                    // For tests asserting on log output, we discard the log levels from appsettings.json and environment variables.
+                    // But using appsettings.json for all other tests makes it easy to quickly toggle when debugging tests.
                     if (_loggingConfiguration != null)
                     {
                         builder.Sources.Clear();