Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit 5507ce9

Browse files
bruno-garciabruno-garcia
authored
Merge pull request #12 from lucas-zimerman/ref/bump-sentry-sdk
2 parents cc1d172 + af230e2 commit 5507ce9

13 files changed

+54
-32
lines changed

‎build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ if ($lastexitcode -ne 0) { Write-Error "Build failed!" }
6464
if ($lastexitcode -ne 0) { Write-Error "Pack failed!" }
6565

6666
Set-Variable -name runner -value (GetTestRunner)
67-
& $runner "test\Sentry.EntityFramework.Tests\bin\Release\net462\Sentry.EntityFramework.Tests.dll"
67+
& $runner "test\Sentry.EntityFramework.Tests\bin\Release\net461\Sentry.EntityFramework.Tests.dll"
6868
if ($lastexitcode -ne 0) { Set-Variable -name fail -value true }

‎samples/Sentry.Samples.AspNet.Mvc/Global.asax.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected void Application_Start()
2525
_sentrySdk = SentrySdk.Init(o =>
2626
{
2727
// We store the DSN inside Web.config; make sure to use your own DSN!
28-
o.Dsn = new Dsn(ConfigurationManager.AppSettings["SentryDsn"]);
28+
o.Dsn = ConfigurationManager.AppSettings["SentryDsn"];
2929

3030
// Add the EntityFramework integration
3131
o.AddEntityFramework();

‎samples/Sentry.Samples.AspNet.Mvc/Sentry.Samples.AspNet.Mvc.csproj

+32-10
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,52 @@
4646
<WarningLevel>4</WarningLevel>
4747
</PropertyGroup>
4848
<ItemGroup>
49+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
50+
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
51+
</Reference>
4952
<Reference Include="Microsoft.CSharp" />
5053
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5154
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5255
</Reference>
53-
<Reference Include="Sentry, Version=2.1.6.0, Culture=neutral, PublicKeyToken=fba2ec45388e2af0, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Sentry.2.1.6\lib\net461\Sentry.dll</HintPath>
55-
</Reference>
56-
<Reference Include="Sentry.PlatformAbstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=fba2ec45388e2af0, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Sentry.PlatformAbstractions.1.1.1\lib\net45\Sentry.PlatformAbstractions.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Sentry.Protocol, Version=2.1.6.0, Culture=neutral, PublicKeyToken=fba2ec45388e2af0, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Sentry.Protocol.2.1.6\lib\net46\Sentry.Protocol.dll</HintPath>
56+
<Reference Include="Sentry, Version=3.0.3.0, Culture=neutral, PublicKeyToken=fba2ec45388e2af0, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\Sentry.3.0.3\lib\net461\Sentry.dll</HintPath>
6158
</Reference>
6259
<Reference Include="System" />
63-
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
60+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
61+
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
62+
</Reference>
63+
<Reference Include="System.Collections.Immutable, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64+
<HintPath>..\..\packages\System.Collections.Immutable.5.0.0\lib\net461\System.Collections.Immutable.dll</HintPath>
6565
</Reference>
6666
<Reference Include="System.Data" />
6767
<Reference Include="System.Drawing" />
68+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
69+
<HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
70+
</Reference>
71+
<Reference Include="System.Numerics" />
72+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73+
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
74+
</Reference>
75+
<Reference Include="System.Reflection.Metadata, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76+
<HintPath>..\..\packages\System.Reflection.Metadata.5.0.0\lib\net461\System.Reflection.Metadata.dll</HintPath>
77+
</Reference>
78+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
79+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
80+
</Reference>
6881
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6982
<HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
7083
<Private>True</Private>
7184
<Private>True</Private>
7285
</Reference>
86+
<Reference Include="System.Text.Encodings.Web, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
87+
<HintPath>..\..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.Text.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
90+
<HintPath>..\..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll</HintPath>
91+
</Reference>
92+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
93+
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
94+
</Reference>
7395
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
7496
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
7597
</Reference>

‎samples/Sentry.Samples.AspNet.Mvc/Web.config

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<add key="ClientValidationEnabled" value="true" />
1818
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1919
<!-- Sentry DSN, replace this with your own -->
20-
<add key="SentryDsn" value="https://5fd7a6cda8444965bade9ccfd3df9882@sentry.io/1188141" />
20+
<add key="SentryDsn" value="https://80aed643f81249d4bed3e30687b310ab@o447951.ingest.sentry.io/5428537" />
2121
</appSettings>
2222
<!--
2323
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -91,7 +91,11 @@
9191
</dependentAssembly>
9292
<dependentAssembly>
9393
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
94-
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
94+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
95+
</dependentAssembly>
96+
<dependentAssembly>
97+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
98+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
9599
</dependentAssembly>
96100
</assemblyBinding>
97101
</runtime>

‎samples/Sentry.Samples.AspNet.Mvc/packages.config

+11-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<package id="Microsoft.AspNet.TelemetryCorrelation" version="1.0.0" targetFramework="net462" />
1414
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net462" />
1515
<package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net462" />
16+
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net461" />
1617
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net462" />
1718
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.4" targetFramework="net462" />
1819
<package id="Microsoft.Net.Compilers" version="2.6.1" targetFramework="net462" developmentDependency="true" />
@@ -29,12 +30,18 @@
2930
<package id="Modernizr" version="2.8.3" targetFramework="net462" />
3031
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
3132
<package id="Owin" version="1.0" targetFramework="net462" />
32-
<package id="Sentry" version="2.1.6" targetFramework="net461" />
33-
<package id="Sentry.PlatformAbstractions" version="1.1.1" targetFramework="net461" />
34-
<package id="Sentry.Protocol" version="2.1.6" targetFramework="net461" />
35-
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
33+
<package id="Sentry" version="3.0.3" targetFramework="net461" />
34+
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
35+
<package id="System.Collections.Immutable" version="5.0.0" targetFramework="net461" />
3636
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net462" />
37+
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
38+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
39+
<package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net461" />
40+
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
3741
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
42+
<package id="System.Text.Encodings.Web" version="5.0.0" targetFramework="net461" />
43+
<package id="System.Text.Json" version="5.0.0" targetFramework="net461" />
44+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
3845
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
3946
<package id="WebGrease" version="1.6.0" targetFramework="net462" />
4047
</packages>

‎src/Sentry.EntityFramework/IQueryLogger.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Sentry.Protocol;
2-
31
namespace Sentry.EntityFramework
42
{
53
public interface IQueryLogger

‎src/Sentry.EntityFramework/Sentry.EntityFramework.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="EntityFramework" Version="6.0.0" />
32-
<PackageReference Include="Sentry" Version="2.1.6" />
32+
<PackageReference Include="Sentry" Version="3.0.3" />
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<None Include="../../.assets/sentry-nuget.png" Pack="true" PackagePath=""/>
36+
<None Include="../../.assets/sentry-nuget.png" Pack="true" PackagePath="" />
3737
</ItemGroup>
3838

3939
</Project>

‎src/Sentry.EntityFramework/SentryCommandInterceptor.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Data.Common;
22
using System.Data.Entity.Infrastructure.Interception;
3-
using Sentry.Protocol;
43

54
namespace Sentry.EntityFramework
65
{

‎src/Sentry.EntityFramework/SentryQueryLogger.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Sentry.Extensibility;
2-
using Sentry.Protocol;
32

43
namespace Sentry.EntityFramework
54
{

‎test/Sentry.EntityFramework.Tests/DsnSamples.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ public static class DsnSamples
1919
/// <summary>
2020
/// Valid DSN instance
2121
/// </summary>
22-
public static Dsn Valid = new Dsn(ValidDsnWithSecret);
22+
public static string Valid => ValidDsnWithSecret;
2323
}
2424
}

‎test/Sentry.EntityFramework.Tests/ErrorProcessorTests.cs

-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44
using System.Data.Common;
55
using System.Data.Entity.Validation;
66
using System.Linq;
7-
using System.Text;
8-
using System.Threading;
97
using System.Threading.Tasks;
10-
using NSubstitute;
118
using Sentry.EntityFramework.ErrorProcessors;
12-
using Sentry.Extensibility;
13-
using Sentry.Protocol;
149
using Xunit;
1510

1611
namespace Sentry.EntityFramework.Tests

‎test/Sentry.EntityFramework.Tests/SentryCommandInterceptorTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Linq;
55
using Effort.Provider;
66
using NSubstitute;
7-
using Sentry.Protocol;
87
using Xunit;
98

109
namespace Sentry.EntityFramework.Tests

‎test/Sentry.EntityFramework.Tests/SentryQueryLoggerTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Linq;
22
using NSubstitute;
3-
using Sentry.Protocol;
43
using Xunit;
54

65
namespace Sentry.EntityFramework.Tests

0 commit comments

Comments
 (0)