[main] Source code updates from dotnet/scenario-tests

prereqs/git-info/scenario-tests.props

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <GitCommitHash>ceac1959c432335d5babb253393dcd7838785a61</GitCommitHash>
-    <OfficialBuildId>20250318.2</OfficialBuildId>
-    <OutputPackageVersion>10.0.0-preview.25168.2</OutputPackageVersion>
+    <GitCommitHash>ebe75f3b2488c0c7a4fe0a9da69727408384254c</GitCommitHash>
+    <OfficialBuildId>20250414.1</OfficialBuildId>
+    <OutputPackageVersion>10.0.0-preview.25214.1</OutputPackageVersion>
   </PropertyGroup>
 </Project>

src/scenario-tests/eng/Version.Details.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Mapping="scenario-tests" Uri="https://github.com/dotnet/dotnet" Sha="de007bb9d4d27601d50134f1478aeaa2f4062f93" BarId="260646" />
+  <Source Mapping="scenario-tests" Uri="https://github.com/dotnet/dotnet" Sha="49f46ce3082f22cd016b9fffdae880a09b04afcd" BarId="262746" />
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="System.CommandLine" Version="2.0.0-beta4.25167.101">
+    <Dependency Name="System.CommandLine" Version="2.0.0-beta5.25208.1">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>de007bb9d4d27601d50134f1478aeaa2f4062f93</Sha>
+      <Sha>48bd86bdcd926a194e1581a60d820d12a64ef3c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25167.101">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25202.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>de007bb9d4d27601d50134f1478aeaa2f4062f93</Sha>
+      <Sha>49f46ce3082f22cd016b9fffdae880a09b04afcd</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

src/scenario-tests/eng/Versions.props

@@ -4,6 +4,6 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <SystemCommandLineVersion>2.0.0-beta4.25167.101</SystemCommandLineVersion>
+    <SystemCommandLineVersion>2.0.0-beta5.25208.1</SystemCommandLineVersion>
   </PropertyGroup>
 </Project>

src/scenario-tests/eng/common/CIBuild.cmd

@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"

src/scenario-tests/eng/common/build.ps1

@@ -7,6 +7,7 @@ Param(
   [string] $msbuildEngine = $null,
   [bool] $warnAsError = $true,
   [bool] $nodeReuse = $true,
+  [switch] $buildCheck = $false,
   [switch][Alias('r')]$restore,
   [switch] $deployDeps,
   [switch][Alias('b')]$build,
@@ -71,6 +72,8 @@ function Print-Usage() {
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
   Write-Host "  -excludePrereleaseVS    Set to exclude build engines in prerelease versions of Visual Studio"
   Write-Host "  -nativeToolsOnMachine   Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
+  Write-Host "  -nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
+  Write-Host "  -buildCheck             Sets /check msbuild parameter"
   Write-Host ""
 
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +100,7 @@ function Build {
 
   $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
   $platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
+  $check = if ($buildCheck) { '/check' } else { '' }
 
   if ($projects) {
     # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +117,7 @@ function Build {
   MSBuild $toolsetBuildProj `
     $bl `
     $platformArg `
+    $check `
     /p:Configuration=$configuration `
     /p:RepoRoot=$RepoRoot `
     /p:Restore=$restore `
@@ -127,6 +132,7 @@ function Build {
     /p:PerformanceTest=$performanceTest `
     /p:Sign=$sign `
     /p:Publish=$publish `
+    /p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
     @properties
 }
 

src/scenario-tests/eng/common/build.sh

@@ -42,6 +42,7 @@ usage()
   echo "  --prepareMachine         Prepare machine for CI run, clean up processes after build"
   echo "  --nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
   echo "  --warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
+  echo "  --buildCheck <value>     Sets /check msbuild parameter"
   echo ""
   echo "Command line arguments not listed above are passed thru to msbuild."
   echo "Arguments can also be passed in with a single hyphen."
@@ -76,6 +77,7 @@ clean=false
 
 warn_as_error=true
 node_reuse=true
+build_check=false
 binary_log=false
 exclude_ci_binary_log=false
 pipelines_log=false
@@ -173,6 +175,9 @@ while [[ $# > 0 ]]; do
       node_reuse=$2
       shift
       ;;
+    -buildcheck)
+      build_check=true
+      ;;
     -runtimesourcefeed)
       runtime_source_feed=$2
       shift
@@ -224,8 +229,14 @@ function Build {
     bl="/bl:\"$log_dir/Build.binlog\""
   fi
 
+  local check=""
+  if [[ "$build_check" == true ]]; then
+    check="/check"
+  fi
+
   MSBuild $_InitializeToolset \
     $bl \
+    $check \
     /p:Configuration=$configuration \
     /p:RepoRoot="$repo_root" \
     /p:Restore=$restore \
@@ -239,6 +250,7 @@ function Build {
     /p:PerformanceTest=$performance_test \
     /p:Sign=$sign \
     /p:Publish=$publish \
+    /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
     $properties
 
   ExitWithExitCode 0

src/scenario-tests/eng/common/cibuild.sh

@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
 done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
-. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
+. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@

src/scenario-tests/eng/common/core-templates/job/job.yml

@@ -73,9 +73,6 @@ jobs:
   - ${{ if ne(parameters.enableTelemetry, 'false') }}:
     - name: DOTNET_CLI_TELEMETRY_PROFILE
       value: '$(Build.Repository.Uri)'
-  - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
-    - name: EnableRichCodeNavigation
-      value: 'true'
   # Retry signature validation up to three times, waiting 2 seconds between attempts.
   # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
   - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
@@ -147,16 +144,6 @@ jobs:
   - ${{ each step in parameters.steps }}:
     - ${{ step }}
 
-  - ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
-    - task: RichCodeNavIndexer@0
-      displayName: RichCodeNav Upload
-      inputs:
-        languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
-        environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
-        richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
-        uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
-      continueOnError: true
-
   - ${{ each step in parameters.componentGovernanceSteps }}:
     - ${{ step }}
 

src/scenario-tests/eng/common/core-templates/steps/install-microbuild.yml

@@ -5,7 +5,7 @@ parameters:
   # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
   enableMicrobuildForMacAndLinux: false
   # Location of the MicroBuild output folder
-  microBuildOutputFolder: '$(Agent.TempDirectory)'
+  microBuildOutputFolder: '$(Build.SourcesDirectory)'
   continueOnError: false
 
 steps:
@@ -41,7 +41,7 @@ steps:
         inputs:
           packageType: sdk
           version: 8.0.x
-          installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet
+          installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
           workingDirectory: ${{ parameters.microBuildOutputFolder }}
         condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
 
@@ -53,6 +53,7 @@ steps:
         feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
         ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
           azureSubscription: 'MicroBuild Signing Task (DevDiv)'
+          useEsrpCli: true
       env:
         TeamName: $(_TeamName)
         MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
@@ -71,3 +72,28 @@ steps:
             eq(variables['_SignType'], 'real')
           )
         ))
+
+    # Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964
+    - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
+      - task: UseDotNet@2
+        displayName: Install .NET 9.0 SDK for ESRP CLI Workaround
+        inputs:
+          packageType: sdk
+          version: 9.0.x
+          installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
+          workingDirectory: ${{ parameters.microBuildOutputFolder }}
+        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+
+      - task: PowerShell@2
+        displayName: Workaround for ESRP CLI on Linux
+        inputs:
+          targetType: 'inline'
+          script: |
+            Write-Host "Copying Linux Path"
+            $MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
+            $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
+            $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
+            $MBSIGN_APPFOLDER | Write-Host
+            $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
+            Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force
+        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

src/scenario-tests/global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "10.0.100-preview.3.25125.5",
+    "dotnet": "10.0.100-preview.3.25167.3",
     "runtimes": {
       "dotnet": [
         "8.0.0",
@@ -10,6 +10,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25167.101"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25202.102"
   }
 }

src/scenario-tests/src/Microsoft.DotNet.ScenarioTests.Common/Program.cs

@@ -20,39 +20,39 @@
 
         public static async Task<int> Main(string[] args)
         {
-            var rootCommand = new CliRootCommand("Scenario test runner");
+            var rootCommand = new RootCommand("Scenario test runner");
 
-            CliOption<bool> listTestsOption = new("--list")
+            Option<bool> listTestsOption = new("--list")
             {
                 Description = "List tests that would be run, without running them."
             };
-            CliOption<List<string>> noTraitsOption = new("--no-traits")
+            Option<List<string>> noTraitsOption = new("--no-traits")
             {
                 Description = "Do not run tests with the following traits. Format X=Y"
             };
-            CliOption<List<string>> traitsOption = new("--traits")
+            Option<List<string>> traitsOption = new("--traits")
             {
                 Description = "Only run tests with the following traits. Format X=Y"
             };
-            CliOption<bool> offlineOnlyOption = new("--offline-only")
+            Option<bool> offlineOnlyOption = new("--offline-only")
             {
                 Description = "Only run tests that can be run in offline mode. Implies --notraits 'resources=online'"
             };
-            CliOption<string> xmlResultsPathOption = new("--xml")
+            Option<string> xmlResultsPathOption = new("--xml")
             {
                 Description = "XML result file."
             };
-            CliOption<string> testRootOption = new("--test-root")
+            Option<string> testRootOption = new("--test-root")
             {
                 DefaultValueFactory = (_) => Directory.CreateTempSubdirectory().FullName,
                 Description = "Directory used for temporary files when running tests"
             };
-            CliOption<bool> noCleanTestRoot = new("--no-cleanup")
+            Option<bool> noCleanTestRoot = new("--no-cleanup")
             {
                 Description = "Do not cleanup the test root after execution."
             };
 
-            CliOption<string> dotnetRootOption = new("--dotnet-root")
+            Option<string> dotnetRootOption = new("--dotnet-root")
             {
                 Description = "dotnet root to run tests against.",
                 Required = true
@@ -66,23 +66,23 @@
                 }
             });
 
-            CliOption<string> sdkVersionOption = new("--sdk-version")
+            Option<string> sdkVersionOption = new("--sdk-version")
             {
                 Description = "Version of SDK to use to run tests against. Optional. Otherwise uses the default SDK at the dotnet root."
             };
 
-            CliOption<string> targetRidOption = new("--target-rid")
+            Option<string> targetRidOption = new("--target-rid")
             {
                 Description = "Target rid for tests requiring one (e.g. self-contained publish). If omitted, uses the target rid of the executing application",
                 DefaultValueFactory = (_) => RuntimeInformation.RuntimeIdentifier
             };
 
-            CliOption<string> portableRidOption = new("--portable-rid")
+            Option<string> portableRidOption = new("--portable-rid")
             {
                 Description = "Portable rid for tests requiring one (e.g. self-contained publish)."
             };
 
-            CliOption<string> binlogDirOption = new("--binlog-dir")
+            Option<string> binlogDirOption = new("--binlog-dir")
             {
                 Description = "Directory to store binlogs in. If omitted, binlogs are stored in the generated projecgt directory."
             };

src/source-manifest.json

@@ -113,11 +113,11 @@
       "commitSha": "464e5fe6fbe499012445cbd6371010748b89dba3"
     },
     {
-      "packageVersion": "10.0.0-preview.25168.2",
-      "barId": 260778,
+      "packageVersion": "10.0.0-preview.25214.1",
+      "barId": 264250,
       "path": "scenario-tests",
       "remoteUri": "https://github.com/dotnet/scenario-tests",
-      "commitSha": "ceac1959c432335d5babb253393dcd7838785a61"
+      "commitSha": "ebe75f3b2488c0c7a4fe0a9da69727408384254c"
     },
     {
       "packageVersion": null,