Skip to content

Commit 4ee96ee

Browse files
mattjohnsonpintmattjohnsonpint
authored
Publish Sentry.Android.AssemblyReader as a separate nuget package (#2127)
1 parent d985e7b commit 4ee96ee

File tree

51 files changed

+307
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+307
-244
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Features
6+
7+
- Publish `Sentry.Android.AssemblyReader` as a separate nuget package (for reuse by `Sentry.Xamarin`) ([#2127](https://github.com/getsentry/sentry-dotnet/pull/2127))
8+
39
## 3.26.2
410

511
### Fixes

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
<!-- Import the root global usings, except for samples. -->
5555
<ItemGroup Condition="!$(MSBuildProjectName.Contains('Samples'))">
5656
<Compile Include="$(MSBuildThisFileDirectory)GlobalUsings.cs" />
57+
58+
<!-- Add these here instead, so we can remove them for projects that don't have STJ available. -->
59+
<Using Include="System.Text.Json" />
60+
<Using Include="System.Text.Json.Serialization" />
5761
</ItemGroup>
5862

5963
<!-- Set the version and local path for Sentry CLI (downloaded in the restore phase of Sentry.csproj) -->

‎GlobalUsings.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
global using System.Net.NetworkInformation;
1616
global using System.Net.Sockets;
1717
global using System.Reflection;
18+
global using System.Reflection.PortableExecutable;
1819
global using System.Runtime.CompilerServices;
1920
global using System.Runtime.ExceptionServices;
2021
global using System.Runtime.InteropServices;
@@ -25,6 +26,4 @@
2526
global using System.Security.Claims;
2627
global using System.Security.Cryptography;
2728
global using System.Text;
28-
global using System.Text.Json;
29-
global using System.Text.Json.Serialization;
3029
global using System.Text.RegularExpressions;

‎Sentry-CI-Build-Linux.slnf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"samples\\Sentry.Samples.ME.Logging\\Sentry.Samples.ME.Logging.csproj",
2222
"samples\\Sentry.Samples.NLog\\Sentry.Samples.NLog.csproj",
2323
"samples\\Sentry.Samples.Serilog\\Sentry.Samples.Serilog.csproj",
24+
"src\\Sentry.Android.AssemblyReader\\Sentry.Android.AssemblyReader.csproj",
2425
"src\\Sentry.AspNet\\Sentry.AspNet.csproj",
2526
"src\\Sentry.AspNetCore.Grpc\\Sentry.AspNetCore.Grpc.csproj",
2627
"src\\Sentry.AspNetCore\\Sentry.AspNetCore.csproj",
@@ -34,7 +35,7 @@
3435
"src\\Sentry.NLog\\Sentry.NLog.csproj",
3536
"src\\Sentry.Serilog\\Sentry.Serilog.csproj",
3637
"src\\Sentry\\Sentry.csproj",
37-
"test\\Sentry.Android.Tests\\Sentry.Android.Tests.csproj",
38+
"test\\Sentry.Android.AssemblyReader.Tests\\Sentry.Android.AssemblyReader.Tests.csproj",
3839
"test\\Sentry.AspNet.Tests\\Sentry.AspNet.Tests.csproj",
3940
"test\\Sentry.AspNetCore.Grpc.Tests\\Sentry.AspNetCore.Grpc.Tests.csproj",
4041
"test\\Sentry.AspNetCore.Tests\\Sentry.AspNetCore.Tests.csproj",

‎Sentry-CI-Build-Windows.slnf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"samples\\Sentry.Samples.ME.Logging\\Sentry.Samples.ME.Logging.csproj",
2121
"samples\\Sentry.Samples.NLog\\Sentry.Samples.NLog.csproj",
2222
"samples\\Sentry.Samples.Serilog\\Sentry.Samples.Serilog.csproj",
23+
"src\\Sentry.Android.AssemblyReader\\Sentry.Android.AssemblyReader.csproj",
2324
"src\\Sentry.AspNet\\Sentry.AspNet.csproj",
2425
"src\\Sentry.AspNetCore.Grpc\\Sentry.AspNetCore.Grpc.csproj",
2526
"src\\Sentry.AspNetCore\\Sentry.AspNetCore.csproj",
@@ -33,7 +34,7 @@
3334
"src\\Sentry.NLog\\Sentry.NLog.csproj",
3435
"src\\Sentry.Serilog\\Sentry.Serilog.csproj",
3536
"src\\Sentry\\Sentry.csproj",
36-
"test\\Sentry.Android.Tests\\Sentry.Android.Tests.csproj",
37+
"test\\Sentry.Android.AssemblyReader.Tests\\Sentry.Android.AssemblyReader.Tests.csproj",
3738
"test\\Sentry.AspNet.Tests\\Sentry.AspNet.Tests.csproj",
3839
"test\\Sentry.AspNetCore.Grpc.Tests\\Sentry.AspNetCore.Grpc.Tests.csproj",
3940
"test\\Sentry.AspNetCore.Tests\\Sentry.AspNetCore.Tests.csproj",

‎Sentry-CI-Build-macOS.slnf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"samples\\Sentry.Samples.ME.Logging\\Sentry.Samples.ME.Logging.csproj",
2323
"samples\\Sentry.Samples.NLog\\Sentry.Samples.NLog.csproj",
2424
"samples\\Sentry.Samples.Serilog\\Sentry.Samples.Serilog.csproj",
25+
"src\\Sentry.Android.AssemblyReader\\Sentry.Android.AssemblyReader.csproj",
2526
"src\\Sentry.AspNet\\Sentry.AspNet.csproj",
2627
"src\\Sentry.AspNetCore.Grpc\\Sentry.AspNetCore.Grpc.csproj",
2728
"src\\Sentry.AspNetCore\\Sentry.AspNetCore.csproj",
@@ -36,7 +37,7 @@
3637
"src\\Sentry.NLog\\Sentry.NLog.csproj",
3738
"src\\Sentry.Serilog\\Sentry.Serilog.csproj",
3839
"src\\Sentry\\Sentry.csproj",
39-
"test\\Sentry.Android.Tests\\Sentry.Android.Tests.csproj",
40+
"test\\Sentry.Android.AssemblyReader.Tests\\Sentry.Android.AssemblyReader.Tests.csproj",
4041
"test\\Sentry.AspNet.Tests\\Sentry.AspNet.Tests.csproj",
4142
"test\\Sentry.AspNetCore.Grpc.Tests\\Sentry.AspNetCore.Grpc.Tests.csproj",
4243
"test\\Sentry.AspNetCore.Tests\\Sentry.AspNetCore.Tests.csproj",

‎Sentry-CI-CodeQL.slnf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"solution": {
33
"path": "Sentry.sln",
44
"projects": [
5+
"src\\Sentry.Android.AssemblyReader\\Sentry.Android.AssemblyReader.csproj",
56
"src\\Sentry.AspNetCore.Grpc\\Sentry.AspNetCore.Grpc.csproj",
67
"src\\Sentry.AspNetCore\\Sentry.AspNetCore.csproj",
78
"src\\Sentry.AspNet\\Sentry.AspNet.csproj",

‎Sentry-CI-Pack.slnf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"solution": {
33
"path": "Sentry.sln",
44
"projects": [
5+
"src\\Sentry.Android.AssemblyReader\\Sentry.Android.AssemblyReader.csproj",
56
"src\\Sentry.AspNetCore.Grpc\\Sentry.AspNetCore.Grpc.csproj",
67
"src\\Sentry.AspNetCore\\Sentry.AspNetCore.csproj",
78
"src\\Sentry.AspNet\\Sentry.AspNet.csproj",

‎Sentry-CI-Test.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"solution": {
33
"path": "Sentry.sln",
44
"projects": [
5-
"test\\Sentry.Android.Tests\\Sentry.Android.Tests.csproj",
5+
"test\\Sentry.Android.AssemblyReader.Tests\\Sentry.Android.AssemblyReader.Tests.csproj",
66
"test\\Sentry.AspNet.Tests\\Sentry.AspNet.Tests.csproj",
77
"test\\Sentry.AspNetCore.Grpc.Tests\\Sentry.AspNetCore.Grpc.Tests.csproj",
88
"test\\Sentry.AspNetCore.Tests\\Sentry.AspNetCore.Tests.csproj",

‎Sentry.sln‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Bindings.Android", "
166166
EndProject
167167
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Bindings.Cocoa", "src\Sentry.Bindings.Cocoa\Sentry.Bindings.Cocoa.csproj", "{F533FD6D-1E10-4F06-BE3A-3B3C713A75A6}"
168168
EndProject
169-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Android.Tests", "test\Sentry.Android.Tests\Sentry.Android.Tests.csproj", "{5E12E053-22AF-4184-8581-3FCFD225617D}"
169+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Android.AssemblyReader.Tests", "test\Sentry.Android.AssemblyReader.Tests\Sentry.Android.AssemblyReader.Tests.csproj", "{5E12E053-22AF-4184-8581-3FCFD225617D}"
170170
EndProject
171171
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.AspNetCore.TestUtils", "test\Sentry.AspNetCore.TestUtils\Sentry.AspNetCore.TestUtils.csproj", "{C96CB65D-3D2D-404E-85C0-69A3FC03B48F}"
172172
EndProject
173+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Android.AssemblyReader", "src\Sentry.Android.AssemblyReader\Sentry.Android.AssemblyReader.csproj", "{ED5E4F7E-8267-4F3C-BD2A-779AC9BF3D7C}"
174+
EndProject
173175
Global
174176
GlobalSection(SolutionConfigurationPlatforms) = preSolution
175177
Debug|Any CPU = Debug|Any CPU
@@ -409,6 +411,10 @@ Global
409411
{C96CB65D-3D2D-404E-85C0-69A3FC03B48F}.Debug|Any CPU.Build.0 = Debug|Any CPU
410412
{C96CB65D-3D2D-404E-85C0-69A3FC03B48F}.Release|Any CPU.ActiveCfg = Release|Any CPU
411413
{C96CB65D-3D2D-404E-85C0-69A3FC03B48F}.Release|Any CPU.Build.0 = Release|Any CPU
414+
{ED5E4F7E-8267-4F3C-BD2A-779AC9BF3D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
415+
{ED5E4F7E-8267-4F3C-BD2A-779AC9BF3D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
416+
{ED5E4F7E-8267-4F3C-BD2A-779AC9BF3D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
417+
{ED5E4F7E-8267-4F3C-BD2A-779AC9BF3D7C}.Release|Any CPU.Build.0 = Release|Any CPU
412418
EndGlobalSection
413419
GlobalSection(SolutionProperties) = preSolution
414420
HideSolutionNode = FALSE
@@ -474,6 +480,7 @@ Global
474480
{F533FD6D-1E10-4F06-BE3A-3B3C713A75A6} = {AF6AF4C7-8AA2-4D59-8064-2D79560904EB}
475481
{5E12E053-22AF-4184-8581-3FCFD225617D} = {83263231-1A2A-4733-B759-EEFF14E8C5D5}
476482
{C96CB65D-3D2D-404E-85C0-69A3FC03B48F} = {83263231-1A2A-4733-B759-EEFF14E8C5D5}
483+
{ED5E4F7E-8267-4F3C-BD2A-779AC9BF3D7C} = {AF6AF4C7-8AA2-4D59-8064-2D79560904EB}
477484
EndGlobalSection
478485
GlobalSection(ExtensibilityGlobals) = postSolution
479486
SolutionGuid = {0C652B1A-DF72-4EE5-A98B-194FE2C054F6}

0 commit comments

Comments
 (0)