Skip to content

Commit 1caad2e

Browse files
[release/8.0.4xx] Update dependencies from dotnet/arcade (#637)
* Update dependencies from https://github.com/dotnet/arcade build 20251105.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25515.1 -> To Version 8.0.0-beta.25555.2 * Update dependencies from https://github.com/dotnet/arcade build 20251111.7 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25515.1 -> To Version 8.0.0-beta.25561.7 * Update dependencies from https://github.com/dotnet/arcade build 20251112.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25515.1 -> To Version 8.0.0-beta.25562.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent fef21db commit 1caad2e

File tree

7 files changed

+144
-3
lines changed

7 files changed

+144
-3
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25515.1">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
44+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
4545
</Dependency>
4646
</ToolsetDependencies>
4747
</Dependencies>
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<#
2+
.SYNOPSIS
3+
Verifies that Microsoft NuGet packages have proper metadata.
4+
.DESCRIPTION
5+
Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an
6+
error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not
7+
match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script.
8+
.PARAMETER NuGetExePath
9+
The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath
10+
directory.
11+
.PARAMETER PackageSource
12+
The package source to use to download the verification tool. If not provided, nuget.org will be used.
13+
.PARAMETER DownloadPath
14+
The directory path to download the verification tool and nuget.exe to. If not provided,
15+
%TEMP%\NuGet.VerifyNuGetPackage will be used.
16+
.PARAMETER args
17+
Arguments that will be passed to the verification tool.
18+
.EXAMPLE
19+
PS> .\verify.ps1 *.nupkg
20+
Verifies the metadata of all .nupkg files in the currect working directory.
21+
.EXAMPLE
22+
PS> .\verify.ps1 --help
23+
Displays the help text of the downloaded verifiction tool.
24+
.LINK
25+
https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md
26+
#>
27+
28+
# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1
29+
30+
[CmdletBinding(PositionalBinding = $false)]
31+
param(
32+
[string]$NuGetExePath,
33+
[string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
34+
[string]$DownloadPath,
35+
[Parameter(ValueFromRemainingArguments = $true)]
36+
[string[]]$args
37+
)
38+
39+
# The URL to download nuget.exe.
40+
$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe"
41+
42+
# The package ID of the verification tool.
43+
$packageId = "NuGet.VerifyMicrosoftPackage"
44+
45+
# The location that nuget.exe and the verification tool will be downloaded to.
46+
if (!$DownloadPath) {
47+
$DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage")
48+
}
49+
50+
$fence = New-Object -TypeName string -ArgumentList '=', 80
51+
52+
# Create the download directory, if it doesn't already exist.
53+
if (!(Test-Path $DownloadPath)) {
54+
New-Item -ItemType Directory $DownloadPath | Out-Null
55+
}
56+
Write-Host "Using download path: $DownloadPath"
57+
58+
if ($NuGetExePath) {
59+
$nuget = $NuGetExePath
60+
} else {
61+
$downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe"
62+
63+
# Download nuget.exe, if it doesn't already exist.
64+
if (!(Test-Path $downloadedNuGetExe)) {
65+
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
66+
$ProgressPreference = 'SilentlyContinue'
67+
try {
68+
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
69+
$ProgressPreference = 'Continue'
70+
} catch {
71+
$ProgressPreference = 'Continue'
72+
Write-Error $_
73+
Write-Error "nuget.exe failed to download."
74+
exit
75+
}
76+
}
77+
78+
$nuget = $downloadedNuGetExe
79+
}
80+
81+
Write-Host "Using nuget.exe path: $nuget"
82+
Write-Host " "
83+
84+
# Download the latest version of the verification tool.
85+
Write-Host "Downloading the latest version of $packageId from $packageSource..."
86+
Write-Host $fence
87+
& $nuget install $packageId `
88+
-Prerelease `
89+
-OutputDirectory $DownloadPath `
90+
-Source $PackageSource
91+
Write-Host $fence
92+
Write-Host " "
93+
94+
if ($LASTEXITCODE -ne 0) {
95+
Write-Error "nuget.exe failed to fetch the verify tool."
96+
exit
97+
}
98+
99+
# Find the most recently downloaded tool
100+
Write-Host "Finding the most recently downloaded verification tool."
101+
$verifyProbePath = Join-Path $DownloadPath "$packageId.*"
102+
$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory `
103+
| Sort-Object -Property LastWriteTime -Descending `
104+
| Select-Object -First 1
105+
$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe"
106+
Write-Host "Using verification tool: $verify"
107+
Write-Host " "
108+
109+
# Execute the verification tool.
110+
Write-Host "Executing the verify tool..."
111+
Write-Host $fence
112+
& $verify $args
113+
Write-Host $fence
114+
Write-Host " "
115+
116+
# Respond to the exit code.
117+
if ($LASTEXITCODE -ne 0) {
118+
Write-Error "The verify tool found some problems."
119+
} else {
120+
Write-Output "The verify tool succeeded."
121+
}

eng/common/templates-official/job/publish-build-assets.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ jobs:
152152
BARBuildId: ${{ parameters.BARBuildId }}
153153
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
154154

155+
# Darc is targeting 8.0, so make sure it's installed
156+
- task: UseDotNet@2
157+
inputs:
158+
version: 8.0.x
159+
155160
- task: AzureCLI@2
156161
displayName: Publish Using Darc
157162
inputs:

eng/common/templates-official/post-build/post-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ stages:
271271

272272
- task: NuGetAuthenticate@1
273273

274+
# Darc is targeting 8.0, so make sure it's installed
275+
- task: UseDotNet@2
276+
inputs:
277+
version: 8.0.x
278+
274279
- task: AzureCLI@2
275280
displayName: Publish Using Darc
276281
inputs:

eng/common/templates/job/publish-build-assets.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ jobs:
148148
BARBuildId: ${{ parameters.BARBuildId }}
149149
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
150150

151+
# Darc is targeting 8.0, so make sure it's installed
152+
- task: UseDotNet@2
153+
inputs:
154+
version: 8.0.x
155+
151156
- task: AzureCLI@2
152157
displayName: Publish Using Darc
153158
inputs:

eng/common/templates/post-build/post-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,11 @@ stages:
267267

268268
- task: NuGetAuthenticate@1
269269

270+
# Darc is targeting 8.0, so make sure it's installed
271+
- task: UseDotNet@2
272+
inputs:
273+
version: 8.0.x
274+
270275
- task: AzureCLI@2
271276
displayName: Publish Using Darc
272277
inputs:

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
7-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1",
7+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3",
88
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3",
99
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
1010
}

0 commit comments

Comments
 (0)