getsentry · lucas-zimerman · Dec 18, 2023 · Dec 11, 2023 · Dec 11, 2023 · Dec 11, 2023
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -27,6 +27,12 @@ jobs:
         run:
             pwsh ./scripts/install-win-sdk.ps1 16299
         if: startsWith(matrix.os, 'windows')
+      - name: Setup Java SDK
+        if: startsWith(matrix.os, 'windows')
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'microsoft'
+          java-version: '11'
       - run: msbuild Sentry.Xamarin.sln -p:Configuration=Release -t:restore
       - name: Build Solution with MSBuild
         run: msbuild Sentry.Xamarin.sln -p:Configuration=Release

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,20 @@
 
 - Added `Xamarin.Mac` support ([#138](https://github.com/getsentry/sentry-xamarin/pull/138))
 
+### Fixes
+
+  - Some iOS Native crashes are now properly captured. ([#145](https://github.com/getsentry/sentry-xamarin/pull/145))
+
+### Dependencies
+
+  - Update Sentry.NET SDK to 4.0.0-beta.4 ([#145](https://github.com/getsentry/sentry-xamarin/pull/145))
+    - [changelog](https://github.com/getsentry/sentry-dotnet/blob/4.0.0-beta.4/CHANGELOG.md)
+    - [diff](https://github.com/getsentry/sentry-dotnet/compare/3.33.1...4.0.0-beta.41)
+
+### API breaking Changes
+
+  For a complete list of break changes, please visit the Sentry .NET [changelog](https://raw.githubusercontent.com/getsentry/sentry-dotnet/4.0.0-beta.4/CHANGELOG.md).
+
 ## 1.5.2
 
 ### Dependencies

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>1.5.2</Version>
+    <Version>1.5.2-pre</Version>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Deterministic>true</Deterministic>

diff --git a/Samples/Forms/com.sentry.ovenlibrary/com.sentry.ovenlibrary.csproj b/Samples/Forms/com.sentry.ovenlibrary/com.sentry.ovenlibrary.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{41A5D0E6-4DEA-44FF-A357-B76090DD733E}</ProjectGuid>
+    <ProjectGuid>{4DA5AECE-3A16-45AE-9C6D-45B262236175}</ProjectGuid>
     <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid>
     <OutputType>Library</OutputType>
@@ -14,7 +14,6 @@
     <AssemblyName>com.sentry.ovenlibrary</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <Deterministic>True</Deterministic>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>

diff --git a/Samples/Sample.Xamarin.Core/Sample.Xamarin.Core.csproj b/Samples/Sample.Xamarin.Core/Sample.Xamarin.Core.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="Directory.Build.props" />
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <!-- Fixes error CSC: error CS0006 Metadata file could not be found for the VS4MAC when doing a release build. -->
+    <ProduceReferenceAssemblyInOutDir>true</ProduceReferenceAssemblyInOutDir>
   </PropertyGroup>
 
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>

diff --git a/Samples/Sample.Xamarin.Droid/Sample.Xamarin.Droid.csproj b/Samples/Sample.Xamarin.Droid/Sample.Xamarin.Droid.csproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="Directory.Build.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DF913F02-DF84-4B94-B67D-E8103999A914}</ProjectGuid>
+    <ProjectGuid>{2C7E3F2E-4A4F-4E9E-9619-8464BCF326DB}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
     <OutputType>Library</OutputType>
@@ -33,6 +32,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,18 +52,18 @@
     <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>false</BundleAssemblies>
-	<!-- Configure Sentry org and project -->
-	<!-- for more information: https://docs.sentry.io/platforms/dotnet/guides/xamarin/configuration/msbuild-->
-	<SentryOrg>sentry-sdks</SentryOrg>
-	<SentryProject>sentry-xamarin</SentryProject>
-	<!--
+    <!-- Configure Sentry org and project -->
+    <!-- for more information: https://docs.sentry.io/platforms/dotnet/guides/xamarin/configuration/msbuild-->
+    <SentryOrg>sentry-sdks</SentryOrg>
+    <SentryProject>sentry-xamarin</SentryProject>
+    <!--
         Each of the below features are opt-in.
         Enable the features you wish to use.
     -->
-	<!-- Sends symbols to Sentry, enabling symbolication of stack traces. -->
-	<SentryUploadSymbols>true</SentryUploadSymbols>
-	<!-- Sends sources to Sentry, enabling display of source context. -->
-	<SentryUploadSources>true</SentryUploadSources>
+    <!-- Sends symbols to Sentry, enabling symbolication of stack traces. -->
+    <SentryUploadSymbols>true</SentryUploadSymbols>
+    <!-- Sends sources to Sentry, enabling display of source context. -->
+    <SentryUploadSources>true</SentryUploadSources>
     <SentryCLIUploadOptions>--wait</SentryCLIUploadOptions>
   </PropertyGroup>
   <ItemGroup>
@@ -122,7 +125,7 @@
       <Name>Sentry.Xamarin</Name>
     </ProjectReference>
     <ProjectReference Include="..\Forms\com.sentry.ovenlibrary\com.sentry.ovenlibrary.csproj">
-      <Project>{41a5d0e6-4dea-44ff-a357-b76090dd733e}</Project>
+      <Project>{4DA5AECE-3A16-45AE-9C6D-45B262236175}</Project>
       <Name>com.sentry.ovenlibrary</Name>
     </ProjectReference>
     <ProjectReference Include="..\Sample.Xamarin.Core\Sample.Xamarin.Core.csproj">

diff --git a/Samples/Sample.Xamarin.Mac/Directory.Build.props b/Samples/Sample.Xamarin.Mac/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <!--Automatic upward search ends when first file found. From here we need to manually import parent props/targets
+        https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build -->
+  <Import Project="..\..\Directory.Build.props" />
+
+</Project>
diff --git a/Samples/Sample.Xamarin.Mac/Sample.Xamarin.Mac.csproj b/Samples/Sample.Xamarin.Mac/Sample.Xamarin.Mac.csproj
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras/2.0.41" DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="MSBuild.Sdk.Extras/2.1.2" ToolsVersion="4.0" DefaultTargets="Build">
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
         <ProjectGuid>{1204E055-1BA8-4803-B98C-36C2CE608A54}</ProjectGuid>
-        <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+        <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{9A19103F-16F7-4668-BE54-9A1E7A4F7556}</ProjectTypeGuids>
         <OutputType>Exe</OutputType>
         <RootNamespace>Sample.Xamarin.Mac</RootNamespace>
         <AssemblyName>Sample.Xamarin.Mac</AssemblyName>
         <TargetFramework>xamarinmac20</TargetFramework>
         <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+        <BuildWithMSBuildOnMono>false</BuildWithMSBuildOnMono>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
         <OutputPath>bin\Debug</OutputPath>
-        <DefineConstants>DEBUG;</DefineConstants>
+        <DefineConstants>DEBUG;XAMARIN_MAC;XAMARINMAC20;</DefineConstants>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
-        <EnableCodeSigning>false</EnableCodeSigning>
+        <EnableCodeSigning>False</EnableCodeSigning>
         <CodesigningKey>Mac Developer</CodesigningKey>
         <CreatePackage>false</CreatePackage>
         <EnablePackageSigning>false</EnablePackageSigning>
@@ -31,19 +32,21 @@
         <XamMacArch>x86_64</XamMacArch>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugSymbols>true</DebugSymbols>
         <DebugType>pdbonly</DebugType>
         <Optimize>true</Optimize>
         <OutputPath>bin\Release</OutputPath>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
-        <EnableCodeSigning>false</EnableCodeSigning>
+        <EnableCodeSigning>False</EnableCodeSigning>
         <CreatePackage>true</CreatePackage>
         <EnablePackageSigning>false</EnablePackageSigning>
         <IncludeMonoRuntime>true</IncludeMonoRuntime>
         <UseSGen>true</UseSGen>
         <UseRefCounting>true</UseRefCounting>
         <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <LinkMode>SdkOnly</LinkMode>
+        <HttpClientHandler>HttpClientHandler</HttpClientHandler>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System" />
@@ -72,9 +75,8 @@
         <InterfaceDefinition Include="Main.storyboard" />
     </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\..\Src\Sentry.Xamarin\Sentry.Xamarin.csproj">
-        <Project>{c911dd4b-bcdc-4d76-83d1-dc40379df816}</Project>
-        <Name>Sentry.Xamarin</Name>
+		<Reference Include="netstandard" />
+		<ProjectReference Include="..\..\Src\Sentry.Xamarin\Sentry.Xamarin.csproj">
       </ProjectReference>
     </ItemGroup>
 </Project>
diff --git a/Samples/Sample.Xamarin.UWP/App.xaml.cs b/Samples/Sample.Xamarin.UWP/App.xaml.cs
@@ -20,6 +20,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                 options.Debug = true;
                 options.DiagnosticLogger = new TraceDiagnosticLogger(SentryLevel.Debug);
                 options.AttachScreenshots = true;
+                options.SendDefaultPii = true;
             });
             Frame rootFrame = Window.Current.Content as Frame;
 

diff --git a/Samples/Sample.Xamarin.UWP/Properties/AssemblyInfo.cs b/Samples/Sample.Xamarin.UWP/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -13,6 +14,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: CLSCompliant(false)]
 
 // Version information for an assembly consists of the following four values:
 //

diff --git a/Samples/Sample.Xamarin.UWP/Sample.Xamarin.UWP.csproj b/Samples/Sample.Xamarin.UWP/Sample.Xamarin.UWP.csproj
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="Directory.Build.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{73EA9FB3-ECD7-4FA6-90C4-7A2C3A3AFC17}</ProjectGuid>
+    <ProjectGuid>{5E94DA86-10DA-476B-9BFF-310C23360617}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample.Xamarin.uwp</RootNamespace>

diff --git a/Samples/Sample.Xamarin.iOS/AppDelegate.cs b/Samples/Sample.Xamarin.iOS/AppDelegate.cs
@@ -15,6 +15,7 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
                 options.Dsn = "https://5a193123a9b841bc8d8e42531e7242a1@o447951.ingest.sentry.io/5560112";
                 options.AddXamarinFormsIntegration();
                 options.Debug = true;
+                options.AttachScreenshots = true;
             });
             Rg.Plugins.Popup.Popup.Init();
             global::Xamarin.Forms.Forms.SetFlags("Shapes_Experimental");

diff --git a/Samples/Sample.Xamarin.iOS/Sample.Xamarin.iOS.csproj b/Samples/Sample.Xamarin.iOS/Sample.Xamarin.iOS.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="Directory.Build.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -50,6 +49,8 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
+	<!-- Configure Sentry org and project -->
+	<!-- for more information: https://docs.sentry.io/platforms/dotnet/guides/xamarin/configuration/msbuild-->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -78,6 +79,7 @@
 	<!-- Sends symbols to Sentry, enabling symbolication of stack traces. -->
 	<SentryUploadSymbols>true</SentryUploadSymbols>
 	<!-- Sends sources to Sentry, enabling display of source context. -->
+  <SentryUploadSources>true</SentryUploadSources>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\iPhone\Release</OutputPath>
@@ -86,6 +88,8 @@
     <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+	<!-- Configure Sentry org and project -->
+	<!-- for more information: https://docs.sentry.io/platforms/dotnet/guides/xamarin/configuration/msbuild-->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
     <AppExtensionDebugBundleId />