[main] Source code updates from dotnet/dotnet (#62339)

[main] Source code updates from dotnet/dotnet


 - Update CloneSslOptionsClonesAllProperties test

New properties got added in dotnet/runtime#114741

Author: dotnet-maestro[bot]

eng/Version.Details.xml

@@ -1,15 +1,15 @@
 parameters:
   sourceIndexUploadPackageVersion: 2.0.0-20250425.2
-  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
+  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   binlogPath: artifacts/log/Debug/Build.binlog
 
 steps:
 - task: UseDotNet@2
-  displayName: "Source Index: Use .NET 8 SDK"
+  displayName: "Source Index: Use .NET 9 SDK"
   inputs:
     packageType: sdk
-    version: 8.0.x
+    version: 9.0.x
     installationPath: $(Agent.TempDirectory)/dotnet
     workingDirectory: $(Agent.TempDirectory)
 

eng/Versions.props

@@ -295,8 +295,8 @@ while :; do
             ;;
         noble) # Ubuntu 24.04
             __CodeName=noble
-            if [[ -n "$__LLDB_Package" ]]; then
-                __LLDB_Package="liblldb-18-dev"
+            if [[ -z "$__LLDB_Package" ]]; then
+                __LLDB_Package="liblldb-19-dev"
             fi
             ;;
         stretch) # Debian 9

eng/common/core-templates/steps/source-index-stage1-publish.yml

@@ -0,0 +1,7 @@
+@echo off
+
+:: This script is used to install the .NET SDK.
+:: It will also invoke the SDK with any provided arguments.
+
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*"
+exit /b %ErrorLevel%

eng/common/cross/build-rootfs.sh

@@ -0,0 +1,11 @@
+# This script is used to install the .NET SDK.
+# It will also invoke the SDK with any provided arguments.
+
+. $PSScriptRoot\tools.ps1
+$dotnetRoot = InitializeDotNetCli -install:$true
+
+# Invoke acquired SDK with args if they are provided
+if ($args.count -gt 0) {
+  $env:DOTNET_NOLOGO=1
+  & "$dotnetRoot\dotnet.exe" $args
+}

eng/common/dotnet.cmd

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# This script is used to install the .NET SDK.
+# It will also invoke the SDK with any provided arguments.
+
+source="${BASH_SOURCE[0]}"
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+source $scriptroot/tools.sh
+InitializeDotNetCli true # install
+
+# Invoke acquired SDK with args if they are provided
+if [[ $# > 0 ]]; then
+  __dotnetDir=${_InitializeDotNetCli}
+  dotnetPath=${__dotnetDir}/dotnet
+  ${dotnetPath} "$@"
+fi

eng/common/dotnet.ps1

@@ -1,14 +1,5 @@
 trigger: none
-pr:
-  branches:
-    include:
-    - main
-    - release/*
-  paths:
-    exclude:
-    - documentation/*
-    - README.md
-    - CODEOWNERS
+pr: none
 
 variables:
 - template: /eng/common/templates/variables/pool-providers.yml@self

eng/common/dotnet.sh

@@ -765,28 +765,13 @@ function MSBuild() {
 
     $toolsetBuildProject = InitializeToolset
     $basePath = Split-Path -parent $toolsetBuildProject
-    $possiblePaths = @(
-      # new scripts need to work with old packages, so we need to look for the old names/versions
-      (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
-
-      # This list doesn't need to be updated anymore and can eventually be removed.
-      (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
-      (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
-    )
-    $selectedPath = $null
-    foreach ($path in $possiblePaths) {
-      if (Test-Path $path -PathType Leaf) {
-        $selectedPath = $path
-        break
-      }
-    }
+    $selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
+
     if (-not $selectedPath) {
-      Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
+      Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath"
       ExitWithExitCode 1
     }
+
     $args += "/logger:$selectedPath"
   }
 

eng/common/templates/vmr-build-pr.yml

@@ -447,27 +447,13 @@ function MSBuild {
     fi
 
     local toolset_dir="${_InitializeToolset%/*}"
-    # new scripts need to work with old packages, so we need to look for the old names/versions
-    local selectedPath=
-    local possiblePaths=()
-    possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" )
-
-    # This list doesn't need to be updated anymore and can eventually be removed.
-    possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" )
-    possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
-    for path in "${possiblePaths[@]}"; do
-      if [[ -f $path ]]; then
-        selectedPath=$path
-        break
-      fi
-    done
+    local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll"
+
     if [[ -z "$selectedPath" ]]; then
-      Write-PipelineTelemetryError -category 'Build'  "Unable to find arcade sdk logger assembly."
+      Write-PipelineTelemetryError -category 'Build'  "Unable to find arcade sdk logger assembly: $selectedPath"
       ExitWithExitCode 1
     fi
+
     args+=( "-logger:$selectedPath" )
   fi
 

eng/common/tools.ps1

@@ -69,7 +69,7 @@
       <LatestRuntimeFrameworkVersion
           Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</LatestRuntimeFrameworkVersion>
       <TargetingPackVersion
-          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</TargetingPackVersion>
+          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' and '$(TargetLatestDotNetRuntime)' != 'false' ">${MicrosoftNETCoreAppRefVersion}</TargetingPackVersion>
       <!--
         Change the default shared framework version only when _not_ servicing. Avoid bumping version used in most
         projects. When servicing, projects (Microsoft.AspNetCore.App.Runtime in particular) can use

eng/common/tools.sh

@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25311.102",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25311.102",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25311.102",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25314.101",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25314.101",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25314.101",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/tools/GenerateFiles/Directory.Build.targets.in

@@ -24,7 +24,7 @@
     <!-- HACK: We aren't self-contained but we need to say we are so the SDK lets us do composite R2R -->
     <SelfContained>true</SelfContained>
 
-    <InstructionSetSupport Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86'">+x86-x64-v3</InstructionSetSupport>
+    <InstructionSetSupport Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86'">+x86-64-v3</InstructionSetSupport>
     <PublishReadyToRunCrossgen2ExtraArgs Condition="'$(InstructionSetSupport)' != ''">$(PublishReadyToRunCrossgen2ExtraArgs);--instruction-set:$(InstructionSetSupport)</PublishReadyToRunCrossgen2ExtraArgs>
 
     <!-- Setting this suppresses getting documentation .xml files in the shared runtime output. -->

global.json

@@ -27,7 +27,6 @@
   <PropertyGroup>
     <!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for .NETCoreApp -->
     <DotNetRuntimeArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-$(TargetRuntimeIdentifier).$(ArchiveFormat)</DotNetRuntimeArchiveFileName>
-    <DotNetRuntimeArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime-pgo-$(MicrosoftNETCoreAppRefVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName>
     <DotNetRuntimeDownloadPath>Runtime/$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadPath>
     <DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
   </PropertyGroup>

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj

@@ -30,7 +30,6 @@
   <PropertyGroup>
     <!-- Use the Microsoft.Internal.Runtime.AspNetCore.Transport package as a sentinel for the nonshipping version for .NETCoreApp -->
     <DotNetRuntimeArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-$(TargetRuntimeIdentifier).$(ArchiveFormat)</DotNetRuntimeArchiveFileName>
-    <DotNetRuntimeArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime-pgo-$(MicrosoftNETCoreAppRefVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName>
     <DotNetRuntimeDownloadPath>Runtime/$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadPath>
     <DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
   </PropertyGroup>

src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj

@@ -200,6 +200,10 @@ internal static SslServerAuthenticationOptions CloneSslOptions(SslServerAuthenti
             ServerCertificateSelectionCallback = sslOptions.ServerCertificateSelectionCallback,
             CertificateChainPolicy = sslOptions.CertificateChainPolicy,
             AllowTlsResume = sslOptions.AllowTlsResume,
+#pragma warning disable CA1416 // Ignore SupportedOSPlatform checks, we're just copying the value
+            AllowRsaPssPadding = sslOptions.AllowRsaPssPadding,
+            AllowRsaPkcs1Padding = sslOptions.AllowRsaPkcs1Padding,
+#pragma warning restore CA1416
         };
 
     private sealed class SniOptions

src/Framework/App.Runtime/src/aspnetcore-runtime.proj

@@ -858,6 +858,12 @@ public void CloneSslOptionsClonesAllProperties()
             CertificateChainPolicy = new X509ChainPolicy(),
             // Defaults to true
             AllowTlsResume = false,
+#pragma warning disable CA1416
+            // Defaults to true
+            AllowRsaPssPadding = false,
+            // Defaults to true
+            AllowRsaPkcs1Padding = false,
+#pragma warning restore CA1416
         };
 
         var clonedOptions = SniOptionsSelector.CloneSslOptions(options);
@@ -906,6 +912,12 @@ public void CloneSslOptionsClonesAllProperties()
         Assert.Equal(options.AllowTlsResume, clonedOptions.AllowTlsResume);
         Assert.True(propertyNames.Remove(nameof(options.AllowTlsResume)));
 
+        Assert.Equal(options.AllowRsaPssPadding, clonedOptions.AllowRsaPssPadding);
+        Assert.True(propertyNames.Remove(nameof(options.AllowRsaPssPadding)));
+
+        Assert.Equal(options.AllowRsaPkcs1Padding, clonedOptions.AllowRsaPkcs1Padding);
+        Assert.True(propertyNames.Remove(nameof(options.AllowRsaPkcs1Padding)));
+
         // Ensure we've checked every property. When new properties get added, we'll have to update this test along with the CloneSslOptions implementation.
         Assert.Empty(propertyNames);
     }