Update all samples to use the latest TFMs

.github/actions/environment/action.yml

@@ -109,7 +109,13 @@ runs:
     - name: Install .NET Workloads
       shell: bash
       run: |
+        set -euo pipefail
         pwd
         dotnet workload restore \
           --temp-dir "${{ runner.temp }}" \
           --skip-sign-check
+        dotnet workload restore test/AndroidTestApp/AndroidTestApp.csproj \
+          --temp-dir "${{ runner.temp }}" \
+          --skip-sign-check
+        # Restore the Android test app explicitly to ensure runtime packs are available
+        dotnet restore test/AndroidTestApp/AndroidTestApp.csproj -r android-x64 --nologo || true

samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0-android35.0</TargetFramework>
+    <TargetFramework>net10.0-android36.0</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/App.razor

@@ -1,10 +1,6 @@
-<Router AppAssembly="@typeof(Program).Assembly">
+<Router AppAssembly="@typeof(App).Assembly" NotFoundPage="typeof(Pages.NotFound)">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
-    <NotFound>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p>Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
 </Router>

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Pages/Catcher.razor

@@ -29,6 +29,6 @@
     private static class OtherStuffThrower
     {
         public static void DoSomething() => Thrower();
-        private static void Thrower() => throw null;
+        private static void Thrower() => throw null!;
     }
 }

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Pages/NotFound.razor

@@ -0,0 +1,5 @@
+@page "/not-found"
+@layout MainLayout
+
+<h3>Not Found</h3>
+<p>Sorry, the content you are looking for does not exist.</p>

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Pages/Thrower.razor

@@ -30,6 +30,6 @@
     private static class StuffThrower
     {
         public static void DoSomething() => Thrower();
-        private static void Thrower() => throw null;
+        private static void Thrower() => throw null!;
     }
 }

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Program.cs

@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Sentry.Samples.AspNetCore.Blazor.Wasm;
 
@@ -7,20 +8,28 @@
     builder.UseSentry(options =>
     {
 #if !SENTRY_DSN_DEFINED_IN_ENV
-        // A DSN is required. You can set here in code, or you can set it in the SENTRY_DSN environment variable.
+        // You must specify a DSN. On mobile platforms, this should be done in code here.
         // See https://docs.sentry.io/product/sentry-basics/dsn-explainer/
         options.Dsn = SamplesShared.Dsn;
+#else
+        // To make things easier for the SDK maintainers we have a custom build target that writes the
+        // SENTRY_DSN environment variable into an EnvironmentVariables class that is available for WASM
+        // targets. This allows us to share one DSN defined in the ENV across desktop and mobile samples.
+        // Generally, you won't want to do this in your own WASM applications - you should set the DSN
+        // in code as above
+        options.Dsn = EnvironmentVariables.Dsn;
 #endif
         options.Debug = true;
     });
 
     builder.RootComponents.Add<App>("#app");
+    builder.RootComponents.Add<HeadOutlet>("head::after");
     builder.Logging.SetMinimumLevel(LogLevel.Debug);
 
     builder.Services.AddScoped(_ =>
         new HttpClient
         {
-            BaseAddress = new(builder.HostEnvironment.BaseAddress)
+            BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)
         });
     await builder.Build().RunAsync();
 }

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Properties/launchSettings.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
@@ -18,7 +19,7 @@
     },
     "Sentry.Samples.AspNetCore.Blazor.Wasm": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "applicationUrl": "https://localhost:5001;http://localhost:5000",

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Sentry.Samples.AspNetCore.Blazor.Wasm.csproj

@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <RunAOTCompilation>true</RunAOTCompilation>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>
+    <!--<RunAOTCompilation>true</RunAOTCompilation>--><!--see https://github.com/dotnet/runtime/issues/121975-->
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -15,8 +18,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8"/>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.8" PrivateAssets="all"/>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0"/>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all"/>
     <ProjectReference Include="..\..\src\Sentry.AspNetCore.Blazor.WebAssembly\Sentry.AspNetCore.Blazor.WebAssembly.csproj" />
   </ItemGroup>
+
 </Project>

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Shared/MainLayout.razor

@@ -5,7 +5,9 @@
         <NavMenu />
     </div>
 
-    <div>
-        @Body
-    </div>
+    <main>
+        <article class="content">
+            @Body
+        </article>
+    </main>
 </div>

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/_Imports.razor

@@ -3,6 +3,7 @@
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 @using Sentry.Samples.AspNetCore.Blazor.Wasm

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/wwwroot/app.css

@@ -1,4 +1,7 @@
-/* styles all <a> tags within <nav> tags */
+html, body {
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
 nav {
     width: 100%;
     background-color: #7428d2;
@@ -11,37 +14,122 @@ nav a {
     font-family: sans-serif;
     padding: 1.0em;
     border-style: none;
-    display: inline-block; /* makes the links align horizontally */
+    display: inline-block;
 }
 
-/* styles for hovered <a> tags within <nav> tags */
 nav a:hover {
     background-color: #d37e05;
     color: #f0f0f0;
 }
 
-button {
+h1:focus {
+    outline: none;
+}
+
+a, .btn-link {
+    color: #0071c1;
+}
+
+.btn-primary {
     color: #fff;
-    background-color: #cf7209;
-    display: inline-block;
-    font-weight: 400;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+}
+
+.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
+  box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
+}
+
+.content {
+    padding-top: 1.1rem;
+}
+
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
+#blazor-error-ui {
+    color-scheme: light only;
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    box-sizing: border-box;
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+    #blazor-error-ui .dismiss {
+        cursor: pointer;
+        position: absolute;
+        right: 0.75rem;
+        top: 0.5rem;
+    }
+
+.blazor-error-boundary {
+    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
+    padding: 1rem 1rem 1rem 3.7rem;
+    color: white;
+}
+
+    .blazor-error-boundary::after {
+        content: "An error has occurred."
+    }
+
+.loading-progress {
+    position: absolute;
+    display: block;
+    width: 8rem;
+    height: 8rem;
+    inset: 20vh 0 auto 0;
+    margin: 0 auto 0 auto;
+}
+
+    .loading-progress circle {
+        fill: none;
+        stroke: #e0e0e0;
+        stroke-width: 0.6rem;
+        transform-origin: 50% 50%;
+        transform: rotate(-90deg);
+    }
+
+        .loading-progress circle:last-child {
+            stroke: #1b6ec2;
+            stroke-dasharray: calc(3.141 * var(--blazor-load-percentage, 0%) * 0.8), 500%;
+            transition: stroke-dasharray 0.05s ease-in-out;
+        }
+
+.loading-progress-text {
+    position: absolute;
     text-align: center;
-    vertical-align: middle;
-    cursor: pointer;
-    user-select: none;
-    padding: .375rem .75rem;
-    font-size: 1rem;
-    line-height: 1.5;
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
-}
-
-button:hover {
-    color: #fff;
-    background-color: #d37e05;
+    font-weight: bold;
+    inset: calc(20vh + 3.25rem) 0 auto 0.2rem;
+}
+
+    .loading-progress-text:after {
+        content: var(--blazor-load-percentage-text, "Loading");
+    }
+
+code {
+    color: #c02d76;
+}
+
+.form-floating > .form-control-plaintext::placeholder, .form-floating > .form-control::placeholder {
+    color: var(--bs-secondary-color);
+    text-align: end;
 }
 
-button:focus {
-    box-shadow: 0 0 0 0.2rem rgba(241, 185, 144, 0.5);
+.form-floating > .form-control-plaintext:focus::placeholder, .form-floating > .form-control:focus::placeholder {
+    text-align: start;
 }

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/wwwroot/index.html

@@ -1,23 +1,33 @@
-<!DOCTYPE html>
-<html>
+<!DOCTYPE html>
+<html lang="en">
 
 <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>BlazorApp1</title>
-    <link href="app.css" rel="stylesheet">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Sentry.Samples.AspNetCore.Blazor.Wasm</title>
+    <base href="/" />
+    <link rel="preload" id="webassembly" />
+    <link rel="stylesheet" href="app.css" />
+    <link rel="icon" type="image/png" href="favicon.png" />
+    <link href="Sentry.Samples.AspNetCore.Blazor.Wasm.styles.css" rel="stylesheet" />
+    <script type="importmap"></script>
 </head>
 
 <body>
-<div id="app">Loading...</div>
+    <div id="app">
+        <svg class="loading-progress">
+            <circle r="40%" cx="50%" cy="50%" />
+            <circle r="40%" cx="50%" cy="50%" />
+        </svg>
+        <div class="loading-progress-text"></div>
+    </div>
 
-<div id="blazor-error-ui">
-    An unhandled error has occurred.
-    <a href="" class="reload">Reload</a>
-    <a class="dismiss">🗙</a>
-</div>
-
-<script src="_framework/blazor.webassembly.js"></script>
+    <div id="blazor-error-ui">
+        An unhandled error has occurred.
+        <a href="." class="reload">Reload</a>
+        <span class="dismiss">🗙</span>
+    </div>
+    <script src="_framework/blazor.webassembly#[.{fingerprint}].js"></script>
 </body>
 
 </html>

samples/Sentry.Samples.GenericHost/Sentry.Samples.GenericHost.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

samples/Sentry.Samples.Ios/AppDelegate.cs

@@ -11,7 +11,7 @@ public override UIWindow? Window
         set;
     }
 
-    public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
+    public override bool FinishedLaunching(UIApplication application, NSDictionary? launchOptions)
     {
         // Init the Sentry SDK
         SentrySdk.Init(options =>
@@ -55,8 +55,11 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l
             };
         });
 
+#pragma warning disable CA1422 // Validate platform compatibility
         // create a new window instance based on the screen size
         Window = new UIWindow(UIScreen.MainScreen.Bounds);
+// TODO: Undomment this line... just testing this comment: https://github.com/getsentry/sentry-dotnet/pull/4782#issuecomment-3623881935
+// #pragma warning restore CA1422
 
         // determine control colours (SystemBackground requires iOS >= 13.0)
         var backgroundColor = UIDevice.CurrentDevice.CheckSystemVersion(13, 0)

samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0-ios18.0</TargetFramework>
-    <TargetPlatformVersion>18</TargetPlatformVersion>
+    <TargetFramework>net10.0-ios26.0</TargetFramework>
+    <TargetPlatformVersion>26</TargetPlatformVersion>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>