Skip to content

Commit

Permalink
Merge branch 'main' into fix/bytearray-attachment
Browse files Browse the repository at this point in the history
  • Loading branch information
bruno-garcia authored Dec 15, 2021
2 parents e2bd7ed + bf99e70 commit 3f01339
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 75 deletions.
74 changes: 2 additions & 72 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,77 +1,7 @@
version: 2
updates:
- package-ecosystem: nuget
directory: "/"
directory: "/samples"
schedule:
interval: monthly
open-pull-requests-limit: 10
ignore:
- dependency-name: Microsoft.AspNetCore.Diagnostics.Abstractions
versions:
- "> 2.1.0, < 3"
- dependency-name: Microsoft.AspNetCore.Hosting
versions:
- "> 2.1.0"
- dependency-name: Microsoft.AspNetCore.Mvc.Testing
versions:
- "> 2.1.1"
- dependency-name: Microsoft.AspNetCore.Routing.Abstractions
versions:
- "> 2.1.0"
- dependency-name: Microsoft.AspNetCore.TestHost
versions:
- "> 2.1.1"
- dependency-name: Microsoft.Extensions.Configuration.Binder
versions:
- "> 2.1.0"
- dependency-name: Microsoft.Extensions.Configuration.CommandLine
versions:
- "> 2.1.1"
- dependency-name: Microsoft.Extensions.Configuration.Json
versions:
- ">= 3.a, < 4"
- dependency-name: Microsoft.Extensions.DependencyInjection
versions:
- "> 2.1.0"
- dependency-name: Microsoft.Extensions.Hosting
versions:
- "> 2.1.1"
- dependency-name: Microsoft.Extensions.Logging.Configuration
versions:
- "> 2.1.0"
- dependency-name: Microsoft.Extensions.Logging.Console
versions:
- "> 2.1.1"
- dependency-name: NLog
versions:
- "> 4.5.11, < 5"
- dependency-name: Serilog
versions:
- "> 2.7.1"
- dependency-name: System.Diagnostics.DiagnosticSource
versions:
- "> 4.5.0, < 5"
- dependency-name: Grpc.AspNetCore.Server.Reflection
versions:
- 2.35.0
- 2.36.0
- dependency-name: Grpc.Net.Client
versions:
- 2.35.0
- 2.36.0
- dependency-name: Google.Protobuf
versions:
- 3.15.3
- 3.15.4
- 3.15.5
- 3.15.6
- 3.15.7
- dependency-name: Amazon.Lambda.AspNetCoreServer
versions:
- 5.3.1
- dependency-name: Microsoft.NET.Test.Sdk
versions:
- 16.9.1
- dependency-name: AWSSDK.Extensions.NETCore.Setup
versions:
- 3.3.101
open-pull-requests-limit: 2
2 changes: 1 addition & 1 deletion test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Verify.Xunit" Version="14.6.6" />
<PackageReference Include="Verify.Xunit" Version="14.11.1" />
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
<PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions test/Sentry.NLog.Tests/SentryTargetTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using NLog.Config;
using NLog.Targets;
using NLog.Targets.Wrappers;
using Target = NLog.Targets.Target;

namespace Sentry.NLog.Tests;

Expand Down
4 changes: 2 additions & 2 deletions test/Sentry.Tests/Internals/ProcessInfoTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public async Task Ctor_StartupTimeSimilarToUtcNow()
"Now: " + utcNow);

var diff = (utcNow - sut.StartupTime).Value.TotalSeconds;
// CI is often slow and the diff stays around 10 seconds. 60 is enough to validate the code though:
Assert.True(diff <= 60, "diff isn't less expected 60 seconds: " + diff);
// CI is often slow and the diff stays around 10 seconds. We only care that this isn't like beginning of time, or default(DateTime):
Assert.True(diff <= 240, "diff isn't less expected 240 seconds: " + diff);
}

[Fact]
Expand Down

0 comments on commit 3f01339

Please sign in to comment.