Merge branch 'main' into experiment/ci-arm64-linux

Author: jpnurmi

.generated.NoMobile.sln

@@ -1 +1 @@
-*       @bitsandfoxes @jamescrosswell
+*       @aritchie @jamescrosswell @Flash0ver

.github/CODEOWNERS

@@ -36,7 +36,6 @@ body:
         - .NET Framework
         - IL2CPP
         - Mono
-        - Xamarin
         - Other
     validations:
       required: true
@@ -45,8 +44,8 @@ body:
     id: dotnet_version
     attributes:
       label: .NET Version
-      description: .NET Version
-      placeholder: 6.0.0 ← should look like this
+      description: If using .NET Core, please copy the output of 'dotnet --version' here
+      placeholder: 9.0.200 ← should look like this
     validations:
       required: true
 
@@ -67,6 +66,27 @@ body:
     validations:
       required: true
 
+  - type: input
+    id: os_version
+    attributes:
+      label: OS Version
+      description: Operating System Version
+
+  - type: dropdown
+    id: ide
+    attributes:
+      label: Development Environment
+      description: What development environment are you using
+      options:
+        - Visual Studio v17.x
+        - Visual Studio Code (Windows)
+        - Visual Studio Code (MacOS)
+        - Rider 2024 (Windows)
+        - Rider 2024 (MacOS)
+        - Other
+    validations:
+      required: true
+
   - type: input
     id: sentry_sdk_version
     attributes:
@@ -84,6 +104,22 @@ body:
     validations:
       required: false
 
+  - type: textarea
+    id: workloadset
+    attributes:
+      label: Workload Versions
+      description: If using .NET Core, please copy/paste the output of 'dotnet workload list' here
+    validations:
+      required: true
+
+  - type: textarea
+    id: sentryuse
+    attributes:
+      label: UseSentry or SentrySdk.Init call
+      description: Please include the block of code used in UseSentry or SentrySdk.Init - please blank out your DSN
+    validations:
+      required: true
+
   - type: textarea
     id: repro
     attributes:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -11,38 +11,70 @@ runs:
         echo "DOTNET_CLI_TELEMETRY_OPTOUT=1" >> $GITHUB_ENV
         echo "DOTNET_NOLOGO=1" >> $GITHUB_ENV
 
-    # Needed for Android SDK setup step
-    - uses: actions/setup-java@v3
+    # Android SDK Build Tools are musl-incompatible
+    - name: Set Environment Variables for Alpine Linux
+      if: ${{ contains(matrix.container, 'alpine') }}
+      shell: bash
+      run: echo "NO_MOBILE=true" >> $GITHUB_ENV
+
+    # zstd is needed for cross OS actions/cache but missing from windows-11-arm
+    # https://github.com/actions/partner-runner-images/issues/99
+    - name: Install zstd on Windows ARM64
+      if: runner.os == 'Windows' && runner.arch == 'ARM64'
+      shell: pwsh
+      run: choco install zstandard
+
+    # See https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md#xcode
+    - name: Pin the Xcode Version
+      if: runner.os == 'macOS'
+      shell: bash
+      run: sudo xcode-select --switch /Applications/Xcode_16.2.app
+
+    # Java 17 is needed for Android SDK setup step
+    - name: Install Java 17
+      if: ${{ !matrix.container }}
+      uses: actions/setup-java@v4
       with:
-        distribution: 'temurin'
+        distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || 'temurin' }}
         java-version: '17'
 
     - name: Setup Android SDK
+      if: ${{ !matrix.container }}
       uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f # v3.2.0
       with:
         log-accepted-android-sdk-licenses: false
 
-    - name: Set Java Version
-      uses: actions/setup-java@v3
+    # Java 11 is needed by .NET Android
+    - name: Install Java 11
+      if: ${{ !matrix.container }}
+      uses: actions/setup-java@v4
       with:
-        distribution: 'temurin'
+        distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || '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
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
           8.0.x
+          9.0.203
 
     - name: Install .NET Workloads
       shell: bash
-      run: >
+      run: |
+        pwd
         dotnet workload install \
-          wasm-tools maui-android \
+          wasm-tools wasm-tools-net8 maui-android \
           ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows macos' || '' }} \
-          ${{ runner.os == 'Windows' && 'maui-windows' || '' }} \
+          ${{ runner.os == 'Windows' && 'maui-ios maui-maccatalyst maui-windows' || '' }} \
           --temp-dir "${{ runner.temp }}" \
           --skip-sign-check

.github/actions/buildcocoasdk/action.yml

@@ -0,0 +1,35 @@
+name: Remove unused applications
+description: Frees disk space by removing unused applications
+runs:
+  using: composite
+  steps:
+
+    - name: Free Disk Space
+      if: runner.os == 'Linux'
+      uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
+      with:
+        android: false
+        dotnet: false
+        haskell: true
+        large-packages: false
+        docker-images: true
+        swap-storage: true
+
+    # TODO: Do we need all of these or just one?
+    #  514M	/usr/lib/llvm-15
+    #  486M	/usr/lib/llvm-14
+    #  448M	/usr/lib/llvm-13
+    - name: Remove unused applications
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        df -h /dev/root
+        sudo rm -rf /usr/local/.ghcup
+        sudo rm -rf /usr/local/julia1.10.5
+        sudo rm -rf /usr/lib/heroku
+        sudo rm -rf /opt/hostedtoolcache/go
+        sudo rm -rf /opt/hostedtoolcache/Ruby
+        sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed to complete successfully. Proceeding..."
+        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

.github/actions/environment/action.yml

@@ -0,0 +1,42 @@
+# docker build --build-arg BASE=alpine:3.21
+ARG BASE=alpine:latest
+FROM ${BASE}
+
+RUN apk update
+
+# common
+RUN apk add bash build-base cmake curl git icu lsb-release-minimal sudo tar wget
+
+# sentry-native
+RUN apk add curl-dev libunwind-dev libunwind-static linux-headers openssl-dev zlib-dev xz-dev
+
+# sentry-dotnet
+RUN apk add grpc-plugins openjdk11 powershell
+ENV PROTOBUF_PROTOC=/usr/bin/protoc
+ENV GRPC_PROTOC_PLUGIN=/usr/bin/grpc_csharp_plugin
+RUN pwsh -Command Install-Module Pester -Scope AllUsers -Force
+
+# mono (3.22+)
+RUN if ! apk add mono; then \
+    sed -i.bak 's|/v3\.[0-9]\+|/edge|g' /etc/apk/repositories && \
+    cat /etc/apk/repositories && \
+    apk update && \
+    apk add --no-cache mono && \
+    mv /etc/apk/repositories.bak /etc/apk/repositories && \
+    apk update; \
+  fi
+RUN mono --version
+
+# runner
+RUN addgroup runner
+RUN adduser -S -u 1001 -h /home/runner -G runner runner
+RUN mkdir -p /home/runner /__e /__w /__w/_temp /__w/_actions /__w/_tool
+RUN chown -R runner:runner /home/runner /__e /__w
+RUN ln -s /__w /home/runner/work
+RUN echo "runner ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/runner
+RUN chmod 0440 /etc/sudoers.d/runner
+RUN chmod -R 777 /opt
+RUN chmod -R 777 /usr/share
+USER runner
+WORKDIR /__w
+ENTRYPOINT ["/bin/bash"]

.github/actions/freediskspace/action.yml

@@ -0,0 +1,38 @@
+name: Build Alpine Linux Docker image
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - '.github/alpine/*'
+
+jobs:
+  build:
+    name: Build sentry-dotnet-alpine:${{ matrix.version }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - "3.21"
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }}
+        run: docker build --build-arg BASE=alpine:${{ matrix.version }} -t ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }} .
+        working-directory: .github/alpine
+
+      - name: Push ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }}
+        run: docker push ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }}
+        working-directory: .github/alpine