Merge branch 'main' into AutoVerify(includeBuildServer-false)

getsentry · Nov 27, 2021 · 91623cd · 91623cd
2 parents c52c11c + ca72faa
commit 91623cd
Show file tree

Hide file tree

Showing 22 changed files with 13 additions and 2,914 deletions.
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -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.3" />
+    <PackageReference Include="Verify.Xunit" Version="14.6.4" />
     <PackageReference Include="PublicApiGenerator" Version="10.2.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
   </ItemGroup>

diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.0", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.0", FrameworkDisplayName="")]
 namespace Sentry.AspNetCore.Grpc
 {
     public class DefaultProtobufRequestPayloadExtractor : Sentry.AspNetCore.Grpc.IProtobufRequestPayloadExtractor

diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.0", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.0", FrameworkDisplayName="")]
 namespace Microsoft.AspNetCore.Builder
 {
     public static class SentryTracingMiddlewareExtensions { }

diff --git a/test/Sentry.AspNetCore.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt b/test/Sentry.AspNetCore.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt
diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.CLSCompliant(true)]
+[assembly: System.CLSCompliant(true)]
 [assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.0", FrameworkDisplayName="")]
 namespace Sentry
 {

diff --git a/test/Sentry.DiagnosticSource.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt b/test/Sentry.DiagnosticSource.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt
diff --git a/test/Sentry.DiagnosticSource.Tests/ApiApprovalTests.Run.DotNet3_0.verified.txt b/test/Sentry.DiagnosticSource.Tests/ApiApprovalTests.Run.DotNet3_0.verified.txt
diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName="")]
 namespace Sentry.EntityFramework.ErrorProcessors
 {
     public class DbConcurrencyExceptionProcessor : Sentry.Extensibility.SentryEventExceptionProcessor<System.Data.DBConcurrencyException>

diff --git a/...iApprovalTests.Run.DotNet2_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet2_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.0", FrameworkDisplayName="")]
 namespace Microsoft.Extensions.Logging
 {
     public static class LoggingBuilderExtensions { }

diff --git a/test/Sentry.Extensions.Logging.Tests/ApiApprovalTests.Run.DotNet3_1.verified.txt b/test/Sentry.Extensions.Logging.Tests/ApiApprovalTests.Run.DotNet3_1.verified.txt
diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.1", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v3.1", FrameworkDisplayName="")]
 namespace Google.Cloud.Functions.Framework
 {
     public class SentryStartup : Google.Cloud.Functions.Hosting.FunctionsStartup

diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.CLSCompliant(true)]
+[assembly: System.CLSCompliant(true)]
 [assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName="")]
 namespace Sentry.Log4Net
 {

diff --git a/test/Sentry.Log4Net.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt b/test/Sentry.Log4Net.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt
diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.CLSCompliant(true)]
+[assembly: System.CLSCompliant(true)]
 [assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName="")]
 namespace NLog
 {

diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet2_1.verified.txt
diff --git a/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt b/...iApprovalTests.Run.DotNet3_1.verified.txt → ...ApiApprovalTests.Run.Core3_1.verified.txt
@@ -1,4 +1,4 @@
-[assembly: System.CLSCompliant(true)]
+[assembly: System.CLSCompliant(true)]
 [assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName="")]
 namespace Sentry.Serilog
 {