Skip to content

Commit b79f92e

Browse files
authored
[release/9.0.2xx] Update dependencies from dotnet/arcade (#48735)
2 parents 1571da5 + 989df8a commit b79f92e

File tree

124 files changed

+6546
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+6546
-23
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25208.6">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
560+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25208.6">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25255.5">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
564+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25208.6">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25255.5">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
568+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25208.6">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25255.5">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
572+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25208.6">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25255.5">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
576+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25208.6">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25255.5">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
580+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25208.6">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25255.5">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
585+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.4">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,10 @@
268268
</PropertyGroup>
269269
<PropertyGroup>
270270
<!-- Dependencies from https://github.com/dotnet/arcade -->
271-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25208.6</MicrosoftDotNetSignToolVersion>
273-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25208.6</MicrosoftDotNetXliffTasksVersion>
274-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25208.6</MicrosoftDotNetXUnitExtensionsVersion>
271+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25255.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25255.5</MicrosoftDotNetSignToolVersion>
273+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25255.5</MicrosoftDotNetXliffTasksVersion>
274+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25255.5</MicrosoftDotNetXUnitExtensionsVersion>
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

eng/common/core-templates/job/source-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ parameters:
2626
# Specifies the build script to invoke to perform the build in the repo. The default
2727
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2828
# difficult situations.
29+
# buildArguments: ''
30+
# Specifies additional build arguments to pass to the build script.
2931
# jobProperties: {}
3032
# A list of job properties to inject at the top level, for potential extensibility beyond
3133
# container and pool.

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ steps:
7979
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8080
--configuration $buildConfig \
8181
--restore --build --pack $publishArgs -bl \
82+
${{ parameters.platform.buildArguments }} \
8283
$officialBuildArgs \
8384
$internalRuntimeDownloadArgs \
8485
$internalRestoreArgs \

eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
44
</packages>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.6",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"RetryCountLimit": 1,
3+
"RetryByAnyError": false
4+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@{
2+
IncludeRules=@('PSAvoidUsingCmdletAliases',
3+
'PSAvoidUsingWMICmdlet',
4+
'PSAvoidUsingPositionalParameters',
5+
'PSAvoidUsingInvokeExpression',
6+
'PSUseDeclaredVarsMoreThanAssignments',
7+
'PSUseCmdletCorrectly',
8+
'PSStandardDSCFunctionsInResource',
9+
'PSUseIdenticalMandatoryParametersForDSC',
10+
'PSUseIdenticalParametersForDSC')
11+
}

src/arcade/eng/common/README.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Don't touch this folder
2+
3+
uuuuuuuuuuuuuuuuuuuu
4+
u" uuuuuuuuuuuuuuuuuu "u
5+
u" u$$$$$$$$$$$$$$$$$$$$u "u
6+
u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u
7+
u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
8+
u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
9+
u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
10+
$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
11+
$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
12+
$ $$$" ... "$... ...$" ... "$$$ ... "$$$ $
13+
$ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $
14+
$ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $
15+
$ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $
16+
$ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $
17+
$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
18+
"u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
19+
"u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
20+
"u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
21+
"u "$$$$$$$$$$$$$$$$$$$$$$$$" u"
22+
"u "$$$$$$$$$$$$$$$$$$$$" u"
23+
"u """""""""""""""""" u"
24+
""""""""""""""""""""
25+
26+
!!! Changes made in this directory are subject to being overwritten by automation !!!
27+
28+
The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first.
Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3+
# disabled internal Maestro (darc-int*) feeds.
4+
#
5+
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
6+
#
7+
# See example call for this script below.
8+
#
9+
# - task: PowerShell@2
10+
# displayName: Setup Private Feeds Credentials
11+
# condition: eq(variables['Agent.OS'], 'Windows_NT')
12+
# inputs:
13+
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
15+
# env:
16+
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
17+
#
18+
# Note that the NuGetAuthenticate task should be called after SetupNugetSources.
19+
# This ensures that:
20+
# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt)
21+
# - The credential provider is installed.
22+
#
23+
# This logic is also abstracted into enable-internal-sources.yml.
24+
25+
[CmdletBinding()]
26+
param (
27+
[Parameter(Mandatory = $true)][string]$ConfigFile,
28+
$Password
29+
)
30+
31+
$ErrorActionPreference = "Stop"
32+
Set-StrictMode -Version 2.0
33+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
34+
35+
. $PSScriptRoot\tools.ps1
36+
37+
# Add source entry to PackageSources
38+
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
39+
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
40+
41+
if ($packageSource -eq $null)
42+
{
43+
$packageSource = $doc.CreateElement("add")
44+
$packageSource.SetAttribute("key", $SourceName)
45+
$packageSource.SetAttribute("value", $SourceEndPoint)
46+
$sources.AppendChild($packageSource) | Out-Null
47+
}
48+
else {
49+
Write-Host "Package source $SourceName already present."
50+
}
51+
52+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
53+
}
54+
55+
# Add a credential node for the specified source
56+
function AddCredential($creds, $source, $username, $pwd) {
57+
# If no cred supplied, don't do anything.
58+
if (!$pwd) {
59+
return;
60+
}
61+
62+
# Looks for credential configuration for the given SourceName. Create it if none is found.
63+
$sourceElement = $creds.SelectSingleNode($Source)
64+
if ($sourceElement -eq $null)
65+
{
66+
$sourceElement = $doc.CreateElement($Source)
67+
$creds.AppendChild($sourceElement) | Out-Null
68+
}
69+
70+
# Add the <Username> node to the credential if none is found.
71+
$usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']")
72+
if ($usernameElement -eq $null)
73+
{
74+
$usernameElement = $doc.CreateElement("add")
75+
$usernameElement.SetAttribute("key", "Username")
76+
$sourceElement.AppendChild($usernameElement) | Out-Null
77+
}
78+
$usernameElement.SetAttribute("value", $Username)
79+
80+
# Add the <ClearTextPassword> to the credential if none is found.
81+
# Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs.
82+
# -> https://github.com/NuGet/Home/issues/5526
83+
$passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']")
84+
if ($passwordElement -eq $null)
85+
{
86+
$passwordElement = $doc.CreateElement("add")
87+
$passwordElement.SetAttribute("key", "ClearTextPassword")
88+
$sourceElement.AppendChild($passwordElement) | Out-Null
89+
}
90+
91+
$passwordElement.SetAttribute("value", $pwd)
92+
}
93+
94+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
95+
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
96+
97+
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
98+
99+
ForEach ($PackageSource in $maestroPrivateSources) {
100+
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
101+
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
102+
}
103+
}
104+
105+
function EnablePrivatePackageSources($DisabledPackageSources) {
106+
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
107+
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
108+
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
109+
# Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
110+
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
111+
}
112+
}
113+
114+
if (!(Test-Path $ConfigFile -PathType Leaf)) {
115+
Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile"
116+
ExitWithExitCode 1
117+
}
118+
119+
# Load NuGet.config
120+
$doc = New-Object System.Xml.XmlDocument
121+
$filename = (Get-Item $ConfigFile).FullName
122+
$doc.Load($filename)
123+
124+
# Get reference to <PackageSources> or create one if none exist already
125+
$sources = $doc.DocumentElement.SelectSingleNode("packageSources")
126+
if ($sources -eq $null) {
127+
$sources = $doc.CreateElement("packageSources")
128+
$doc.DocumentElement.AppendChild($sources) | Out-Null
129+
}
130+
131+
$creds = $null
132+
if ($Password) {
133+
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
134+
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
135+
if ($creds -eq $null) {
136+
$creds = $doc.CreateElement("packageSourceCredentials")
137+
$doc.DocumentElement.AppendChild($creds) | Out-Null
138+
}
139+
}
140+
141+
# Check for disabledPackageSources; we'll enable any darc-int ones we find there
142+
$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources")
143+
if ($disabledSources -ne $null) {
144+
Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
145+
EnablePrivatePackageSources -DisabledPackageSources $disabledSources
146+
}
147+
148+
$userName = "dn-bot"
149+
150+
# Insert credential nodes for Maestro's private feeds
151+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
152+
153+
# 3.1 uses a different feed url format so it's handled differently here
154+
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
155+
if ($dotnet31Source -ne $null) {
156+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
157+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158+
}
159+
160+
$dotnetVersions = @('5','6','7','8','9')
161+
162+
foreach ($dotnetVersion in $dotnetVersions) {
163+
$feedPrefix = "dotnet" + $dotnetVersion;
164+
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
165+
if ($dotnetSource -ne $null) {
166+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
167+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
168+
}
169+
}
170+
171+
$doc.Save($filename)

0 commit comments

Comments
 (0)