dotnet · adamint · Apr 2, 2025 · Apr 2, 2025 · Apr 2, 2025 · Apr 2, 2025
diff --git a/.github/actions/enumerate-tests/action.yml b/.github/actions/enumerate-tests/action.yml
@@ -49,7 +49,7 @@ runs:
           "/t:Build;ExtractTestClassNames"
           /bl:${{ github.workspace }}/artifacts/log/Debug/BuildTemplatesTests.binlog
           -p:ExtractTestClassNamesForHelix=true
-          -p:ArchiveTests=true
+          -p:PrepareForHelix=true
           -p:ExtractTestClassNamesPrefix=Aspire.Templates.Tests
           -p:InstallBrowsersForPlaywright=false
 

diff --git a/.github/workflows/generate-api-diffs.yml b/.github/workflows/generate-api-diffs.yml
@@ -32,5 +32,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update-api-diffs
           base: main
+          labels: |
+            NO-MERGE
           title: "[Automated] Update API Surface Area"
           body: "Auto-generated update to the API surface to compare current surface vs latest release. This should only be merged once this surface area ships in a new release."
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,10 +13,10 @@ on:
         # relative the repo root
         required: false
         type: string
-      testSessionTimeoutMs:
+      testSessionTimeout:
         required: false
         type: string
-        default: "600000"
+        default: "15m"
       testHangTimeout:
         required: false
         type: string
@@ -160,8 +160,8 @@ jobs:
           CI: false
         run: >
           ${{ env.BUILD_SCRIPT }} -restore -ci -build -projects ${{ env.TEST_PROJECT_PATH }}
-          /p:ArchiveTests=true
-          /bl:${{ github.workspace }}/artifacts/log/Debug/ArchiveTests.binlog
+          /p:PrepareForHelix=true
+          /bl:${{ github.workspace }}/artifacts/log/Debug/PrepareForHelix.binlog
 
       # Workaround for bug in Azure Functions Worker SDK. See https://github.com/Azure/azure-functions-dotnet-worker/issues/2969.
       - name: Rebuild for Azure Functions project
@@ -220,18 +220,14 @@ jobs:
           TEST_LOG_PATH: ${{ github.workspace }}/artifacts/log/test-logs
           TestsRunningOutsideOfRepo: true
         run: >
-          dotnet test -s .runsettings -v:n ${{ env.TEST_ASSEMBLY_NAME }}.dll
-          -l "console;verbosity=normal"
-          -l "trx;LogFilePrefix=${{ inputs.testShortName }}"
-          -l "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
-          --blame
-          --blame-hang-timeout ${{ inputs.testHangTimeout }}
-          --blame-crash
+          dotnet ${{ env.TEST_ASSEMBLY_NAME }}.dll
+          --report-trx --report-trx-filename "${{ inputs.testShortName }}.trx"
+          --hangdump --hangdump-timeout ${{ inputs.testHangTimeout }}
+          --crashdump
           --results-directory ${{ github.workspace }}/testresults
+          --filter-not-trait "category=failing"
+          --timeout ${{ inputs.testSessionTimeout }}
           ${{ inputs.extraTestArgs }}
-          --
-          RunConfiguration.CollectSourceInformation=true
-          RunConfiguration.TestSessionTimeout=${{ inputs.testSessionTimeoutMs }}
 
       - name: Run tests
         if: ${{ ! inputs.requiresNugets }}
@@ -240,24 +236,24 @@ jobs:
           CI: false
           DCP_DIAGNOSTICS_LOG_LEVEL: debug
           DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
+          # During restore and build, we use -ci, which causes NUGET_PACKAGES to point to a local cache (Arcade behavior).
+          # In this step, we are not using Arcade, but want to make sure that MSBuild is able to evaluate correctly.
+          # So, we manually set NUGET_PACKAGES
+          NUGET_PACKAGES: ${{ github.workspace }}/.packages
         run: >
           ${{ env.DOTNET_SCRIPT }} test ${{ env.TEST_PROJECT_PATH }}
           /p:ContinuousIntegrationBuild=true
-          -s eng/testing/.runsettings
-          -l "console;verbosity=normal"
-          -l "trx;LogFilePrefix=${{ inputs.testShortName }}"
-          -l "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
-          "--blame"
-          --blame-hang-timeout ${{ inputs.testHangTimeout }}
-          --blame-crash
-          --results-directory testresults
+          /p:TrxFileNamePrefix="${{ inputs.testShortName }}"
+          -bl:${{ github.workspace }}/testresults/test.binlog
           --no-restore
           --no-build
-          -bl:${{ github.workspace }}/testresults/test.binlog
-          ${{ inputs.extraTestArgs }}
           --
-          RunConfiguration.CollectSourceInformation=true
-          RunConfiguration.TestSessionTimeout=${{ inputs.testSessionTimeoutMs }}
+          --report-trx
+          --hangdump --hangdump-timeout ${{ inputs.testHangTimeout }}
+          --crashdump
+          --results-directory ${{ github.workspace }}/testresults
+          --timeout ${{ inputs.testSessionTimeout }}
+          ${{ inputs.extraTestArgs }}
 
       # Save the result of the previous steps - success or failure
       # in the form of a file result-success/result-failure -{name}.rst

diff --git a/.github/workflows/tests-outerloop.yml b/.github/workflows/tests-outerloop.yml
@@ -4,96 +4,68 @@ name: Outerloop Tests
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 14 * * *' # 6am PST (14:00 UTC)
+    - cron: '0 */2 * * *' # Every 2 hours
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
 
-  test:
-    name: ${{ matrix.os.title }}
-    runs-on: ${{ matrix.os.name }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - name: ubuntu-latest
-            title: Linux
-          - name: windows-latest
-            title: Windows
+  generate_tests_matrix:
+    name: Generate test runsheet
+    runs-on: windows-latest
+    if: ${{ github.repository_owner == 'dotnet' }}
+    outputs:
+      runsheet: ${{ steps.generate_tests_matrix.outputs.runsheet }}
     steps:
-      - name: Setup vars (Linux)
-        if: ${{ matrix.os.name == 'ubuntu-latest' }}
-        run: |
-          echo "DOTNET_SCRIPT=./dotnet.sh" >> $GITHUB_ENV
-          echo "BUILD_SCRIPT=./build.sh" >> $GITHUB_ENV
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Setup vars (Windows)
-        if: ${{ matrix.os.name == 'windows-latest' }}
+      # We need to build the whole solution, so that we can interrogate each test project
+      # and find out whether it contains any quarantined tests.
+      - name: Build the solution
         run: |
-          echo "DOTNET_SCRIPT=.\dotnet.cmd" >> $env:GITHUB_ENV
-          echo "BUILD_SCRIPT=.\build.cmd" >> $env:GITHUB_ENV
+          ./build.cmd -restore -build -c Release -ci /p:CI=false /p:GeneratePackageOnBuild=false /p:InstallBrowsersForPlaywright=false
 
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Trust HTTPS development certificate (Linux)
-        if: matrix.os.name == 'ubuntu-latest'
-        run: ${{ env.DOTNET_SCRIPT }} dev-certs https --trust
-
-      - name: Run quarantined tests
-        env:
-          CI: false
+      - name: Generate test runsheet
+        id: generate_tests_matrix
         run: |
-          ${{ env.BUILD_SCRIPT }} -projects ${{ github.workspace }}/tests/Shared/SolutionTests.proj -restore -build -test -c Release /p:RunQuarantinedTests=true /bl:${{ github.workspace }}/artifacts/log/Release/test-quarantined.binlog
+          ./build.cmd -test /p:TestRunnerName=QuarantinedTestRunsheetBuilder /p:RunQuarantinedTests=true -c Release -ci /p:CI=false /p:Restore=false /p:Build=false /bl:./artifacts/log/Release/runsheet.binlog
 
-      - name: Keep only relevant test logs
-        if: always()
-        shell: pwsh
-        run: |
-          # Define the directory to search for log files
-          $logDirectory = "${{ github.workspace }}/artifacts/log/**/TestLogs"
+      - name: Upload logs, and test results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        with:
+          name: logs-runsheet
+          path: |
+            ${{ github.workspace }}/artifacts/log/*/runsheet.binlog
+            ${{ github.workspace }}/artifacts/log/*/TestLogs/**
+            ${{ github.workspace }}/artifacts/tmp/*/combined_runsheet.json
+          retention-days: 5
 
-          # Define the text to search for in the log files
-          $searchText = "No test matches the given testcase filter"
-          $resultsFilePattern = "Results File: (.+)"
+  run_tests:
+    name: Test
+    needs: generate_tests_matrix
+    strategy:
+      fail-fast: false
+      matrix:
+        tests: ${{ fromJson(needs.generate_tests_matrix.outputs.runsheet) }}
 
-          # Get all .log files in the specified directory and its subdirectories
-          $logFiles = Get-ChildItem -Path $logDirectory -Filter *.log -Recurse
+    runs-on: ${{ matrix.tests.os }} # Use the OS from the matrix
+    if: ${{ github.repository_owner == 'dotnet' }}
 
-          foreach ($logFile in $logFiles) {
-              # Read the content of the log file
-              $content = Get-Content -Path $logFile.FullName
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-              # Check if the content contains the specified text
-              if ($content -match $searchText) {
-                  # Remove the log file if it contains the specified text
-                  Remove-Item -Path $logFile.FullName -Force
-                  Write-Host "Removed file: $($logFile.FullName)"
-              }
-              else {
-                  # Extract paths from lines containing "Results File: <path>"
-                  foreach ($line in $content) {
-                      if ($line -match $resultsFilePattern) {
-                          $resultsFilePath = $matches[1]
-                          Write-Host "Found results file: $resultsFilePath"
-
-                          # Copy the results file to the TestLogs folder
-                          $destinationPath = (Split-Path -Path $logFile.FullName -Parent)
-                          Copy-Item -Path $resultsFilePath -Destination $destinationPath -Force
-                          Write-Host "Copied $resultsFilePath to $destinationPath"
-                      }
-                  }
-              }
-          }
+      - name: Test ${{ matrix.tests.project }}
+        run: |
+          ${{ matrix.tests.command }}
 
       - name: Process logs and post results
         if: always()
         shell: pwsh
         run: |
-          $logDirectory = "${{ github.workspace }}/artifacts/log/**/TestLogs"
+          $logDirectory = "${{ github.workspace }}/artifacts/TestResults"
           $trxFiles = Get-ChildItem -Path $logDirectory -Filter *.trx -Recurse
 
           $testResults = @() # Initialize an array to store test results
@@ -128,6 +100,11 @@ jobs:
               }
           }
 
+          if ($testResults.Length -lt 1) {
+              Write-Host "::notice::Tests Summary: no quaratined tests found"
+              return;
+          }
+
           # Sort the test results by test name
           $testResults = $testResults | Sort-Object -Property TestName
 
@@ -157,19 +134,13 @@ jobs:
           $table | Out-File -FilePath $outputPath -Encoding utf8
           Write-Host "Test results saved to $outputPath"
 
-          # Windows-specific: Check for failed tests and set the exit code accordingly
-          # This is a workaround for the issue with the `exit` command in PowerShell
-          if ($failedTests -gt 0) {
-              Write-Host "::error::Build failed. Check errors above."
-              exit 1
-          }
-
       - name: Upload logs, and test results
         if: always()
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
-          name: logs-${{ matrix.os.name }}
+          name: logs-${{ matrix.tests.os }}-${{ matrix.tests.project }}
           path: |
             ${{ github.workspace }}/artifacts/log/*/*.binlog
             ${{ github.workspace }}/artifacts/log/*/TestLogs/**
+            ${{ github.workspace }}/artifacts/TestResults/*/*.trx
           retention-days: 5
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -77,7 +77,7 @@ jobs:
     with:
       testShortName: ${{ matrix.shortname }}
       os: "ubuntu-latest"
-      extraTestArgs: "--filter \"(quarantined!=true)\""
+      extraTestArgs: "--filter-not-trait \"quarantined=true\""
 
   integrations_test_win:
     uses: ./.github/workflows/run-tests.yml
@@ -90,7 +90,7 @@ jobs:
     with:
       testShortName: ${{ matrix.shortname }}
       os: "windows-latest"
-      extraTestArgs: "--filter \"(quarantined!=true)\""
+      extraTestArgs: "--filter-not-trait \"quarantined=true\""
 
   templates_test_lin:
     name: Templates Linux
@@ -103,10 +103,9 @@ jobs:
       testShortName: ${{ matrix.shortname }}
       os: "ubuntu-latest"
       testProjectPath: tests/Aspire.Templates.Tests/Aspire.Templates.Tests.csproj
-      testSessionTimeoutMs: 1200000
+      testSessionTimeout: 20m
       testHangTimeout: 12m
-      # append '.' to the name so only the test class with exactly that name is run
-      extraTestArgs: "--filter \"(quarantined!=true)&(FullyQualifiedName~Aspire.Templates.Tests.${{ matrix.shortname }}.)\""
+      extraTestArgs: "--filter-not-trait quarantined=true --filter-class Aspire.Templates.Tests.${{ matrix.shortname }}"
       requiresNugets: true
       requiresTestSdk: true
 
@@ -121,10 +120,9 @@ jobs:
       testShortName: ${{ matrix.shortname }}
       os: "windows-latest"
       testProjectPath: tests/Aspire.Templates.Tests/Aspire.Templates.Tests.csproj
-      testSessionTimeoutMs: 1200000
+      testSessionTimeout: 20m
       testHangTimeout: 12m
-      # append '.' to the name so only the test class with exactly that name is run
-      extraTestArgs: "--filter \"(quarantined!=true)&(FullyQualifiedName~Aspire.Templates.Tests.${{ matrix.shortname }}.)\""
+      extraTestArgs: "--filter-not-trait quarantined=true --filter-class Aspire.Templates.Tests.${{ matrix.shortname }}"
       requiresNugets: true
       requiresTestSdk: true
 

diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -31,11 +31,12 @@ jobs:
         run: dotnet tool install --global dotnet-outdated-tool
 
       - name: Update packages
-        run: dotnet outdated --no-restore -u ./Aspire.sln
+        continue-on-error: true
+        run: dotnet outdated --no-restore -u ./Aspire.sln || echo "Some dependencies could not be updated, but continuing workflow."
 
-      - name: Revert all changes except Directory.Packages.props
+      - name: Revert all changes except Directory.Packages.props files
         run: |
-          git add Directory.Packages.props
+          git add **Directory.Packages.props
           rm nuget.config
           git checkout -- .
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <TestcontainersPackageVersion>4.3.0</TestcontainersPackageVersion>
     <AzureProvisiongVersion>1.0.0</AzureProvisiongVersion>
     <!-- The Npgsql version used when using Npgsql EF Core on net8. The major versions need to match between Npgsql and EF Core. -->
     <Npgsql8Version>8.0.6</Npgsql8Version>
@@ -125,26 +124,6 @@
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" />
     <PackageVersion Include="Microsoft.DotNet.GenAPI.Task" Version="9.0.103-servicing.25065.25" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.25072.1" />
-    <!-- unit test dependencies -->
-    <PackageVersion Include="bUnit" Version="1.36.0" /> <!-- Can't update passed to 1.37.x versions as those lift up LTS versions when targeting net8 -->
-    <PackageVersion Include="JsonSchema.Net" Version="7.3.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
-    <PackageVersion Include="Microsoft.DotNet.XUnitV3Extensions" Version="$(MicrosoftDotNetXUnitV3ExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Playwright" Version="1.50.0" />
-    <PackageVersion Include="Testcontainers.Kafka" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.MySql" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.PostgreSQL" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.RabbitMq" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.Redis" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.Nats" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.Milvus" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.Oracle" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers.Elasticsearch" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="Testcontainers" Version="$(TestcontainersPackageVersion)" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <!-- playground apps dependencies -->
     <PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="9.1.2" />
     <PackageVersion Include="Microsoft.Orleans.Persistence.AzureStorage" Version="9.1.2" />

diff --git a/build.cmd b/build.cmd
@@ -5,5 +5,5 @@ set _args=%*
 if "%~1"=="-?" set _args=-help
 if "%~1"=="/?" set _args=-help
 
-powershell -ExecutionPolicy ByPass -NoProfile -Command "& '%~dp0eng\build.ps1'" %_args%
-exit /b %ERRORLEVEL%
+powershell -ExecutionPolicy ByPass -NoProfile -Command "& '%~dp0eng\build.ps1' %_args%; exit $LASTEXITCODE"
+exit /b %ERRORLEVEL%
diff --git a/docs/using-latest-daily.md b/docs/using-latest-daily.md
@@ -8,7 +8,7 @@ See [machine-requirements.md](machine-requirements.md).
 
 ## (Optional) Create a local nuget.config file
 
-Since dogfooding will require using nightly build feeds, you may not want to add feeds globally which could alter how other code on your machine builds. To avoid this happening, you can create a local nuget.config file by running the following command in the root of your repository:
+Since dogfooding will require using daily build feeds, you may not want to add feeds globally which could alter how other code on your machine builds. To avoid this happening, you can create a local nuget.config file by running the following command in the root of your repository:
 
 ```bash
 dotnet new nugetconfig
@@ -33,7 +33,7 @@ If you use [Package Source Mapping](https://learn.microsoft.com/en-us/nuget/cons
 </packageSourceMapping>
 ```
 
-## Install the nightly .NET Aspire templates
+## Install the daily .NET Aspire templates
 
 To be able to create aspire projects, you will need to install the latest Aspire templates. You can do this by running the following command: