[main] Source code updates from dotnet/dotnet

Directory.Build.targets

@@ -9,6 +9,14 @@
     <None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Update="Microsoft.NETCore.App"
+                        Condition="('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)') AND
+                                   ('$(PackAsTool)' != 'true')"
+                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
+                        TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
+  </ItemGroup>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
 

eng/Version.Details.xml

@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="20fdc50b34ee89e7c54eef0a193c30ed4816597a" BarId="271343" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.6.25311.102">
+    <Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.6.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25311.102">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25311.102">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25311.102">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25315.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
+      <Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -16,24 +16,24 @@
     <UsingToolXliff>False</UsingToolXliff>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/runtime">
-    <MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25311.102</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25311.102</MicrosoftNETCorePlatformsVersion>
-    <SystemTextEncodingsWebVersion>10.0.0-preview.6.25311.102</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>10.0.0-preview.6.25311.102</SystemTextJsonVersion>
-    <SystemFormatsAsn1Version>10.0.0-preview.6.25311.102</SystemFormatsAsn1Version>
-    <SystemRuntimeCachingVersion>10.0.0-preview.6.25311.102</SystemRuntimeCachingVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+    <MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25315.102</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25315.102</MicrosoftNETCorePlatformsVersion>
+    <SystemTextEncodingsWebVersion>10.0.0-preview.6.25315.102</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>10.0.0-preview.6.25315.102</SystemTextJsonVersion>
+    <SystemFormatsAsn1Version>10.0.0-preview.6.25315.102</SystemFormatsAsn1Version>
+    <SystemRuntimeCachingVersion>10.0.0-preview.6.25315.102</SystemRuntimeCachingVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/arcade">
-    <MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25311.102</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25315.102</MicrosoftDotNetBuildTasksTemplatingVersion>
   </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>

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

@@ -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/common/cross/build-rootfs.sh

@@ -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/dotnet.cmd

@@ -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/dotnet.ps1

@@ -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.sh

@@ -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/templates/vmr-build-pr.yml

@@ -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/tools.ps1

@@ -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/tools.sh

@@ -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
 

global.json

@@ -18,7 +18,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25311.102",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25311.102"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25315.102",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25315.102"
   }
 }

test/Directory.Build.props

@@ -7,11 +7,4 @@
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Update="Microsoft.NETCore.App"
-                        Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"
-                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
-                        TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
-  </ItemGroup>
-
 </Project>