Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-cf7c2d21-6afc-4da1-9966-a495e442095d

Author: DonnaChen888

build/RunTestsOnHelix.cmd

@@ -10,6 +10,9 @@ set PATH=%DOTNET_ROOT%;%PATH%
 set DOTNET_MULTILEVEL_LOOKUP=0
 set TestFullMSBuild=%1
 
+REM Ensure Visual Studio instances allow preview SDKs
+PowerShell -ExecutionPolicy ByPass -NoProfile -File "%HELIX_CORRELATION_PAYLOAD%\t\eng\enable-preview-sdks.ps1"
+
 REM Use powershell to call partical Arcade logic to get full framework msbuild path and assign it
 if "%TestFullMSBuild%"=="true" (
     FOR /F "tokens=*" %%g IN ('PowerShell -ExecutionPolicy ByPass -File "%HELIX_CORRELATION_PAYLOAD%\t\eng\print-full-msbuild-path.ps1"') do (SET DOTNET_SDK_TEST_MSBUILD_PATH=%%g)

eng/common/tools.ps1

@@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot,
     if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
     if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
     $runtimePath = $runtimePath + "\" + $version
-  
+
     $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
 
     if (Test-Path $runtimePath) {
@@ -547,19 +547,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
     })
   }
 
-  if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
+  if (!$vsRequirements) {
+    if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
+      $vsRequirements = $GlobalJson.tools.vs
+    } else {
+      $vsRequirements = $null
+    }
+  }
   $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
 
   if (!$excludePrereleaseVS) {
     $args += '-prerelease'
   }
 
-  if (Get-Member -InputObject $vsRequirements -Name 'version') {
+  if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
     $args += '-version'
     $args += $vsRequirements.version
   }
 
-  if (Get-Member -InputObject $vsRequirements -Name 'components') {
+  if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
     foreach ($component in $vsRequirements.components) {
       $args += '-requires'
       $args += $component
@@ -610,7 +616,7 @@ function InitializeBuildTool() {
     } else {
       $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
     }
-    
+
     $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
   } elseif ($msbuildEngine -eq "vs") {
     try {

eng/enable-preview-sdks.ps1

@@ -0,0 +1,59 @@
+param()
+
+. $PSScriptRoot\common\tools.ps1
+
+try {
+    $vsInfo = LocateVisualStudio
+}
+catch {
+    Write-Host "LocateVisualStudio failed: $_"
+    return
+}
+
+if ($null -eq $vsInfo) {
+    Write-Host "No Visual Studio instance detected; preview SDKs remain enabled by default."
+    return
+}
+
+$vsId = $vsInfo.instanceId
+$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
+$instanceDir = Join-Path $env:USERPROFILE "AppData\Local\Microsoft\VisualStudio\$vsMajorVersion.0_$vsId"
+
+Create-Directory $instanceDir
+
+$sdkFile = Join-Path $instanceDir 'sdk.txt'
+
+$desiredLine = 'UsePreviews=True'
+$existingLines = @()
+
+if (Test-Path $sdkFile) {
+    $existingLines = @(Get-Content -Path $sdkFile -Encoding ASCII)
+}
+
+# Determine how to place the UsePreviews flag based on existing content.
+$replacementIndex = -1
+for ($i = 0; $i -lt $existingLines.Count; $i++) {
+    if ($existingLines[$i] -match '^UsePreviews=.*$') {
+        $replacementIndex = $i
+        break
+    }
+}
+
+# Replace the existing line to enforce it as True
+if ($replacementIndex -ge 0) {
+    $updatedLines = $existingLines
+    $updatedLines[$replacementIndex] = $desiredLine
+}
+elseif ($existingLines.Count -gt 0) {
+    # Write to the top of the file but keep the remaining portion (assumption: order does not matter to VS)
+    $updatedLines = @($desiredLine) + $existingLines
+}
+else {
+    # Write a whole new file
+    $updatedLines = @($desiredLine)
+}
+
+Set-Content -Path $sdkFile -Value $updatedLines -Encoding ASCII
+
+Write-Host "Updated $sdkFile"
+Get-Content -Path $sdkFile | ForEach-Object { Write-Host "  $_" }

eng/install-scancode.sh

@@ -75,6 +75,9 @@ jobs:
 
 - job: LicenseScan
   dependsOn: Setup
+  container:
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-source-build-test-amd64
+    options: '--memory=6g'
   pool:
     name: NetCore1ESPool-Svc-Internal
     demands: ImageOverride -equals 1es-ubuntu-2204
@@ -83,23 +86,8 @@ jobs:
     matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
   steps:
 
-  - script: |
-      source ./eng/common/tools.sh
-      InitializeDotNetCli true
-    displayName: Install .NET SDK
-    workingDirectory: $(Build.SourcesDirectory)
-
-  - task: PipAuthenticate@1
-    displayName: 'Pip Authenticate'
-    inputs:
-      artifactFeeds: public/dotnet-public-pypi
-      onlyAddExtraIndex: false
-
-  - script: $(sdkRoot)/eng/install-scancode.sh
-    displayName: Install Scancode
-
   - script: >
-      $(Build.SourcesDirectory)/.dotnet/dotnet test
+      dotnet test
       $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
       --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.LicenseScanTests.ScanForLicenses"
       --logger:'trx;LogFileName=$(Agent.JobName)_LicenseScan.trx'

src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml

@@ -136,7 +136,7 @@ public void ScanForLicenses()
         Assert.NotNull(Config.LicenseScanPath);
 
         // Indicates how long until a timeout occurs for scanning a given file
-        const int FileScanTimeoutSeconds = 300;
+        const int FileScanTimeoutSeconds = 1800;
 
         string scancodeResultsPath = Path.Combine(Config.LogsDirectory, "scancode-results.json");