Skip to content

[main] Source code updates from dotnet/dotnet #13598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 15, 2025
Merged

[main] Source code updates from dotnet/dotnet #13598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0118d1
Merging main into darc-main-518e8ed1-9c03-4359-814d-2f7882c621e4
dotnet-maestro[bot] Jun 15, 2025
356731e
Update dependencies from https://github.com/dotnet/dotnet build 271805
dotnet-maestro[bot] Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 49 additions & 49 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,106 +6,106 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="04b9001ab9ace9980b9b862278eaafedfe599432" BarId="271708" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4" BarId="271805" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25313.102">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25313.102">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25313.102">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25313.102">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25313.102">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25313.102">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25313.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25313.102">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25313.102">
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25313.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25313.102">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25313.102">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25313.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25313.102">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25313.102">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25314.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
42 changes: 21 additions & 21 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25313.102</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25313.102</SystemTextEncodingsWebVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25314.101</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25314.101</SystemTextEncodingsWebVersion>
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25313.102</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.6.25313.102</SystemIOHashingPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25314.101</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.6.25314.101</SystemIOHashingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCoreILDAsmPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25313.102</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.6.25313.102</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25313.102</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25313.102</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25313.102</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25313.102</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25314.101</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.6.25314.101</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25314.101</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25314.101</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25314.101</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25314.101</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25313.102</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25313.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25313.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25313.102</MicrosoftNETSdkILVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25314.101</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25314.101</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25314.101</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25314.101</MicrosoftNETSdkILVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand All @@ -46,9 +46,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25313.102</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25313.102</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25313.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25314.101</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25314.101</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25314.101</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
6 changes: 3 additions & 3 deletions eng/common/core-templates/steps/source-index-stage1-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 2 additions & 2 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions eng/common/dotnet.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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%
11 changes: 11 additions & 0 deletions eng/common/dotnet.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
26 changes: 26 additions & 0 deletions eng/common/dotnet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
11 changes: 1 addition & 10 deletions eng/common/templates/vmr-build-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
23 changes: 4 additions & 19 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
Loading
Loading