diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1926715..fa8c583 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -37,6 +37,14 @@ updates: OpenTelemetry: patterns: - "OpenTelemetry.*" + Serilog: + patterns: + - "Serilog" + - "Serilog.*" + Hangfire: + patterns: + - "Hangfire" + - "Hangfire.*" Testcontainers: patterns: - "Testcontainers.*" diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..c52640d --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,24 @@ +name: Dependabot Auto-Merge +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + + steps: + - name: Dependabot Metadata + id: metadata + uses: dependabot/fetch-metadata@v2 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Dependabot Auto-Merge PRs + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/samples/SampleConsoleApplication/SampleConsoleApplication.csproj b/samples/SampleConsoleApplication/SampleConsoleApplication.csproj index ce03459..f8a0873 100644 --- a/samples/SampleConsoleApplication/SampleConsoleApplication.csproj +++ b/samples/SampleConsoleApplication/SampleConsoleApplication.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/samples/SampleStressTest/SampleStressTest.csproj b/samples/SampleStressTest/SampleStressTest.csproj index 8114b6b..7e5681b 100644 --- a/samples/SampleStressTest/SampleStressTest.csproj +++ b/samples/SampleStressTest/SampleStressTest.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/samples/SampleWebApplication/SampleWebApplication.csproj b/samples/SampleWebApplication/SampleWebApplication.csproj index fccd385..687d7ba 100644 --- a/samples/SampleWebApplication/SampleWebApplication.csproj +++ b/samples/SampleWebApplication/SampleWebApplication.csproj @@ -20,7 +20,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Serilog.Sinks.AzureTableStorage/Serilog.Sinks.AzureTableStorage.csproj b/src/Serilog.Sinks.AzureTableStorage/Serilog.Sinks.AzureTableStorage.csproj index 4b8a952..236b4e5 100644 --- a/src/Serilog.Sinks.AzureTableStorage/Serilog.Sinks.AzureTableStorage.csproj +++ b/src/Serilog.Sinks.AzureTableStorage/Serilog.Sinks.AzureTableStorage.csproj @@ -53,8 +53,8 @@ - - + + diff --git a/test/Serilog.Sinks.AzureTableStorage.Tests/DateTimeExtensionsTests.cs b/test/Serilog.Sinks.AzureTableStorage.Tests/DateTimeExtensionsTests.cs index de2fa91..f9ff81f 100644 --- a/test/Serilog.Sinks.AzureTableStorage.Tests/DateTimeExtensionsTests.cs +++ b/test/Serilog.Sinks.AzureTableStorage.Tests/DateTimeExtensionsTests.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using FluentAssertions; - using Serilog.Sinks.AzureTableStorage.Extensions; using Xunit; @@ -25,7 +23,7 @@ public DateTimeExtensionsTests(ITestOutputHelper output) public void GeneratePartitionKeyDateTimeNowRound(DateTime dateTime, DateTime expected, TimeSpan span) { var rounded = DateTimeExtensions.Round(dateTime, span); - rounded.Should().Be(expected); + Assert.Equal(expected, rounded); } public static IEnumerable GetDateRounding() diff --git a/test/Serilog.Sinks.AzureTableStorage.Tests/DefaultKeyGeneratorTests.cs b/test/Serilog.Sinks.AzureTableStorage.Tests/DefaultKeyGeneratorTests.cs index 9879be3..3d4ab7e 100644 --- a/test/Serilog.Sinks.AzureTableStorage.Tests/DefaultKeyGeneratorTests.cs +++ b/test/Serilog.Sinks.AzureTableStorage.Tests/DefaultKeyGeneratorTests.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using FluentAssertions; - using Serilog.Sinks.AzureTableStorage.Extensions; using Xunit; @@ -26,20 +24,20 @@ public void GenerateRowKeyDateTimeOffsetNow() var dateTime = new DateTimeOffset(2024, 4, 1, 23, 0, 0, TimeSpan.FromHours(-5)); var rowKey = DefaultKeyGenerator.GenerateRowKey(dateTime); - rowKey.Should().NotBeNull(); + Assert.NotNull(rowKey); var parsed = Ulid.TryParse(rowKey, out var ulid); - parsed.Should().BeTrue(); - ulid.Should().NotBeNull(); + Assert.True(parsed); + Assert.NotEqual(default, ulid); var reversed = dateTime.ToUniversalTime().ToReverseChronological(); var ulidDate = ulid.Time; - ulidDate.Year.Should().Be(reversed.Year); - ulidDate.Month.Should().Be(reversed.Month); - ulidDate.Day.Should().Be(reversed.Day); - ulidDate.Hour.Should().Be(reversed.Hour); - ulidDate.Minute.Should().Be(reversed.Minute); + Assert.Equal(reversed.Year, ulidDate.Year); + Assert.Equal(reversed.Month, ulidDate.Month); + Assert.Equal(reversed.Day, ulidDate.Day); + Assert.Equal(reversed.Hour, ulidDate.Hour); + Assert.Equal(reversed.Minute, ulidDate.Minute); } @@ -49,8 +47,8 @@ public void GeneratePartitionKeyDateTimeOffsetNow() var dateTime = new DateTimeOffset(2024, 4, 1, 23, 0, 0, TimeSpan.FromHours(-5)); var partitionKey = DefaultKeyGenerator.GeneratePartitionKey(dateTime); - partitionKey.Should().NotBeNull(); - partitionKey.Should().Be("2516902703999999999"); + Assert.NotNull(partitionKey); + Assert.Equal("2516902703999999999", partitionKey); } [Fact] @@ -60,8 +58,8 @@ public void GeneratePartitionKeyDateTimeNow() var eventTime = dateTime.UtcDateTime; var partitionKey = DefaultKeyGenerator.GeneratePartitionKey(eventTime); - partitionKey.Should().NotBeNull(); - partitionKey.Should().Be("2516902703999999999"); + Assert.NotNull(partitionKey); + Assert.Equal("2516902703999999999", partitionKey); } [Theory] @@ -69,8 +67,8 @@ public void GeneratePartitionKeyDateTimeNow() public void GeneratePartitionKeyDateTimeNowRound(DateTimeOffset dateTime, string expected) { var partitionKey = DefaultKeyGenerator.GeneratePartitionKey(dateTime); - partitionKey.Should().NotBeNull(); - partitionKey.Should().Be(expected); + Assert.NotNull(partitionKey); + Assert.Equal(expected, partitionKey); } public static IEnumerable GetDateRounding() @@ -108,8 +106,8 @@ public void GeneratePartitionKeyQueryDateOnly() var date = new DateOnly(2024, 4, 1); var partitionKeyQuery = DefaultKeyGenerator.GeneratePartitionKeyQuery(date, TimeSpan.FromHours(-5)); - partitionKeyQuery.Should().NotBeNull(); - partitionKeyQuery.Should().Be("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')"); + Assert.NotNull(partitionKeyQuery); + Assert.Equal("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')", partitionKeyQuery); } [Fact] @@ -122,8 +120,8 @@ public void GeneratePartitionKeyQueryDateTime() var endTime = endDate.UtcDateTime; var partitionKeyQuery = DefaultKeyGenerator.GeneratePartitionKeyQuery(startTime, endTime); - partitionKeyQuery.Should().NotBeNull(); - partitionKeyQuery.Should().Be("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')"); + Assert.NotNull(partitionKeyQuery); + Assert.Equal("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')", partitionKeyQuery); } [Fact] @@ -133,8 +131,8 @@ public void GeneratePartitionKeyQueryDateTimeOffset() var endTime = new DateTimeOffset(2024, 4, 2, 0, 0, 0, TimeSpan.FromHours(-5)); var partitionKeyQuery = DefaultKeyGenerator.GeneratePartitionKeyQuery(startTime, endTime); - partitionKeyQuery.Should().NotBeNull(); - partitionKeyQuery.Should().Be("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')"); + Assert.NotNull(partitionKeyQuery); + Assert.Equal("(PartitionKey ge '2516902667999999999') and (PartitionKey lt '2516903531999999999')", partitionKeyQuery); } } diff --git a/test/Serilog.Sinks.AzureTableStorage.Tests/Serilog.Sinks.AzureTableStorage.Tests.csproj b/test/Serilog.Sinks.AzureTableStorage.Tests/Serilog.Sinks.AzureTableStorage.Tests.csproj index 6ee0b58..a18458c 100644 --- a/test/Serilog.Sinks.AzureTableStorage.Tests/Serilog.Sinks.AzureTableStorage.Tests.csproj +++ b/test/Serilog.Sinks.AzureTableStorage.Tests/Serilog.Sinks.AzureTableStorage.Tests.csproj @@ -13,13 +13,12 @@ - - - + + all runtime; build; native; contentfiles; analyzers - +