Enable all samples and tests to build on all platforms

Microsoft.AspNetCore.SystemWebAdapters.slnx

@@ -46,8 +46,8 @@
     <Project Path="samples/SessionRemote/SessionRemoteFramework/SessionRemoteFramework.csproj" />
   </Folder>
   <Folder Name="/samples/WebFormsToBlazor/">
+    <Project Path="samples/WebFormsToBlazor/BlazorWebApp/BlazorWebApp.csproj" />
     <Project Path="samples/WebFormsToBlazor/WebFormsToBlazorAppHost/WebFormsToBlazorAppHost.csproj" />
-    <Project Path="samples/WebFormsToBlazor/WebFormsToBlazorCore/WebFormsToBlazorCore.csproj" />
     <Project Path="samples/WebFormsToBlazor/WebFormsToBlazorFramework/WebFormsToBlazorFramework.csproj" />
   </Folder>
   <Folder Name="/Solution Items/">

azure-pipelines-public.yml

@@ -9,6 +9,8 @@ variables:
     value: build/product
   - name: _DotNetArtifactsCategory
     value: .NETCore
+  - name: ASPIRE_ENABLE_CONTAINER_TUNNEL
+    value: true
 
   # Variables to automatically handle build pools
   - template: /eng/common/templates/variables/pool-providers.yml
@@ -61,19 +63,71 @@ stages:
         steps:
         - checkout: self
           clean: true
+        - task: PowerShell@2
+          displayName: Install Aspire CLI
+          condition: succeeded()
+          inputs:
+            targetType: inline
+            pwsh: true
+            script: |
+              Invoke-RestMethod https://aspire.dev/install.ps1 -OutFile aspire-install.ps1
+              .\aspire-install.ps1
+              $aspireBin = Join-Path $HOME '.aspire/bin'
+              Write-Host "##vso[task.prependpath]$aspireBin"
+              aspire --version
+              aspire doctor --non-interactive
         - task: NuGetCommand@2
           displayName: 'Clear NuGet caches'
           condition: succeeded()
           inputs:
             command: custom
             arguments: 'locals all -clear'
+        - task: DockerInstaller@0
+          displayName: Install Docker CLI
+          condition: succeeded()
+          inputs:
+            dockerVersion: '28.0.0'
+        - task: PowerShell@2
+          displayName: Docker diagnostics (before build/tests)
+          condition: succeededOrFailed()
+          inputs:
+            targetType: inline
+            script: |
+              $ErrorActionPreference = 'Continue'
+              if (-not (Get-Command docker -ErrorAction SilentlyContinue)) {
+                Write-Host "##vso[task.logissue type=warning]Docker CLI not found on PATH"
+                exit 0
+              }
+
+              docker version
+              docker info
+              docker container ls -a
+              docker network ls
+              docker volume ls
         - script: eng\common\cibuild.cmd
             -configuration $(_BuildConfig)
             -prepareMachine
             $(_BuildArgs)
           name: Build
           displayName: Build
           condition: succeeded()
+          env:
+            DOCKER_BUILDKIT: 1
+        - task: PowerShell@2
+          displayName: Docker diagnostics (after build/tests)
+          condition: always()
+          inputs:
+            targetType: inline
+            script: |
+              $ErrorActionPreference = 'Continue'
+              if (-not (Get-Command docker -ErrorAction SilentlyContinue)) {
+                Write-Host "##vso[task.logissue type=warning]Docker CLI not found on PATH"
+                exit 0
+              }
+
+              docker container ls -a
+              docker network ls
+              docker volume ls
         - task: PowerShell@2
           inputs:
             filePath: update_apis.ps1

azure-pipelines-unofficial.yml

@@ -9,6 +9,8 @@ variables:
     value: build/product
   - name: _DotNetArtifactsCategory
     value: .NETCore
+  - name: ASPIRE_ENABLE_CONTAINER_TUNNEL
+    value: true
 
   # Variables to automatically handle build pools
   - template: /eng/common/templates-official/variables/pool-providers.yml@self
@@ -77,6 +79,19 @@ extends:
                       /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
                       /p:DotNetPublishToBlobFeed=false
             steps:
+            - task: PowerShell@2
+              displayName: Install Aspire CLI
+              condition: succeeded()
+              inputs:
+                targetType: inline
+                pwsh: true
+                script: |
+                  Invoke-RestMethod https://aspire.dev/install.ps1 -OutFile aspire-install.ps1
+                  .\aspire-install.ps1
+                  $aspireBin = Join-Path $HOME '.aspire/bin'
+                  Write-Host "##vso[task.prependpath]$aspireBin"
+                  aspire --version
+                  aspire doctor --non-interactive
             - task: NuGetCommand@2
               displayName: 'Clear NuGet caches'
               condition: succeeded()

azure-pipelines.yml

@@ -9,6 +9,8 @@ variables:
     value: build/product
   - name: _DotNetArtifactsCategory
     value: .NETCore
+  - name: ASPIRE_ENABLE_CONTAINER_TUNNEL
+    value: true
 
   # Variables to automatically handle build pools
   - template: /eng/common/templates-official/variables/pool-providers.yml@self
@@ -86,19 +88,71 @@ extends:
                       /p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
                       /p:DotNetPublishToBlobFeed=true
             steps:
+            - task: PowerShell@2
+              displayName: Install Aspire CLI
+              condition: succeeded()
+              inputs:
+                targetType: inline
+                pwsh: true
+                script: |
+                  Invoke-RestMethod https://aspire.dev/install.ps1 -OutFile aspire-install.ps1
+                  .\aspire-install.ps1
+                  $aspireBin = Join-Path $HOME '.aspire/bin'
+                  Write-Host "##vso[task.prependpath]$aspireBin"
+                  aspire --version
+                  aspire doctor --non-interactive
             - task: NuGetCommand@2
               displayName: 'Clear NuGet caches'
               condition: succeeded()
               inputs:
                 command: custom
                 arguments: 'locals all -clear'
+            - task: DockerInstaller@0
+              displayName: Install Docker CLI
+              condition: succeeded()
+              inputs:
+                dockerVersion: '28.0.0'
+            - task: PowerShell@2
+              displayName: Docker diagnostics (before build/tests)
+              condition: succeededOrFailed()
+              inputs:
+                targetType: inline
+                script: |
+                  $ErrorActionPreference = 'Continue'
+                  if (-not (Get-Command docker -ErrorAction SilentlyContinue)) {
+                    Write-Host "##vso[task.logissue type=warning]Docker CLI not found on PATH"
+                    exit 0
+                  }
+
+                  docker version
+                  docker info
+                  docker container ls -a
+                  docker network ls
+                  docker volume ls
             - script: eng\common\cibuild.cmd
                 -configuration $(_BuildConfig)
                 -prepareMachine
                 $(_BuildArgs)
               name: Build
               displayName: Build
               condition: succeeded()
+              env:
+                DOCKER_BUILDKIT: 1
+            - task: PowerShell@2
+              displayName: Docker diagnostics (after build/tests)
+              condition: always()
+              inputs:
+                targetType: inline
+                script: |
+                  $ErrorActionPreference = 'Continue'
+                  if (-not (Get-Command docker -ErrorAction SilentlyContinue)) {
+                    Write-Host "##vso[task.logissue type=warning]Docker CLI not found on PATH"
+                    exit 0
+                  }
+
+                  docker container ls -a
+                  docker network ls
+                  docker volume ls
             - task: PowerShell@2
               inputs:
                 filePath: update_apis.ps1

eng/Build.props

@@ -2,6 +2,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Specify the solutions to build. Add all new solutions/projects here as necessary or the main build won't build them! -->
   <ItemGroup>
-    <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Microsoft.AspNetCore.SystemWebAdapters.slnf" />
+    <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Microsoft.AspNetCore.SystemWebAdapters.slnx" />
   </ItemGroup>
 </Project>

global.json

@@ -19,7 +19,7 @@
   },
   "msbuild-sdks": {
     "MSBuild.SDK.SystemWeb": "4.0.104",
-    "Aspire.AppHost.Sdk": "13.0.0",
+    "Aspire.AppHost.Sdk": "13.2.2",
     "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26374.3"
   }
 }

samples/AppConfig/AppConfigFramework/Properties/launchSettings.json

@@ -5,7 +5,7 @@
 
     "iisExpress": {
       "applicationUrl": "http://localhost:47556",
-      "sslPort": 47557
+      "sslPort": 44356
     }
   },
   "profiles": {

samples/AuthRemoteIdentity/AuthRemoteIdentityAppHost/Program.cs

@@ -4,7 +4,10 @@
 
 var builder = DistributedApplication.CreateBuilder(args);
 
-var password = builder.AddParameter("sqlPass", secret: true);
+var password = builder.AddParameter(
+    name: "sqlPass",
+    value: new GenerateParameterDefault() { MinSpecial = 3 },
+    secret: true);
 var apiKey = builder.AddParameter("remoteapp-apiKey", () => Guid.NewGuid().ToString(), secret: true);
 
 var db = builder.AddSqlServer("identityserver", password: password)

samples/AuthRemoteIdentity/AuthRemoteIdentityCore/AuthRemoteIdentityCore.csproj

@@ -3,9 +3,6 @@
     <TargetFramework>$(SAMPLES_TFM)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-
-    <!-- We use aspire to hook things up for multiple configurations and need all control -->
-    <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.Owin\Microsoft.AspNetCore.SystemWebAdapters.Owin.csproj" />

samples/DependencyInjection/DependencyInjectionAppHost/DependencyInjectionAppHost.csproj

@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.SqlServer" />
-    <PackageReference Include="C3D.Extensions.Aspire.IISExpress" />
   </ItemGroup>
 
   <ItemGroup>

samples/Directory.Build.props

@@ -57,6 +57,11 @@
     </NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MvcBuildViews>false</MvcBuildViews>
+    <WebApplicationsTargetPath>$(MSBuildThisFileDirectory)Microsoft.WebApplication.Empty.targets</WebApplicationsTargetPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference
       Include="$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.SystemWebAdapters.Analyzers\Microsoft.AspNetCore.SystemWebAdapters.Analyzers.csproj"

samples/Microsoft.WebApplication.Empty.targets

@@ -0,0 +1 @@
+<Project />

samples/Modules/ModulesFramework/Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:47560",
-      "sslPort": 47561
+      "sslPort": 44361
     }
   },
   "profiles": {

samples/ServiceDefaults/Extensions.cs

@@ -50,6 +50,11 @@ public static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder) where
             .AddHttpClient("OtlpTraceExporter")
             .RemoveAllLoggers();
 
+        builder.Services.AddLogging(logging =>
+        {
+            logging.AddFilter("Polly", LogLevel.Warning);
+        });
+
         // Uncomment the following to restrict the allowed schemes for service discovery.
         // builder.Services.Configure<ServiceDiscoveryOptions>(options =>
         // {

samples/WebFormsToBlazor/WebFormsToBlazorCore/WebFormsToBlazorCore.csproj → samples/WebFormsToBlazor/BlazorWebApp/BlazorWebApp.csproj

@@ -1,14 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+
   <PropertyGroup>
     <TargetFramework>$(SAMPLES_TFM)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.CustomElements" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj" />
     <ProjectReference Include="..\..\ServiceDefaults\Samples.ServiceDefaults.csproj" />
   </ItemGroup>
+
 </Project>

samples/WebFormsToBlazor/BlazorWebApp/Components/App.razor

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/" />
+    <ResourcePreloader />
+    <link rel="stylesheet" href="@Assets["app.css"]" />
+    <link rel="stylesheet" href="@Assets["BlazorWebApp.styles.css"]" />
+    <ImportMap />
+    <HeadOutlet @rendermode="InteractiveServer" />
+</head>
+
+<body>
+    <Routes @rendermode="InteractiveServer" />
+    <ReconnectModal />
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
+</body>
+
+</html>

samples/WebFormsToBlazor/BlazorWebApp/Components/Layout/MainLayout.razor

@@ -0,0 +1,9 @@
+@inherits LayoutComponentBase
+
+@Body
+
+<div id="blazor-error-ui" data-nosnippet>
+    An unhandled error has occurred.
+    <a href="." class="reload">Reload</a>
+    <span class="dismiss">🗙</span>
+</div>

samples/WebFormsToBlazor/BlazorWebApp/Components/Layout/MainLayout.razor.css

@@ -0,0 +1,20 @@
+#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;
+    }