Merge branch 'master' into merge-master-into-openapi

Author: bkoelman

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2024.1.0",
+      "version": "2024.1.2",
       "commands": [
         "jb"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.2.4",
+      "version": "5.3.0",
       "commands": [
         "reportgenerator"
       ]

.github/workflows/build.yml

@@ -38,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@v5
+      uses: ikalnytskyi/action-setup-postgres@v6
       with:
         username: postgres
         password: postgres
@@ -302,7 +302,7 @@ jobs:
         dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:GITHUB_TOKEN" --source 'github'
     - name: Publish documentation
       if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_branch: gh-pages

.github/workflows/qodana.yml

@@ -22,7 +22,7 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
         fetch-depth: 0  # a full history is required for pull request analysis
     - name: 'Qodana Scan'
-      uses: JetBrains/qodana-action@v2023.3
+      uses: JetBrains/qodana-action@v2024.1
       env:
         QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
     - name: Upload results to artifacts on failure

package-versions.props

@@ -11,7 +11,7 @@
     <ApiDescriptionServerVersion>8.0.*</ApiDescriptionServerVersion>
     <BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
     <BlushingPenguinVersion>1.0.*</BlushingPenguinVersion>
-    <BogusVersion>35.2.*</BogusVersion>
+    <BogusVersion>35.5.*</BogusVersion>
     <CodeAnalysisVersion>4.9.*</CodeAnalysisVersion>
     <CoverletVersion>6.0.*</CoverletVersion>
     <DapperVersion>2.1.*</DapperVersion>
@@ -24,9 +24,8 @@
     <NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
     <SourceLinkVersion>8.0.*</SourceLinkVersion>
     <SwashbuckleVersion>6.5.*</SwashbuckleVersion>
-    <TestSdkVersion>17.8.*</TestSdkVersion>
-    <XunitVersion>2.6.*</XunitVersion>
-    <XunitVisualStudioVersion>2.5.*</XunitVisualStudioVersion>
+    <TestSdkVersion>17.9.*</TestSdkVersion>
+    <XunitVersion>2.8.*</XunitVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -35,7 +34,7 @@
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <AspNetCoreVersion>8.0.*</AspNetCoreVersion>
-    <EntityFrameworkCoreVersion>8.0.*-*</EntityFrameworkCoreVersion>
+    <EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
     <SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
   </PropertyGroup>
 

src/Examples/DapperExample/appsettings.json

@@ -4,9 +4,9 @@
     // docker run --rm --detach --name dapper-example-postgresql-db -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres:latest
     // docker run --rm --detach --name dapper-example-postgresql-management --link dapper-example-postgresql-db:db -e PGADMIN_DEFAULT_EMAIL=admin@admin.com -e PGADMIN_DEFAULT_PASSWORD=postgres -p 5050:80 dpage/pgadmin4:latest
     "DapperExamplePostgreSql": "Host=localhost;Database=DapperExample;User ID=postgres;Password=postgres;Include Error Detail=true",
-    // docker run --rm --detach --name dapper-example-mysql-db -e MYSQL_ROOT_PASSWORD=mysql -e MYSQL_DATABASE=DapperExample -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -p 3306:3306 mysql:latest --default-authentication-plugin=mysql_native_password
+    // docker run --rm --detach --name dapper-example-mysql-db -e MYSQL_ROOT_PASSWORD=mysql -e MYSQL_DATABASE=DapperExample -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -p 3306:3306 mysql:latest
     // docker run --rm --detach --name dapper-example-mysql-management --link dapper-example-mysql-db:db -p 8081:80 phpmyadmin/phpmyadmin
-    "DapperExampleMySql": "Host=localhost;Database=DapperExample;User ID=mysql;Password=mysql",
+    "DapperExampleMySql": "Host=localhost;Database=DapperExample;User ID=mysql;Password=mysql;SSL Mode=None;AllowPublicKeyRetrieval=True",
     // docker run --rm --detach --name dapper-example-sqlserver -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=Passw0rd!" -p 1433:1433 mcr.microsoft.com/mssql/server:2022-latest
     "DapperExampleSqlServer": "Server=localhost;Database=DapperExample;User ID=sa;Password=Passw0rd!;TrustServerCertificate=true"
   },

src/JsonApiDotNetCore/CollectionExtensions.cs

@@ -82,7 +82,7 @@ public static bool DictionaryEqual<TKey, TValue>(this IReadOnlyDictionary<TKey,
 
     public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T>? source)
     {
-        return source ?? Enumerable.Empty<T>();
+        return source ?? [];
     }
 
     public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)

test/DapperTests/IntegrationTests/DapperTestContext.cs

@@ -58,7 +58,7 @@ private WebApplicationFactory<TodoItem> CreateFactory()
                 $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true");
 
             builder.UseSetting("ConnectionStrings:DapperExampleMySql",
-                $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=root;Password=mysql;SSL Mode=None");
+                $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=root;Password=mysql;SSL Mode=None;AllowPublicKeyRetrieval=True");
 
             builder.UseSetting("ConnectionStrings:DapperExampleSqlServer",
                 $"Server=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=sa;Password=Passw0rd!;TrustServerCertificate=true");

test/DapperTests/IntegrationTests/FrozenClock.cs

@@ -1,13 +1,11 @@
 using DapperExample;
-using FluentAssertions.Extensions;
 using JetBrains.Annotations;
+using TestBuildingBlocks;
 
 namespace DapperTests.IntegrationTests;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class FrozenClock : IClock
 {
-    private static readonly DateTimeOffset DefaultTime = 1.January(2020).At(1, 1, 1).AsUtc();
-
-    public DateTimeOffset UtcNow { get; set; } = DefaultTime;
+    public DateTimeOffset UtcNow { get; set; } = FrozenSystemClock.DefaultDateTimeOffsetUtc;
 }

test/DapperTests/IntegrationTests/TestFakers.cs

@@ -9,11 +9,11 @@
 
 namespace DapperTests.IntegrationTests;
 
-internal sealed class TestFakers : FakerContainer
+internal sealed class TestFakers
 {
     private readonly Lazy<Faker<TodoItem>> _lazyTodoItemFaker = new(() =>
         new Faker<TodoItem>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(todoItem => todoItem.Description, faker => faker.Lorem.Sentence())
             .RuleFor(todoItem => todoItem.Priority, faker => faker.Random.Enum<TodoItemPriority>())
             .RuleFor(todoItem => todoItem.DurationInHours, faker => faker.Random.Long(1, 250))
@@ -24,31 +24,31 @@ internal sealed class TestFakers : FakerContainer
 
     private readonly Lazy<Faker<LoginAccount>> _lazyLoginAccountFaker = new(() =>
         new Faker<LoginAccount>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(loginAccount => loginAccount.UserName, faker => faker.Internet.UserName())
             .RuleFor(loginAccount => loginAccount.LastUsedAt, faker => faker.Date.PastOffset()
                 .TruncateToWholeMilliseconds()));
 
     private readonly Lazy<Faker<AccountRecovery>> _lazyAccountRecoveryFaker = new(() =>
         new Faker<AccountRecovery>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(accountRecovery => accountRecovery.PhoneNumber, faker => faker.Person.Phone)
             .RuleFor(accountRecovery => accountRecovery.EmailAddress, faker => faker.Person.Email));
 
     private readonly Lazy<Faker<Person>> _lazyPersonFaker = new(() =>
         new Faker<Person>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(person => person.FirstName, faker => faker.Name.FirstName())
             .RuleFor(person => person.LastName, faker => faker.Name.LastName()));
 
     private readonly Lazy<Faker<Tag>> _lazyTagFaker = new(() =>
         new Faker<Tag>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(tag => tag.Name, faker => faker.Lorem.Word()));
 
     private readonly Lazy<Faker<RgbColorType>> _lazyRgbColorFaker = new(() =>
         new Faker<RgbColorType>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(rgbColor => rgbColor.Id, faker => RgbColorType.Create(faker.Random.Byte(), faker.Random.Byte(), faker.Random.Byte())
                 .Id));
 

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs

@@ -6,24 +6,24 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
 
-internal sealed class TelevisionFakers : FakerContainer
+internal sealed class TelevisionFakers
 {
     private readonly Lazy<Faker<TelevisionNetwork>> _lazyTelevisionNetworkFaker = new(() => new Faker<TelevisionNetwork>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(network => network.Name, faker => faker.Company.CompanyName()));
 
     private readonly Lazy<Faker<TelevisionStation>> _lazyTelevisionStationFaker = new(() => new Faker<TelevisionStation>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(station => station.Name, faker => faker.Company.CompanyName()));
 
     private readonly Lazy<Faker<TelevisionBroadcast>> _lazyTelevisionBroadcastFaker = new(() => new Faker<TelevisionBroadcast>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(broadcast => broadcast.Title, faker => faker.Lorem.Sentence())
         .RuleFor(broadcast => broadcast.AiredAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds())
         .RuleFor(broadcast => broadcast.ArchivedAt, faker => faker.Date.RecentOffset().TruncateToWholeMilliseconds()));
 
     private readonly Lazy<Faker<BroadcastComment>> _lazyBroadcastCommentFaker = new(() => new Faker<BroadcastComment>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(comment => comment.Text, faker => faker.Lorem.Paragraph())
         .RuleFor(comment => comment.CreatedAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds()));