From db644f080fdfa9e29efb97a08d4d7b79924299e3 Mon Sep 17 00:00:00 2001 From: Matt Johnson-Pint Date: Wed, 31 May 2023 18:14:13 -0700 Subject: [PATCH 1/6] Specify symbol upload types --- src/Sentry/buildTransitive/Sentry.targets | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Sentry/buildTransitive/Sentry.targets b/src/Sentry/buildTransitive/Sentry.targets index 1f7c61f6d4..4b24d90adf 100644 --- a/src/Sentry/buildTransitive/Sentry.targets +++ b/src/Sentry/buildTransitive/Sentry.targets @@ -125,7 +125,14 @@ - + + + + + + + + From d5c48865f07319f74da6f8dd0894afaad7f8f0cf Mon Sep 17 00:00:00 2001 From: Matt Johnson-Pint Date: Wed, 31 May 2023 18:34:59 -0700 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecbdf91b2b..8a181950ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - SentryHttpMessageHandler added when AddHttpClient is before UseSentry ([#2390](https://github.com/getsentry/sentry-dotnet/pull/2390)) - Set the native sdk name for Android ([#2389](https://github.com/getsentry/sentry-dotnet/pull/2389)) +- Reduce debug files uploaded ([#2404](https://github.com/getsentry/sentry-dotnet/pull/2404)) ### Dependencies From cd6a27ce231d3c4c9f9704755d370e66284afe29 Mon Sep 17 00:00:00 2001 From: Matt Johnson-Pint Date: Wed, 31 May 2023 18:38:01 -0700 Subject: [PATCH 3/6] Update tests --- test/sentry-cli-integration.Tests.ps1 | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/test/sentry-cli-integration.Tests.ps1 b/test/sentry-cli-integration.Tests.ps1 index 2d6a0ae860..ab8abe54ea 100644 --- a/test/sentry-cli-integration.Tests.ps1 +++ b/test/sentry-cli-integration.Tests.ps1 @@ -53,25 +53,21 @@ BeforeAll { Describe 'CLI-integration' { It "uploads symbols and sources for a console app build" { - $exe = [RuntimeInformation]::IsOSPlatform([OSPlatform]::Windows) ? '.exe' : '' $result = DotnetBuild 'Sentry.Samples.Console.Basic' $True $True $result.ScriptOutput | Should -Contain 'Build succeeded.' $result.HasErrors() | Should -BeFalse $result.UploadedDebugFiles() | Sort-Object -Unique | Should -Be @( 'Sentry.pdb', - "Sentry.Samples.Console.Basic$exe", 'Sentry.Samples.Console.Basic.pdb', 'Sentry.Samples.Console.Basic.src.zip') } It "uploads symbols for a console app build" { - $exe = [RuntimeInformation]::IsOSPlatform([OSPlatform]::Windows) ? '.exe' : '' $result = DotnetBuild 'Sentry.Samples.Console.Basic' $True $False $result.ScriptOutput | Should -Contain 'Build succeeded.' $result.HasErrors() | Should -BeFalse $result.UploadedDebugFiles() | Sort-Object -Unique | Should -Be @( 'Sentry.pdb', - "Sentry.Samples.Console.Basic$exe", 'Sentry.Samples.Console.Basic.pdb') } @@ -115,22 +111,10 @@ Describe 'CLI-integration' { $result.ScriptOutput | Should -Contain 'Build succeeded.' $result.HasErrors() | Should -BeFalse $result.UploadedDebugFiles() | Sort-Object -Unique | Should -Be @( - 'libmono-component-debugger.dylib', - 'libmono-component-diagnostics_tracing.dylib', - 'libmono-component-hot_reload.dylib', - 'libmonosgen-2.0.dylib', - 'libSystem.IO.Compression.Native.dylib', - 'libSystem.Native.dylib', - 'libSystem.Net.Security.Native.dylib', - 'libSystem.Security.Cryptography.Native.Apple.dylib', - 'libxamarin-dotnet-debug.dylib', - 'libxamarin-dotnet.dylib', - 'Sentry', 'Sentry.Bindings.Cocoa.pdb', 'Sentry.Extensions.Logging.pdb', 'Sentry.Maui.pdb', 'Sentry.pdb', - 'Sentry.Samples.Maui', 'Sentry.Samples.Maui.pdb', 'Sentry.Samples.Maui.src.zip' ) From 1e049ab9bc94a54a702d1e1c86bc8b124308707b Mon Sep 17 00:00:00 2001 From: Matt Johnson-Pint Date: Wed, 31 May 2023 22:26:25 -0700 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aba55798b..b0347a510f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,12 @@ - SentryHttpMessageHandler added when AddHttpClient is before UseSentry ([#2390](https://github.com/getsentry/sentry-dotnet/pull/2390)) - Set the native sdk name for Android ([#2389](https://github.com/getsentry/sentry-dotnet/pull/2389)) -- Reduce debug files uploaded ([#2404](https://github.com/getsentry/sentry-dotnet/pull/2404)) - Various .NET MAUI fixes / improvements ([#2403](https://github.com/getsentry/sentry-dotnet/pull/2403)) - The battery level was being reported incorrectly due to percentage multiplier. - The device architecture (x64, arm64, etc.) is now reported - On Windows, the OS type is now reported as "Windows" instead of "WinUI". Additionally, the OS display version (ex, "22H2") is now included. - `UIKit`, `ABI.Microsoft` and `WinRT` frames are now marked "system" instead of "in app". +- Reduce debug files uploaded ([#2404](https://github.com/getsentry/sentry-dotnet/pull/2404)) ### Dependencies From 963c649a7df7ad7e8c924d1837ea2620a5fa3f6b Mon Sep 17 00:00:00 2001 From: Matt Johnson-Pint Date: Wed, 31 May 2023 22:47:48 -0700 Subject: [PATCH 5/6] Update sentry-cli-integration.Tests.ps1 --- test/sentry-cli-integration.Tests.ps1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/sentry-cli-integration.Tests.ps1 b/test/sentry-cli-integration.Tests.ps1 index ab8abe54ea..c5694e0eb4 100644 --- a/test/sentry-cli-integration.Tests.ps1 +++ b/test/sentry-cli-integration.Tests.ps1 @@ -111,6 +111,17 @@ Describe 'CLI-integration' { $result.ScriptOutput | Should -Contain 'Build succeeded.' $result.HasErrors() | Should -BeFalse $result.UploadedDebugFiles() | Sort-Object -Unique | Should -Be @( + 'libmono-component-debugger.dylib', + 'libmono-component-diagnostics_tracing.dylib', + 'libmono-component-hot_reload.dylib', + 'libmonosgen-2.0.dylib', + 'libSystem.IO.Compression.Native.dylib', + 'libSystem.Native.dylib', + 'libSystem.Net.Security.Native.dylib', + 'libSystem.Security.Cryptography.Native.Apple.dylib', + 'libxamarin-dotnet-debug.dylib', + 'libxamarin-dotnet.dylib', + 'Sentry', 'Sentry.Bindings.Cocoa.pdb', 'Sentry.Extensions.Logging.pdb', 'Sentry.Maui.pdb', From cfca90b8c29920262f6528035505ec3e1b275d8c Mon Sep 17 00:00:00 2001 From: Matt Johnson-Pint Date: Wed, 31 May 2023 23:21:45 -0700 Subject: [PATCH 6/6] Update sentry-cli-integration.Tests.ps1 --- test/sentry-cli-integration.Tests.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/sentry-cli-integration.Tests.ps1 b/test/sentry-cli-integration.Tests.ps1 index c5694e0eb4..99f1840c0d 100644 --- a/test/sentry-cli-integration.Tests.ps1 +++ b/test/sentry-cli-integration.Tests.ps1 @@ -126,6 +126,7 @@ Describe 'CLI-integration' { 'Sentry.Extensions.Logging.pdb', 'Sentry.Maui.pdb', 'Sentry.pdb', + 'Sentry.Samples.Maui', 'Sentry.Samples.Maui.pdb', 'Sentry.Samples.Maui.src.zip' )