Skip to content

Commit 1fa51de

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13598)
[main] Source code updates from dotnet/dotnet
1 parent 380e851 commit 1fa51de

File tree

11 files changed

+132
-126
lines changed

11 files changed

+132
-126
lines changed

‎eng/Version.Details.xml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,106 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="04b9001ab9ace9980b9b862278eaafedfe599432" BarId="271708" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4" BarId="271805" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25313.102">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25314.101">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
13+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25313.102">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25314.101">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
17+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25313.102">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25314.101">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
21+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25313.102">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25314.101">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
25+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25313.102">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25314.101">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
29+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25313.102">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25314.101">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
33+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25313.102">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25314.101">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
37+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25313.102">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25314.101">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
41+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25313.102">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25314.101">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
45+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25313.102">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25314.101">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
49+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25313.102">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25314.101">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
53+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25313.102">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25314.101">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
57+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25313.102">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25314.101">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
61+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25313.102">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25314.101">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
65+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25313.102">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25314.101">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
69+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25313.102">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25314.101">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
73+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25313.102">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25314.101">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
77+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25313.102">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25314.101">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
81+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25313.102">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25314.101">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
88+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25313.102">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25314.101">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
92+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25313.102">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25314.101">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
96+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25313.102">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25314.101">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
100+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25313.102">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25314.101">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
104+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25313.102">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25314.101">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>04b9001ab9ace9980b9b862278eaafedfe599432</Sha>
108+
<Sha>005f36cd1953e1308c1882a9d2e1fc1e84e6b2e4</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1111
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1212
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
13-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25313.102</SystemReflectionMetadataLoadContextVersion>
14-
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25313.102</SystemTextEncodingsWebVersion>
13+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25314.101</SystemReflectionMetadataLoadContextVersion>
14+
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25314.101</SystemTextEncodingsWebVersion>
1515
</PropertyGroup>
1616
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1717
<PropertyGroup>
18-
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25313.102</SystemFormatsNrbfPackageVersion>
19-
<SystemIOHashingPackageVersion>10.0.0-preview.6.25313.102</SystemIOHashingPackageVersion>
18+
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25314.101</SystemFormatsNrbfPackageVersion>
19+
<SystemIOHashingPackageVersion>10.0.0-preview.6.25314.101</SystemIOHashingPackageVersion>
2020
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
21-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCoreILDAsmPackageVersion>
21+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCoreILDAsmPackageVersion>
2222
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
23-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25313.102</SystemRuntimeSerializationFormattersPackageVersion>
24-
<SystemTextJsonPackageVersion>10.0.0-preview.6.25313.102</SystemTextJsonPackageVersion>
25-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCoreAppRefPackageVersion>
26-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCorePlatformsPackageVersion>
27-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25313.102</MicrosoftWin32SystemEventsPackageVersion>
28-
<SystemCodeDomPackageVersion>10.0.0-preview.6.25313.102</SystemCodeDomPackageVersion>
29-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25313.102</SystemConfigurationConfigurationManagerPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25313.102</SystemResourcesExtensionsPackageVersion>
23+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25314.101</SystemRuntimeSerializationFormattersPackageVersion>
24+
<SystemTextJsonPackageVersion>10.0.0-preview.6.25314.101</SystemTextJsonPackageVersion>
25+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCoreAppRefPackageVersion>
26+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCorePlatformsPackageVersion>
27+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25314.101</MicrosoftWin32SystemEventsPackageVersion>
28+
<SystemCodeDomPackageVersion>10.0.0-preview.6.25314.101</SystemCodeDomPackageVersion>
29+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25314.101</SystemConfigurationConfigurationManagerPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25314.101</SystemResourcesExtensionsPackageVersion>
3131
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
32-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25313.102</SystemWindowsExtensionsPackageVersion>
33-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25313.102</MicrosoftNETCoreILAsmPackageVersion>
34-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25313.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25313.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36-
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25313.102</MicrosoftNETSdkILVersion>
32+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25314.101</SystemWindowsExtensionsPackageVersion>
33+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25314.101</MicrosoftNETCoreILAsmPackageVersion>
34+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25314.101</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25314.101</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36+
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25314.101</MicrosoftNETSdkILVersion>
3737
<!--
3838
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
3939
-->
@@ -46,9 +46,9 @@
4646
</PropertyGroup>
4747
<!-- Arcade -->
4848
<PropertyGroup>
49-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25313.102</MicrosoftDotNetGenFacadesPackageVersion>
50-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25313.102</MicrosoftDotNetRemoteExecutorVersion>
51-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25313.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
49+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25314.101</MicrosoftDotNetGenFacadesPackageVersion>
50+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25314.101</MicrosoftDotNetRemoteExecutorVersion>
51+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25314.101</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
5252
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5353
</PropertyGroup>
5454
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
parameters:
22
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

77
steps:
88
- task: UseDotNet@2
9-
displayName: "Source Index: Use .NET 8 SDK"
9+
displayName: "Source Index: Use .NET 9 SDK"
1010
inputs:
1111
packageType: sdk
12-
version: 8.0.x
12+
version: 9.0.x
1313
installationPath: $(Agent.TempDirectory)/dotnet
1414
workingDirectory: $(Agent.TempDirectory)
1515

‎eng/common/cross/build-rootfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ while :; do
295295
;;
296296
noble) # Ubuntu 24.04
297297
__CodeName=noble
298-
if [[ -n "$__LLDB_Package" ]]; then
299-
__LLDB_Package="liblldb-18-dev"
298+
if [[ -z "$__LLDB_Package" ]]; then
299+
__LLDB_Package="liblldb-19-dev"
300300
fi
301301
;;
302302
stretch) # Debian 9

‎eng/common/dotnet.cmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
3+
:: This script is used to install the .NET SDK.
4+
:: It will also invoke the SDK with any provided arguments.
5+
6+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*"
7+
exit /b %ErrorLevel%

‎eng/common/dotnet.ps1

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This script is used to install the .NET SDK.
2+
# It will also invoke the SDK with any provided arguments.
3+
4+
. $PSScriptRoot\tools.ps1
5+
$dotnetRoot = InitializeDotNetCli -install:$true
6+
7+
# Invoke acquired SDK with args if they are provided
8+
if ($args.count -gt 0) {
9+
$env:DOTNET_NOLOGO=1
10+
& "$dotnetRoot\dotnet.exe" $args
11+
}

‎eng/common/dotnet.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
3+
# This script is used to install the .NET SDK.
4+
# It will also invoke the SDK with any provided arguments.
5+
6+
source="${BASH_SOURCE[0]}"
7+
# resolve $SOURCE until the file is no longer a symlink
8+
while [[ -h $source ]]; do
9+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
10+
source="$(readlink "$source")"
11+
12+
# if $source was a relative symlink, we need to resolve it relative to the path where the
13+
# symlink file was located
14+
[[ $source != /* ]] && source="$scriptroot/$source"
15+
done
16+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
17+
18+
source $scriptroot/tools.sh
19+
InitializeDotNetCli true # install
20+
21+
# Invoke acquired SDK with args if they are provided
22+
if [[ $# > 0 ]]; then
23+
__dotnetDir=${_InitializeDotNetCli}
24+
dotnetPath=${__dotnetDir}/dotnet
25+
${dotnetPath} "$@"
26+
fi

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
trigger: none
2-
pr:
3-
branches:
4-
include:
5-
- main
6-
- release/*
7-
paths:
8-
exclude:
9-
- documentation/*
10-
- README.md
11-
- CODEOWNERS
2+
pr: none
123

134
variables:
145
- template: /eng/common/templates/variables/pool-providers.yml@self

‎eng/common/tools.ps1

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -765,28 +765,13 @@ function MSBuild() {
765765

766766
$toolsetBuildProject = InitializeToolset
767767
$basePath = Split-Path -parent $toolsetBuildProject
768-
$possiblePaths = @(
769-
# new scripts need to work with old packages, so we need to look for the old names/versions
770-
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
771-
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
772-
773-
# This list doesn't need to be updated anymore and can eventually be removed.
774-
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')),
775-
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
776-
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
777-
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
778-
)
779-
$selectedPath = $null
780-
foreach ($path in $possiblePaths) {
781-
if (Test-Path $path -PathType Leaf) {
782-
$selectedPath = $path
783-
break
784-
}
785-
}
768+
$selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
769+
786770
if (-not $selectedPath) {
787-
Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
771+
Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath"
788772
ExitWithExitCode 1
789773
}
774+
790775
$args += "/logger:$selectedPath"
791776
}
792777

0 commit comments

Comments
 (0)