Skip to content

Commit 55df982

Browse files
Merged PR 54332: merge from public
2 parents 0a1d37a + 106044d commit 55df982

Some content is hidden

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

49 files changed

+329
-130
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ stages:
545545
isAzDOTestingJob: true
546546
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
547547
beforeBuild:
548-
- bash: "./eng/scripts/install-nginx-mac.sh"
548+
- bash: "./eng/scripts/install-nginx.sh"
549549
displayName: Installing Nginx
550550
artifacts:
551551
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -566,7 +566,7 @@ stages:
566566
useHostedUbuntu: false
567567
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
568568
beforeBuild:
569-
- bash: "./eng/scripts/install-nginx-linux.sh"
569+
- bash: "./eng/scripts/install-nginx.sh"
570570
displayName: Installing Nginx
571571
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
572572
displayName: Increase inotify limit

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ extends:
610610
isAzDOTestingJob: true
611611
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
612612
beforeBuild:
613-
- bash: "./eng/scripts/install-nginx-mac.sh"
613+
- bash: "./eng/scripts/install-nginx.sh"
614614
displayName: Installing Nginx
615615
artifacts:
616616
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -631,7 +631,7 @@ extends:
631631
useHostedUbuntu: false
632632
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
633633
beforeBuild:
634-
- bash: "./eng/scripts/install-nginx-linux.sh"
634+
- bash: "./eng/scripts/install-nginx.sh"
635635
displayName: Installing Nginx
636636
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
637637
displayName: Increase inotify limit

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@
338338
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
339339
<SourceBuild RepoName="xdt" ManagedOnly="true" />
340340
</Dependency>
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25428.6">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25507.1">
342342
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
343-
<Sha>0b4984f8ee945e02a39ef0f72dc9f7ceab65c14f</Sha>
343+
<Sha>7a3266db9e2b7422e8277f04932eff9b7064b66e</Sha>
344344
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
345345
</Dependency>
346346
<!-- Not updated automatically -->
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25504.1">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
381+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25407.1">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25504.1">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
386+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25407.1">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25504.1">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
390+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25504.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
394+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25407.1">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25504.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
398+
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.9.24518.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>8</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>21</AspNetCorePatchVersion>
11+
<AspNetCorePatchVersion>22</AspNetCorePatchVersion>
1212
<PreReleaseVersionIteration>
1313
</PreReleaseVersionIteration>
14-
<ValidateBaseline>true</ValidateBaseline>
14+
<ValidateBaseline>false</ValidateBaseline>
1515
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">7.1.2</IdentityModelVersion>
1616
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">7.*</IdentityModelVersion>
1717
<!--
@@ -162,13 +162,13 @@
162162
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
163163
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
164164
<!-- Packages from dotnet/arcade -->
165-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksInstallersVersion>
166-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksTemplatingVersion>
167-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25407.1</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksInstallersVersion>
166+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25504.1</MicrosoftDotNetBuildTasksTemplatingVersion>
167+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25504.1</MicrosoftDotNetRemoteExecutorVersion>
168168
<!-- Packages from dotnet/source-build-externals -->
169169
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.25202.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->
171-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25428.6</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
171+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25507.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
172172
<!-- Packages from dotnet/symreader -->
173173
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
174174
<!-- Packages from dotnet/runtime -->

eng/common/SetupNugetSources.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# displayName: Setup Private Feeds Credentials
1818
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1919
# inputs:
20-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
21-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
20+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
21+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
2222
# env:
2323
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
2424

eng/common/SetupNugetSources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# - task: Bash@3
1919
# displayName: Setup Private Feeds Credentials
2020
# inputs:
21-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
22-
# arguments: $(Build.SourcesDirectory)/NuGet.config $Token
21+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
22+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token
2323
# condition: ne(variables['Agent.OS'], 'Windows_NT')
2424
# env:
2525
# Token: $(dn-bot-dnceng-artifact-feeds-rw)

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/job/job.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ parameters:
3838
# Sbom related params
3939
enableSbom: true
4040
PackageVersion: 7.0.0
41-
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
41+
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
4242
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
4343

4444
jobs:
@@ -167,7 +167,7 @@ jobs:
167167
inputs:
168168
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
169169
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
170-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
170+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
171171
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
172172
continueOnError: true
173173

@@ -226,7 +226,7 @@ jobs:
226226
- task: 1ES.PublishBuildArtifacts@1
227227
displayName: Publish Logs
228228
inputs:
229-
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
229+
PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)'
230230
PublishLocation: Container
231231
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
232232
continueOnError: true
@@ -238,7 +238,7 @@ jobs:
238238
inputs:
239239
testResultsFormat: 'xUnit'
240240
testResultsFiles: '*.xml'
241-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
241+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
242242
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
243243
mergeTestResults: ${{ parameters.mergeTestResults }}
244244
continueOnError: true
@@ -249,7 +249,7 @@ jobs:
249249
inputs:
250250
testResultsFormat: 'VSTest'
251251
testResultsFiles: '*.trx'
252-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
252+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
253253
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
254254
mergeTestResults: ${{ parameters.mergeTestResults }}
255255
continueOnError: true
@@ -265,7 +265,7 @@ jobs:
265265
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
266266
- task: 1ES.PublishPipelineArtifact@1
267267
inputs:
268-
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
268+
targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration'
269269
artifactName: 'BuildConfiguration'
270270
displayName: 'Publish build retry configuration'
271271
continueOnError: true

eng/common/templates-official/job/onelocbuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

11-
SourcesDirectory: $(Build.SourcesDirectory)
11+
SourcesDirectory: $(System.DefaultWorkingDirectory)
1212
CreatePr: true
1313
AutoCompletePr: false
1414
ReusePr: true
@@ -63,7 +63,7 @@ jobs:
6363
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6464
- task: Powershell@2
6565
inputs:
66-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
66+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
6767
arguments: $(_GenerateLocProjectArguments)
6868
displayName: Generate LocProject.json
6969
condition: ${{ parameters.condition }}
@@ -106,7 +106,7 @@ jobs:
106106
- task: 1ES.PublishBuildArtifacts@1
107107
displayName: Publish LocProject.json
108108
inputs:
109-
PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
109+
PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
110110
PublishLocation: Container
111111
ArtifactName: Loc
112112
condition: ${{ parameters.condition }}

0 commit comments

Comments
 (0)