build with dotnet 8 sdk (#2622)

Co-authored-by: Ivan Dlugos <[email protected]>
Co-authored-by: James Crosswell <[email protected]>
Co-authored-by: Ivan Dlugos <[email protected]>
Co-authored-by: Stefan Jandl <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: getsentry-bot <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix build on mac m1 (#2702)
Fix: Scope not being applied to OpenTelemetry spans in ASP.NET Core (#2690)

Author: 7 people

.github/actions/environment/action.yml

@@ -17,24 +17,15 @@ runs:
         distribution: 'temurin'
         java-version: '11'
 
-    # .NET 3.1 has been removed from all OS due to EOL
-    # https://github.com/actions/runner-images/issues/7667
-    - name: Install .NET 3.1 SDK
+    - name: Install .NET SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.x
-
-    - name: Install .NET 7 SDK
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 7.0.203   # switch back to 7.x.x after resolving the below Tizen issue.
-
-    # Workaround for Tizen issue
-    # See https://github.com/dotnet/sdk/issues/33192
-    - name: Pin to .NET SDK 7.0.203
-      run: dotnet new globaljson --sdk-version 7.0.203 --force
-      shell: bash
-
+        dotnet-version: |
+          3.1.x
+          6.0.x
+          7.0.x
+          8.0.100-rc.2.23502.2
+        
     - name: Dependency Caching
       uses: actions/cache@v3
       # Cache is too slow on Windows to be useful.  See https://github.com/actions/cache/issues/752
@@ -51,14 +42,19 @@ runs:
       run: >
         dotnet workload install \
           maui-android \
-          ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows maui-tizen' || '' }} \
+          ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows' || '' }} \
           ${{ runner.os == 'Windows' && 'maui-windows' || '' }} \
           --temp-dir "${{ runner.temp }}" --from-rollback-file rollback.json
 
-    # We build Sentry.Maui for every supported MAUI target so we can access platform-specific features.
-    # That includes Tizen. We don't need the entire Tizen SDK, but we do need the base Tizen workload.
-    # Though we could install it on all runners, we really only need it when building and packing for NuGet, which we do on macOS only.
-    - name: Install Tizen Workload
-      if: runner.os == 'macOS'
+    - name: Restore workloads
+      shell: bash
+      run: dotnet workload restore
+
+    - name: Update workloads
+      shell: bash
+      run: dotnet workload update
+
+    - name: Log what we have in the workloads
       shell: bash
-      run: "curl -sSL https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.sh | sudo bash"
+      run: dotnet workload update
+      

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-13]
 
     steps:
       - name: Cancel Previous Runs

GlobalUsings.cs

@@ -13,6 +13,7 @@
 global using System.IO.MemoryMappedFiles;
 global using System.Net;
 global using System.Net.Http.Headers;
+global using System.Net.Http;
 global using System.Net.NetworkInformation;
 global using System.Net.Sockets;
 global using System.Reflection;

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.*",
     "rollForward": "latestMinor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }

src/Sentry.Maui/Sentry.Maui.csproj

@@ -6,7 +6,7 @@
       Target net6.0 so we can run unit tests on platform-neutral code.
       Target other platforms so we can include platform-specific code, and bundle native SDKs.
     -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android</TargetFrameworks>
     <TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
     <TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>

test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android</TargetFrameworks>
     <TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
     <TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>

test/sentry-cli-integration.Tests.ps1

@@ -9,7 +9,49 @@ if (!(Test-Path env:CI ))
     Import-Module $PSScriptRoot/../../github-workflows/sentry-cli/integration-test/action.psm1 -Force
 }
 
+function Should-AnyElementMatch ($ActualValue, [string]$ExpectedValue, [switch] $Negate, [string] $Because)
+{
+    <#
+    .SYNOPSIS
+        Asserts whether any item in the collection matches the expected value
+    .EXAMPLE
+        'foo','bar','foobar' | Should -AnyElementMatch 'oob'
+
+        This should pass because 'oob' is a substring of 'foobar'.
+    #>
+
+    $filtered = $ActualValue | Where-Object { $_ -match $ExpectedValue }
+    [bool] $succeeded = @($filtered).Count -gt 0
+    if ($Negate) { $succeeded = -not $succeeded }
+
+    if (-not $succeeded)
+    {
+        if ($Negate)
+        {
+            $failureMessage = "Expected string '$ExpectedValue' to match no elements in collection @($($ActualValue -join ', '))$(if($Because) { " because $Because"})."
+        }
+        else
+        {
+            $failureMessage = "Expected string '$ExpectedValue' to match any element in collection @($($ActualValue -join ', '))$(if($Because) { " because $Because"})."
+        }
+    }
+
+    return [pscustomobject]@{
+        Succeeded      = $succeeded
+        FailureMessage = $failureMessage
+    }
+}
+
+BeforeDiscovery {
+    Add-ShouldOperator -Name AnyElementMatch `
+        -InternalName 'Should-AnyElementMatch' `
+        -Test ${function:Should-AnyElementMatch} `
+        -SupportsArrayInput
+}
+
 BeforeAll {
+    $env:SENTRY_LOG_LEVEL = 'debug';
+
     function DotnetBuild([string]$Sample, [bool]$Symbols, [bool]$Sources, [string]$TargetFramework = '')
     {
         $rootDir = "$(Get-Item $PSScriptRoot/../../)"
@@ -58,8 +100,8 @@ Describe 'CLI-integration' {
         $result.HasErrors() | Should -BeFalse
         $result.UploadedDebugFiles() | Sort-Object -Unique | Should -Be @(
             'Sentry.pdb',
-            'Sentry.Samples.Console.Basic.pdb',
-            'Sentry.Samples.Console.Basic.src.zip')
+            'Sentry.Samples.Console.Basic.pdb')
+        $result.ScriptOutput | Should -AnyElementMatch 'Skipping embedded source file: .*/samples/Sentry.Samples.Console.Basic/Program.cs'
     }
 
     It "uploads symbols for a console app build" {
@@ -75,8 +117,8 @@ Describe 'CLI-integration' {
         $result = DotnetBuild 'Sentry.Samples.Console.Basic' $False $True
         $result.ScriptOutput | Should -Contain 'Build succeeded.'
         $result.HasErrors() | Should -BeFalse
-        $result.UploadedDebugFiles() | Sort-Object -Unique | Should -Be @(
-            'Sentry.Samples.Console.Basic.src.zip')
+        $result.ScriptOutput | Should -AnyElementMatch 'Skipping embedded source file: .*/samples/Sentry.Samples.Console.Basic/Program.cs'
+        $result.UploadedDebugFiles() | Should -BeNullOrEmpty
     }
 
     It "uploads nothing for a console app build when disabled" {
@@ -96,12 +138,13 @@ Describe 'CLI-integration' {
             'Sentry.Extensions.Logging.pdb',
             'Sentry.Maui.pdb',
             'Sentry.pdb',
-            'Sentry.Samples.Maui.pdb',
-            'Sentry.Samples.Maui.src.zip'
+            'Sentry.Samples.Maui.pdb'
         )
+        $result.ScriptOutput | Should -AnyElementMatch 'Skipping embedded source file: .*/samples/Sentry.Samples.Maui/MauiProgram.cs'
     }
 
-    if (![RuntimeInformation]::IsOSPlatform([OSPlatform]::OSX)) {
+    if (![RuntimeInformation]::IsOSPlatform([OSPlatform]::OSX))
+    {
         # Remaining tests run on macOS only
         return
     }
@@ -127,8 +170,8 @@ Describe 'CLI-integration' {
             'Sentry.Maui.pdb',
             'Sentry.pdb',
             'Sentry.Samples.Maui',
-            'Sentry.Samples.Maui.pdb',
-            'Sentry.Samples.Maui.src.zip'
+            'Sentry.Samples.Maui.pdb'
         )
+        $result.ScriptOutput | Should -AnyElementMatch 'Skipping embedded source file: .*/samples/Sentry.Samples.Maui/MauiProgram.cs'
     }
 }