Use android 6.0.0 (#1697)

getsentry · Jun 7, 2022 · cf8b57b · cf8b57b
1 parent 38b5c64
commit cf8b57b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,8 +14,14 @@
 
 - Move tunnel functionality into Sentry.AspNetCore ([#1645](https://github.com/getsentry/sentry-dotnet/pull/1645))
 - Make `HttpContext` available for sampling decisions ([#1682](https://github.com/getsentry/sentry-dotnet/pull/1682))
-- Initial support for .NET MAUI ([#1663](https://github.com/getsentry/sentry-dotnet/pull/1663)) ([#1670](https://github.com/getsentry/sentry-dotnet/pull/1670))
-- Initial support for `net6.0-android` apps ([#1288](https://github.com/getsentry/sentry-dotnet/pull/1288)) ([#1669](https://github.com/getsentry/sentry-dotnet/pull/1669)) ([#1686](https://github.com/getsentry/sentry-dotnet/pull/1686))
+- Added a new `Sentry.Maui` integration library for the [.NET MAUI](https://dotnet.microsoft.com/apps/maui) platform:
+  - Initial MAUI support ([#1663](https://github.com/getsentry/sentry-dotnet/pull/1663))
+  - Continue with adding MAUI support ([#1670](https://github.com/getsentry/sentry-dotnet/pull/1670))
+- Added a new `net6.0-android` target for the `Sentry` core library, which bundles the [Sentry Android SDK](https://docs.sentry.io/platforms/android/):
+  - Initial .NET 6 Android support ([#1288](https://github.com/getsentry/sentry-dotnet/pull/1288))
+  - Update Android Support ([#1669](https://github.com/getsentry/sentry-dotnet/pull/1669))
+  - Update Sentry-Android to 6.0.0-rc.1 ([#1686](https://github.com/getsentry/sentry-dotnet/pull/1686))
+  - Update Sentry-Android to 6.0.0 ([#1697](https://github.com/getsentry/sentry-dotnet/pull/1697))
 
 ### Fixes
 

diff --git a/libs/Android/sentry-6.0.0-rc.1.jar → libs/Android/sentry-6.0.0.jar b/libs/Android/sentry-6.0.0-rc.1.jar → libs/Android/sentry-6.0.0.jar
diff --git a/libs/Android/sentry-android-core-6.0.0-rc.1.aar b/libs/Android/sentry-android-core-6.0.0-rc.1.aar
diff --git a/libs/Android/sentry-android-core-6.0.0.aar b/libs/Android/sentry-android-core-6.0.0.aar
diff --git a/...Android/sentry-android-ndk-6.0.0-rc.1.aar → libs/Android/sentry-android-ndk-6.0.0.aar b/...Android/sentry-android-ndk-6.0.0-rc.1.aar → libs/Android/sentry-android-ndk-6.0.0.aar
diff --git a/src/Sentry/Android/Sentry.Android.props b/src/Sentry/Android/Sentry.Android.props
@@ -3,7 +3,7 @@
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <!-- 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.0.0-rc.1</SentryAndroidSdkVersion>
+    <SentryAndroidSdkVersion>6.0.0</SentryAndroidSdkVersion>
     <AndroidLibsDirectory>$(MSBuildProjectDirectory)/../../libs/Android/</AndroidLibsDirectory>
   </PropertyGroup>
   <ItemGroup>