Skip to content

Commit f0f9c17

Browse files
dotnet-maestro[bot]vzarytovskii
dotnet-maestro[bot]
and
vzarytovskii
authored
[main] Update dependencies from dotnet/arcade (#12310)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <[email protected]>
1 parent 641ace3 commit f0f9c17

File tree

12 files changed

+105
-79
lines changed

12 files changed

+105
-79
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21527.1">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21566.10">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
13+
<Sha>53cc1bc2e555aa7aea95884575d22e21d63708cf</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
1616
</ToolsetDependencies>

‎eng/common/msbuild.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Param(
66
[switch] $ci,
77
[switch] $prepareMachine,
88
[switch] $excludePrereleaseVS,
9+
[string] $msbuildEngine = $null,
910
[Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs
1011
)
1112

‎eng/common/post-build/symbols-validation.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ $CountMissingSymbols = {
134134
# Save the output and get diagnostic output
135135
$output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String
136136

137-
if (Test-Path $PdbPath) {
138-
return 'PDB'
137+
if ((Test-Path $PdbPath) -and (Test-path $SymbolPath)) {
138+
return 'Module and PDB for Module'
139139
}
140-
elseif (Test-Path $NGenPdb) {
141-
return 'NGen PDB'
140+
elseif ((Test-Path $NGenPdb) -and (Test-Path $PdbPath) -and (Test-Path $SymbolPath)) {
141+
return 'Dll, PDB and NGen PDB'
142142
}
143-
elseif (Test-Path $SODbg) {
144-
return 'DBG for SO'
143+
elseif ((Test-Path $SODbg) -and (Test-Path $SymbolPath)) {
144+
return 'So and DBG for SO'
145145
}
146-
elseif (Test-Path $DylibDwarf) {
147-
return 'Dwarf for Dylib'
146+
elseif ((Test-Path $DylibDwarf) -and (Test-Path $SymbolPath)) {
147+
return 'Dylib and Dwarf for Dylib'
148148
}
149149
elseif (Test-Path $SymbolPath) {
150150
return 'Module'

‎eng/common/sdl/execute-all-sdl-tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ try {
124124
Exec-BlockVerbosely {
125125
& $(Join-Path $PSScriptRoot 'run-sdl.ps1') `
126126
-GuardianCliLocation $guardianCliLocation `
127-
-WorkingDirectory $workingDirectory `
127+
-WorkingDirectory $SourceDirectory `
128128
-UpdateBaseline $UpdateBaseline `
129129
-GdnFolder $gdnFolder
130130
}

‎eng/common/templates/job/execute-sdl.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ jobs:
6060
- name: GuardianPackagesConfigFile
6161
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
6262
pool:
63-
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
64-
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
65-
name: Hosted VS2017
66-
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
67-
vmImage: windows-2019
63+
vmImage: windows-2019
6864
steps:
6965
- checkout: self
7066
clean: true

‎eng/common/templates/job/onelocbuild.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ parameters:
44

55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool:
7-
vmImage: vs2017-win2016
7+
vmImage: 'windows-2019'
88

99
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
1010
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1111

1212
SourcesDirectory: $(Build.SourcesDirectory)
1313
CreatePr: true
1414
AutoCompletePr: false
15+
ReusePr: true
1516
UseLfLineEndings: true
1617
UseCheckedInLocProjectJson: false
1718
LanguageSet: VS_Main_Languages
@@ -64,6 +65,8 @@ jobs:
6465
${{ if eq(parameters.CreatePr, true) }}:
6566
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
6667
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
68+
${{ if eq(parameters.RepoType, 'gitHub') }}:
69+
isShouldReusePrSelected: ${{ parameters.ReusePr }}
6770
packageSourceAuth: patAuth
6871
patVariable: ${{ parameters.CeapexPat }}
6972
${{ if eq(parameters.RepoType, 'gitHub') }}:

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34-
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
35-
# source-build builds run in Docker, including the default managed platform.
36-
defaultContainerHostPool:
37-
vmImage: ubuntu-20.04
38-
3934
jobs:
4035
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
4136
displayName: Source-Build (${{ parameters.platform.name }})
@@ -47,7 +42,15 @@ jobs:
4742
container: ${{ parameters.platform.container }}
4843

4944
${{ if eq(parameters.platform.pool, '') }}:
50-
pool: ${{ parameters.defaultContainerHostPool }}
45+
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
46+
# source-build builds run in Docker, including the default managed platform.
47+
pool:
48+
${{ if eq(variables['System.TeamProject'], 'public') }}:
49+
name: NetCore1ESPool-Public
50+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
51+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
52+
name: NetCore1ESPool-Internal
53+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
5154
${{ if ne(parameters.platform.pool, '') }}:
5255
pool: ${{ parameters.platform.pool }}
5356

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ parameters:
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
77
binlogPath: artifacts/log/Debug/Build.binlog
8-
pool:
9-
vmImage: vs2017-win2016
108
condition: ''
119
dependsOn: ''
1210

@@ -24,7 +22,13 @@ jobs:
2422
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
2523
- group: source-dot-net stage1 variables
2624

27-
pool: ${{ parameters.pool }}
25+
pool:
26+
${{ if eq(variables['System.TeamProject'], 'public') }}:
27+
name: NetCore1ESPool-Public
28+
demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
29+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
30+
name: NetCore1ESPool-Internal
31+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
2832
steps:
2933
- ${{ each preStep in parameters.preSteps }}:
3034
- ${{ preStep }}

‎eng/common/templates/jobs/jobs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- ${{ if eq(parameters.enableSourceBuild, true) }}:
8484
- Source_Build_Complete
8585
pool:
86-
vmImage: vs2017-win2016
86+
vmImage: 'windows-2019'
8787
runAsPublic: ${{ parameters.runAsPublic }}
8888
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
8989
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -96,4 +96,4 @@ jobs:
9696
dependsOn:
9797
- Asset_Registry_Publish
9898
pool:
99-
vmImage: vs2017-win2016
99+
vmImage: 'windows-2019'

‎eng/common/tools.ps1‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -301,31 +301,44 @@ function InstallDotNet([string] $dotnetRoot,
301301
if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
302302
if ($noPath) { $installParameters.NoPath = $True }
303303

304-
try {
305-
& $installScript @installParameters
306-
}
307-
catch {
308-
if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
309-
Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'"
310-
if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
304+
$variations = @()
305+
$variations += @($installParameters)
311306

312-
if ($runtimeSourceFeedKey) {
313-
$decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
314-
$decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
315-
$installParameters.FeedCredential = $decodedString
316-
}
307+
$dotnetBuilds = $installParameters.Clone()
308+
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
309+
$variations += @($dotnetBuilds)
317310

318-
try {
319-
& $installScript @installParameters
320-
}
321-
catch {
322-
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'."
323-
ExitWithExitCode 1
324-
}
311+
if ($runtimeSourceFeed) {
312+
$runtimeSource = $installParameters.Clone()
313+
$runtimeSource.AzureFeed = $runtimeSourceFeed
314+
if ($runtimeSourceFeedKey) {
315+
$decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
316+
$decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
317+
$runtimeSource.FeedCredential = $decodedString
318+
}
319+
$variations += @($runtimeSource)
320+
}
321+
322+
$installSuccess = $false
323+
foreach ($variation in $variations) {
324+
if ($variation | Get-Member AzureFeed) {
325+
$location = $variation.AzureFeed
325326
} else {
326-
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location."
327-
ExitWithExitCode 1
327+
$location = "public location";
328+
}
329+
Write-Host "Attempting to install dotnet from $location."
330+
try {
331+
& $installScript @variation
332+
$installSuccess = $true
333+
break
328334
}
335+
catch {
336+
Write-Host "Failed to install dotnet from $location."
337+
}
338+
}
339+
if (-not $installSuccess) {
340+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
341+
ExitWithExitCode 1
329342
}
330343
}
331344

@@ -887,7 +900,7 @@ function Try-LogClientIpAddress()
887900
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
888901
try
889902
{
890-
$result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
903+
$result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
891904
$lines = $result.Content.Split([Environment]::NewLine)
892905
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
893906
Write-Host $socketIp

0 commit comments

Comments
 (0)