Skip to content

Commit e8f83b3

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20251004.1 (#120401)
On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25473.1 -> To Version 8.0.0-beta.25504.1 Microsoft.DotNet.XUnitConsoleRunner From Version 2.5.1-beta.25473.1 -> To Version 2.5.1-beta.25504.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent fa47ce3 commit e8f83b3

File tree

7 files changed

+178
-66
lines changed

7 files changed

+178
-66
lines changed

eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25473.1">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25504.1">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
116+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25473.1">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25504.1">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
126+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25473.1">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25504.1">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
130+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25473.1">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25504.1">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
134+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25473.1">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25504.1">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
138+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25473.1">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25504.1">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
142+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25473.1">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25504.1">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
146+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25473.1">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25504.1">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
150+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25473.1">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25504.1">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
154+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25473.1">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25504.1">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
158+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25473.1">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25504.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
162+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25473.1">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25504.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
166+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25473.1">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25504.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
170+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25473.1">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25504.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
174+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25473.1">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25504.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
178+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25473.1">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25504.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
182+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25473.1">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25504.1">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
186+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25467.2">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -338,9 +338,9 @@
338338
<Uri>https://github.com/dotnet/xharness</Uri>
339339
<Sha>fc7f1ca0ff5b949ba7b7500e5aa9a01e4a43d894</Sha>
340340
</Dependency>
341-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25473.1">
341+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25504.1">
342342
<Uri>https://github.com/dotnet/arcade</Uri>
343-
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
343+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
344344
</Dependency>
345345
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
346346
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25473.1</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25473.1</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25473.1</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25473.1</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25473.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25473.1</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25473.1</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25473.1</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25504.1</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25504.1</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25504.1</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25504.1</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25504.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25504.1</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25504.1</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25504.1</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->

eng/common/post-build/nuget-validation.ps1

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,13 @@
22
# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage
33

44
param(
5-
[Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are
6-
[Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to
5+
[Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
76
)
87

98
try {
109
. $PSScriptRoot\post-build-utils.ps1
1110

12-
$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'
13-
14-
New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force
15-
16-
Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1
17-
18-
& ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg
11+
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
1912
}
2013
catch {
2114
Write-Host $_.ScriptStackTrace
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/post-build/post-build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ stages:
134134
displayName: Validate
135135
inputs:
136136
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1
137-
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
138-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
137+
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
139138

140139
- job:
141140
displayName: Signing Validation

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ stages:
132132
inputs:
133133
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1
134134
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
135-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
136135

137136
- job:
138137
displayName: Signing Validation

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "8.0.120"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25473.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25504.1",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25504.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25504.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.10-servicing.24466.9"

0 commit comments

Comments
 (0)