From 6a40be993853c991a7b26ef46b685a669a251c77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Sep 2025 02:04:52 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20250918.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25468.2 --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index a60874c07461..fe28c7414422 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a723b3f16fe8..24300162cbd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index cba3a2ef7597..cf55fc27cae3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25465.1 + 8.0.0-beta.25468.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25465.1 + 8.0.0-beta.25468.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index bac07ff8aacc..1dc34182c654 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25465.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25465.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25468.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25468.2" } } From 8bbd1eedf69881629f5be444a0dd44a3867197da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Sep 2025 21:33:16 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20250923.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25473.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24300162cbd8..435c03eac972 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index cf55fc27cae3..e7626b92f1c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25468.2 + 8.0.0-beta.25473.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25468.2 + 8.0.0-beta.25473.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 1dc34182c654..ab78721eca2c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25468.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25468.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1" } } From e51d2d2dd442e44006c73e7792347798a073090a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Sep 2025 02:02:59 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20250925.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25475.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 435c03eac972..83378a3a5ef7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e7626b92f1c0..f43221b862bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25473.1 + 8.0.0-beta.25475.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25473.1 + 8.0.0-beta.25475.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index ab78721eca2c..4e4cc5f8451d 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25475.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25475.2" } } From 0d170165a407f70a2ba48ec05bbb89fe4dff3216 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Oct 2025 14:59:47 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20251004.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25504.1 --- eng/Version.Details.xml | 16 +-- eng/Versions.props | 4 +- eng/common/post-build/nuget-validation.ps1 | 11 +- eng/common/post-build/nuget-verification.ps1 | 121 ++++++++++++++++++ .../post-build/post-build.yml | 3 +- .../templates/post-build/post-build.yml | 1 - global.json | 4 +- 7 files changed, 136 insertions(+), 24 deletions(-) create mode 100644 eng/common/post-build/nuget-verification.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83378a3a5ef7..b8a39f30890d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index f43221b862bd..a3f7c834a454 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25475.2 + 8.0.0-beta.25504.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25475.2 + 8.0.0-beta.25504.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index dab3534ab538..22b1c4dfe4a7 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -2,20 +2,13 @@ # tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage param( - [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are - [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to + [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) try { . $PSScriptRoot\post-build-utils.ps1 - $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1' - - New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force - - Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 - - & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg + & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } catch { Write-Host $_.ScriptStackTrace diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 new file mode 100644 index 000000000000..8467dbf8e7c2 --- /dev/null +++ b/eng/common/post-build/nuget-verification.ps1 @@ -0,0 +1,121 @@ +<# +.SYNOPSIS + Verifies that Microsoft NuGet packages have proper metadata. +.DESCRIPTION + Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an + error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not + match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. +.PARAMETER NuGetExePath + The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath + directory. +.PARAMETER PackageSource + The package source to use to download the verification tool. If not provided, nuget.org will be used. +.PARAMETER DownloadPath + The directory path to download the verification tool and nuget.exe to. If not provided, + %TEMP%\NuGet.VerifyNuGetPackage will be used. +.PARAMETER args + Arguments that will be passed to the verification tool. +.EXAMPLE + PS> .\verify.ps1 *.nupkg + Verifies the metadata of all .nupkg files in the currect working directory. +.EXAMPLE + PS> .\verify.ps1 --help + Displays the help text of the downloaded verifiction tool. +.LINK + https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md +#> + +# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 + +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$NuGetExePath, + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", + [string]$DownloadPath, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$args +) + +# The URL to download nuget.exe. +$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" + +# The package ID of the verification tool. +$packageId = "NuGet.VerifyMicrosoftPackage" + +# The location that nuget.exe and the verification tool will be downloaded to. +if (!$DownloadPath) { + $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") +} + +$fence = New-Object -TypeName string -ArgumentList '=', 80 + +# Create the download directory, if it doesn't already exist. +if (!(Test-Path $DownloadPath)) { + New-Item -ItemType Directory $DownloadPath | Out-Null +} +Write-Host "Using download path: $DownloadPath" + +if ($NuGetExePath) { + $nuget = $NuGetExePath +} else { + $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" + + # Download nuget.exe, if it doesn't already exist. + if (!(Test-Path $downloadedNuGetExe)) { + Write-Host "Downloading nuget.exe from $nugetExeUrl..." + $ProgressPreference = 'SilentlyContinue' + try { + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + $ProgressPreference = 'Continue' + } catch { + $ProgressPreference = 'Continue' + Write-Error $_ + Write-Error "nuget.exe failed to download." + exit + } + } + + $nuget = $downloadedNuGetExe +} + +Write-Host "Using nuget.exe path: $nuget" +Write-Host " " + +# Download the latest version of the verification tool. +Write-Host "Downloading the latest version of $packageId from $packageSource..." +Write-Host $fence +& $nuget install $packageId ` + -Prerelease ` + -OutputDirectory $DownloadPath ` + -Source $PackageSource +Write-Host $fence +Write-Host " " + +if ($LASTEXITCODE -ne 0) { + Write-Error "nuget.exe failed to fetch the verify tool." + exit +} + +# Find the most recently downloaded tool +Write-Host "Finding the most recently downloaded verification tool." +$verifyProbePath = Join-Path $DownloadPath "$packageId.*" +$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` + | Sort-Object -Property LastWriteTime -Descending ` + | Select-Object -First 1 +$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" +Write-Host "Using verification tool: $verify" +Write-Host " " + +# Execute the verification tool. +Write-Host "Executing the verify tool..." +Write-Host $fence +& $verify $args +Write-Host $fence +Write-Host " " + +# Respond to the exit code. +if ($LASTEXITCODE -ne 0) { + Write-Error "The verify tool found some problems." +} else { + Write-Output "The verify tool succeeded." +} \ No newline at end of file diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 9fef8103991c..817e2d80dea1 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -134,8 +134,7 @@ stages: displayName: Validate inputs: filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 6e5722dc2e17..ea1785a8aa26 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -132,7 +132,6 @@ stages: inputs: filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation diff --git a/global.json b/global.json index 4e4cc5f8451d..0b7ae0dd1ace 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25475.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25475.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25504.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25504.1" } }