Merge branch 'version-5.0.0' into net9-ga

Author: jamescrosswell

.github/actions/environment/action.yml

@@ -22,14 +22,35 @@ runs:
       with:
         log-accepted-android-sdk-licenses: false
 
+    # https://github.com/actions/runner-images/issues/10814
+    - name: Workaround build-tools issue
+      if: runner.os == 'macOS'
+      shell: bash
+      run: |
+        curl https://dl.google.com/android/repository/build-tools_r35_macosx.zip > $ANDROID_HOME/build-tools_r35_macosx.zip
+        cd $ANDROID_HOME
+        mkdir -p build-tools
+        unzip build-tools_r35_macosx.zip
+        mv android-15 build-tools/35.0.0
+        cd -
+
     - name: Set Java Version
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '11'
 
-    # .NET 6 and .NET 8 are not built-in with macos-13
+    - name: Install Mono
+      if: runner.os == 'macOS'
+      shell: bash
+      # Attempt to install Mono, allowing it to fail silently
+      # Then ensure mono is correctly linked, overwriting any conflicting symlinks
+      run: |
+        brew install mono || true
+        brew link --overwrite mono
+
     - name: Install .NET SDK
+      if: runner.os != 'Windows'
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |

.github/actions/freediskspace/action.yml

@@ -33,16 +33,3 @@ runs:
         sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed to complete successfully. Proceeding..."
         sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
         df -h /dev/root
-
-    # We only use Xcode 16
-    - name: Remove unused applications
-      if: runner.os == 'macOS'
-      shell: bash
-      run: |
-        df -hI /dev/disk3s1s1
-        sudo rm -rf /Applications/Xcode_14.3.1.app
-        sudo rm -rf /Applications/Xcode_15.0.1.app
-        sudo rm -rf /Applications/Xcode_15.1.app
-        sudo rm -rf /Applications/Xcode_15.2.app
-        sudo rm -rf /Applications/Xcode_15.3.app
-        df -hI /dev/disk3s1s1

.github/workflows/build.yml

@@ -9,17 +9,15 @@ on:
     paths-ignore:
       - "**.md"
 
-env:
-  XCODE_VERSION: 16
-
 jobs:
   build-sentry-native:
     name: sentry-native (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        # Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
+        os: [ubuntu-latest, windows-latest, macos-15]
 
     steps:
       - name: Checkout
@@ -55,7 +53,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        # Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
+        os: [ubuntu-latest, windows-latest, macos-15]
 
     steps:
       - name: Cancel Previous Runs
@@ -68,18 +67,12 @@ jobs:
           submodules: recursive
           fetch-depth: 2 # default is 1 and codecov needs > 1
 
-      - name: Setup Xcode
-        if: matrix.os == 'macos-latest'
-        run: |
-          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
-          xcodebuild -version
-
       - name: Remove unused applications
         uses: ./.github/actions/freediskspace
 
       # We use macOS for the final publishing build so we get all the iOS/macCatalyst targets in the packages
       - name: Set Environment Variables
-        if: startsWith(matrix.os, 'macos')
+        if: runner.os == 'macOS'
         run: echo "CI_PUBLISHING_BUILD=true" >> $GITHUB_ENV
 
       - name: Download sentry-native (Linux)
@@ -116,6 +109,12 @@ jobs:
       - name: Restore .NET Dependencies
         run: dotnet restore Sentry-CI-Build-${{ runner.os }}.slnf --nologo
 
+      - name: Install Android SDKs
+        if: runner.os == 'macOS'
+        run: |
+          dotnet build src/Sentry/Sentry.csproj -t:InstallAndroidDependencies -f:net7.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"
+          dotnet build src/Sentry/Sentry.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"
+
       - name: Build
         run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo -v:minimal -flp:logfile=build.log -p:CopyLocalLockFileAssemblies=true
 
@@ -156,7 +155,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        # Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
+        os: [ubuntu-latest, windows-latest, macos-15]
 
     steps:
       - uses: actions/checkout@v4
@@ -166,6 +166,8 @@ jobs:
           sparse-checkout: |
             Directory.Build.props
             integration-test
+            .github
+
       - name: Fetch Nuget Packages
         uses: actions/download-artifact@v4
         with:
@@ -178,30 +180,8 @@ jobs:
           sudo apt update
           sudo apt install libcurl4-openssl-dev
 
-      # Possibly instead of installing net9.0 here we could pin the workload version when installing workloads
-      - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: |
-            8.0.x
-            9.0.100
-
-      - name: Setup Xcode
-        if: matrix.os == 'macos-latest'
-        run: |
-          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
-          xcodebuild -version
-
-      # Needed for Android SDK setup step
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@00854ea68c109d98c75d956347303bf7c45b0277 # v3.2.1
-
-      - name: Install android Workloads
-        run: dotnet workload install maui-android
+      - name: Setup Environment
+        uses: ./.github/actions/environment
 
       - name: Test
         uses: getsentry/github-workflows/sentry-cli/integration-test/@v2

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
         uses: ./.github/actions/environment
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # pin@v2
+        uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # pin@v2
         with:
           languages: csharp
 
@@ -49,6 +49,6 @@ jobs:
         run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # pin@v2
+        uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # pin@v2
         with:
           category: '/language:csharp'

.github/workflows/format-code.yml

@@ -10,9 +10,9 @@ on:
 jobs:
   format-code:
     name: Format Code
-    # Running on 'macos' because Linux is missing the `ios` workload
-    # See: https://github.com/dotnet/runtime/issues/85505
-    runs-on: macos-latest
+    # Run on 'macos' because Linux is missing the `ios` workload: https://github.com/dotnet/runtime/issues/85505
+    # Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/vulnerabilities.yml

@@ -10,7 +10,8 @@ on:
 jobs:
   list-vulnerable-packages:
     name: List vulnerable packages
-    runs-on: macos-latest
+    # Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
+    runs-on: macos-15
 
     steps:
       - name: Checkout

CHANGELOG.md

@@ -19,11 +19,15 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fixed ArgumentNullException in FormRequestPayloadExtractor when handling invalid form data on ASP.NET ([#3734](https://github.com/getsentry/sentry-dotnet/pull/3734))
+
 ### Dependencies
 
 - Bump Cocoa SDK from v8.36.0 to v8.39.0 ([#3727](https://github.com/getsentry/sentry-dotnet/pull/3727))
-    - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8390)
-    - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.36.0...8.39.0)
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8390)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.36.0...8.39.0)
 - Bump Native SDK from v0.7.11 to v0.7.12 ([#3731](https://github.com/getsentry/sentry-dotnet/pull/3731))
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0712)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.7.11...0.7.12)

integration-test/cli.Tests.ps1

@@ -141,6 +141,15 @@ Describe 'MAUI' -ForEach @(
         }
 
         AddPackageReference $name 'Sentry.Maui'
+
+        if (Test-Path env:CI)
+        {
+            dotnet build $name/$name.csproj -t:InstallAndroidDependencies -f:$framework-android -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/" | ForEach-Object { Write-Host $_ }
+            if ($LASTEXITCODE -ne 0)
+            {
+                throw "Failed to install android dependencies."
+            }
+        }
     }
 
     It "uploads symbols and sources for an Android build" {

src/Sentry.AspNet/Internal/SystemWebHttpRequest.cs

@@ -1,3 +1,4 @@
+using System.Collections.Specialized;
 using Sentry.Extensibility;
 
 namespace Sentry.AspNet.Internal;
@@ -12,8 +13,19 @@ internal class SystemWebHttpRequest : IHttpRequest
 
     public Stream? Body => _request?.InputStream;
 
-    public IEnumerable<KeyValuePair<string, IEnumerable<string>>>? Form
-        => _request.Form.AllKeys.Select(kv => new KeyValuePair<string, IEnumerable<string>>(kv, _request.Form.GetValues(kv)));
+    public IEnumerable<KeyValuePair<string, IEnumerable<string>>>? Form => GetFormData(_request.Form);
 
     public SystemWebHttpRequest(HttpRequest request) => _request = request;
+
+    internal static IEnumerable<KeyValuePair<string, IEnumerable<string>>> GetFormData(NameValueCollection formdata)
+    {
+        return StripNulls(formdata.AllKeys).Select(key => new KeyValuePair<string, IEnumerable<string>>(
+            key, StripNulls(formdata.GetValues(key)
+            )));
+
+        // Poorly constructed form submissions can result in null keys/values on .NET Framework.
+        // See: https://github.com/getsentry/sentry-dotnet/issues/3701
+        IEnumerable<string> StripNulls(IEnumerable<string>? values) => values?.Where(x => x is not null) ?? [];
+    }
+
 }

src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj

@@ -91,6 +91,7 @@
   <!-- Generate bindings -->
   <Target Name="_GenerateSentryCocoaBindings" AfterTargets="SetupCocoaSDK"
           Condition="$([MSBuild]::IsOSPlatform('OSX')) and Exists('$(SentryCocoaFrameworkHeaders)')"
+          Inputs="../../modules/sentry-cocoa.properties"
           Outputs="ApiDefinitions.cs;StructsAndEnums.cs">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerGenerateSentryCocoaBindings" Properties="TargetFramework=once" />
   </Target>