Skip to content

Commit 99db5ac

Browse files
committed
Merge branch 'master' of github.com:getsentry/sentry-dotnet into feature/aspnetcore-configure-scope
2 parents 3e44d25 + 4035e25 commit 99db5ac

File tree

13 files changed

+22
-71
lines changed

13 files changed

+22
-71
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>1.1.2-beta</Version>
3+
<Version>1.1.2</Version>
44

55
<LangVersion>7.2</LangVersion>
66
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ The SDK is configurable, many of the settings are demonstrated through the sampl
137137
* Shutdown timeout: If there are events to send, how long to wait until shutdown
138138
* Accept compressed response
139139
* Compress request body
140-
* Breadcrumb level: Minimal log level to store as a breadcrumb
141-
* Event level: Minimal log level to send an event to Sentry
140+
* Breadcrumb level: Minimum log level to store as a breadcrumb
141+
* Event level: Minimum log level to send an event to Sentry
142142
* Disable duplicate event detection
143143
* Disable capture of global unhandled exceptions
144144
* Add event processor
@@ -179,9 +179,9 @@ An example using `IHub` for testability is [SentryLogger](https://github.com/get
179179

180180
## Compatibility
181181

182-
The packages target **.NET Standard 2.0**. That means [it is compatible with](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) the following versions or newer:
182+
The packages target **.NET Standard 2.0** and **.NET Framework 4.6.1**. That means [it is compatible with](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) the following versions or newer:
183183

184-
* .NET Framework 4.6.1 (4.7.2 advised)
184+
* .NET Framework 4.6.1
185185
* .NET Core 2.0
186186
* Mono 5.4
187187
* Xamarin.Android 8.0
@@ -195,9 +195,14 @@ Of those, we've tested (we run our unit/integration tests) against:
195195
* Mono 5.12 macOS and Linux (Travis-CI)
196196
* .NET Core 2.1 Windows, macOS and Linux
197197

198+
### Sentry Protocol
199+
200+
Looking for the types used by this SDK to send data to Sentry like *SentryEvent* and *SentryException*?
201+
They are released as a separate [NuGet Package called `Sentry.Protocol`](https://www.nuget.org/packages/Sentry.Protocol/) and [sources are on this GitHub repository](https://github.com/getsentry/sentry-dotnet-protocol).
202+
198203
### Legacy frameworks
199204

200-
Sentry's [Raven SDK](https://github.com/getsentry/raven-csharp/), battle tested with over 400.000 downloads on NuGet has support to .NET Framework 3.5+.
205+
Sentry's [Raven SDK](https://github.com/getsentry/raven-csharp/), battle tested with over 640.000 downloads on NuGet has support to .NET Framework 3.5+.
201206

202207
## Resources
203208
* [![Gitter chat](https://img.shields.io/gitter/room/getsentry/dotnet.svg)](https://gitter.im/getsentry/dotnet)

src/Sentry/Extensibility/DisabledHub.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Threading.Tasks;
3+
using Sentry.Protocol;
34

45
namespace Sentry.Extensibility
56
{

src/Sentry/IHub.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using Sentry.Protocol;
2+
13
namespace Sentry
24
{
35
/// <summary>

src/Sentry/ISentryClient.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using Sentry.Protocol;
2+
13
namespace Sentry
24
{
35
/// <summary>

src/Sentry/Internal/Http/HttpTransport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task CaptureEventAsync(SentryEvent @event, CancellationToken cancel
5050
#if DEBUG
5151
var body = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
5252
var responseId = JsonSerializer.DeserializeObject<SentrySuccessfulResponseBody>(body)?.id;
53-
Debug.Assert(@event.EventId.ToString("N") == responseId);
53+
Debug.Assert(@event.EventId.ToString() == responseId);
5454
#endif
5555
return;
5656
}

src/Sentry/Internal/Hub.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Threading.Tasks;
55
using Sentry.Extensibility;
66
using Sentry.Integrations;
7+
using Sentry.Protocol;
78

89
namespace Sentry.Internal
910
{

src/Sentry/Internal/OptionalHub.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Threading.Tasks;
33
using Sentry.Extensibility;
4+
using Sentry.Protocol;
45

56
namespace Sentry.Internal
67
{

src/Sentry/Sentry.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818
<ItemGroup>
1919
<PackageReference Include="Sentry.PlatformAbstractions" Version="1.0.0" />
20-
<PackageReference Include="Sentry.Protocol" Version="1.0.2" />
20+
<PackageReference Include="Sentry.Protocol" Version="1.0.4" />
2121
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
2222
</ItemGroup>
2323

src/Sentry/SentryClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private SentryId DoSendEvent(SentryEvent @event, Scope scope)
148148
if (Worker.EnqueueEvent(@event))
149149
{
150150
_options.DiagnosticLogger?.LogDebug("Event queued up.");
151-
return (SentryId)@event.EventId;
151+
return @event.EventId;
152152
}
153153

154154
_options.DiagnosticLogger?.LogWarning("The attempt to queue the event failed. Items in queue: {0}",

0 commit comments

Comments
 (0)