Merge branch 'main' into deps/modules/sentry-cocoa/8.8.0

CHANGELOG.md

@@ -11,9 +11,12 @@
 - Bump Cocoa SDK from v8.7.3 to v8.8.0 ([#2427](https://github.com/getsentry/sentry-dotnet/pull/2427), [#2430](https://github.com/getsentry/sentry-dotnet/pull/2430))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#880)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.7.3...8.8.0)
-- Bump CLI from v2.18.1 to v2.19.0 ([#2428](https://github.com/getsentry/sentry-dotnet/pull/2428))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2190)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.18.1...2.19.0)
+- Bump CLI from v2.18.1 to v2.19.1 ([#2428](https://github.com/getsentry/sentry-dotnet/pull/2428), [#2431](https://github.com/getsentry/sentry-dotnet/pull/2431))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2191)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.18.1...2.19.1)
+- Bump Java SDK from v6.22.0 to v6.23.0 ([#2429](https://github.com/getsentry/sentry-dotnet/pull/2429))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6230)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.22.0...6.23.0)
 
 ## 3.33.1
 

Directory.Build.props

@@ -100,7 +100,7 @@
 
   <!-- Set the version and local path for Sentry CLI (downloaded in the restore phase of Sentry.csproj) -->
   <PropertyGroup Condition="'$(SolutionName)' != 'Sentry.Unity'">
-    <SentryCLIVersion>2.19.0</SentryCLIVersion>
+    <SentryCLIVersion>2.19.1</SentryCLIVersion>
     <SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
   </PropertyGroup>
 

src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net6.0-android</TargetFramework>
     <!-- BG8605 and BG8606 happen because there's a missing androidx.lifecycle dependency, but we don't need it here.  (The native Android Sentry SDK will use it if it exists.) -->
     <NoWarn>$(NoWarn);BG8605;BG8606</NoWarn>
-    <SentryAndroidSdkVersion>6.22.0</SentryAndroidSdkVersion>
+    <SentryAndroidSdkVersion>6.23.0</SentryAndroidSdkVersion>
     <SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
     <Description>.NET Bindings for the Sentry Android SDK</Description>
   </PropertyGroup>

src/Sentry/Sentry.csproj

@@ -95,25 +95,25 @@
     <ItemGroup>
       <SentryCLIDownload
         Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'Arm64')"
-        Include="sentry-cli-Darwin-arm64" FileHash="8dabeae65f888a1c862162d9e5b572853105294e39452ed93e095b9a0cd60b96" />
+        Include="sentry-cli-Darwin-arm64" FileHash="46fafa37b53610196bb93d46a53ee07d74f7f3348259a6bd6dabb86c57e8429f" />
       <SentryCLIDownload
         Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'X64')"
-        Include="sentry-cli-Darwin-x86_64" FileHash="fb07594121dbe019e670838b4b8a937d32c0320631ffa5a6eb1a063ee10b9c97" />
+        Include="sentry-cli-Darwin-x86_64" FileHash="947701ac572a0c566bd00d3c655f11b3d8a139b281e40a5d344e15fad4dec018" />
       <SentryCLIDownload
         Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'Arm64')"
-        Include="sentry-cli-Linux-aarch64" FileHash="b958399bafe6e5f74a4064a1d11d9225bfcc228643422fb5a2e1183bf36baeb7" />
+        Include="sentry-cli-Linux-aarch64" FileHash="3b3188f52ac9f132db60ec59d896f475d9914d0af7da0b8236af12aac4097007" />
       <SentryCLIDownload
         Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X86')"
-        Include="sentry-cli-Linux-i686" FileHash="67eb8b2cbef84cc307371eaeb95e144f6ea106eda3e1e9016092b873935d8932" />
+        Include="sentry-cli-Linux-i686" FileHash="0e120b96dc565eb6d770809d7a21be4f5bce30ef432e482403e50aa24ffa7327" />
       <SentryCLIDownload
         Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X64')"
-        Include="sentry-cli-Linux-x86_64" FileHash="83a9e51d8c164edc1e1180a5c7c10a3d653e02beb2db417927be73b4e43afa56" />
+        Include="sentry-cli-Linux-x86_64" FileHash="88277b96230fd6d0257aaf373d4108abee6882e67fca012721a0cd5de7c63b5c" />
       <SentryCLIDownload
         Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) == 'X86')"
-        Include="sentry-cli-Windows-i686.exe" FileHash="958923439229452a96bfaa7248e4f7bf1f53ac7fa9325796ee846aab04936217" />
+        Include="sentry-cli-Windows-i686.exe" FileHash="4c433677c22ce337c768a82a924b95986f1508dae64aab8d60053faad114291d" />
       <SentryCLIDownload
         Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) != 'X86')"
-        Include="sentry-cli-Windows-x86_64.exe" FileHash="d21af130ced7f1fd135c22eb5b92d4e9f74d0a52fac984019d042fd625d7c103" />
+        Include="sentry-cli-Windows-x86_64.exe" FileHash="87d1d8d9b0c99b9cf35a25b1e6fa21ba11af6604fea0b825fa2b175f9a9b36bc" />
     </ItemGroup>
 
     <!-- Download the files -->