Skip to content

Commit 4397d05

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20231201.1 (dotnet#2344)
[main] Update dependencies from dotnet/arcade
1 parent 3853af1 commit 4397d05

13 files changed

+129
-19
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23572.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23601.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>c5e5051496efbcc9046b25628666377d6b97a670</Sha>
8+
<Sha>38aa367e014493c6f6ebfe94d9029bea01d072c4</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23572.2">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23601.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>c5e5051496efbcc9046b25628666377d6b97a670</Sha>
12+
<Sha>38aa367e014493c6f6ebfe94d9029bea01d072c4</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23572.2">
14+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23601.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>c5e5051496efbcc9046b25628666377d6b97a670</Sha>
16+
<Sha>38aa367e014493c6f6ebfe94d9029bea01d072c4</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<PropertyGroup>
1515
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
1616
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
17-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23572.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
17+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23601.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
1818
</PropertyGroup>
1919
</Project>

‎eng/common/darc-init.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
3+
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16',
44
$verbosity = 'minimal',
55
$toolpath = $null
66
)

‎eng/common/darc-init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
5-
versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16'
5+
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
66
verbosity='minimal'
77

88
while [[ $# > 0 ]]; do

‎eng/common/post-build/add-build-to-channel.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param(
22
[Parameter(Mandatory=$true)][int] $BuildId,
33
[Parameter(Mandatory=$true)][int] $ChannelId,
44
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
5-
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
5+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
77
)
88

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ param(
33
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
44
[Parameter(Mandatory=$true)][string] $AzdoToken,
55
[Parameter(Mandatory=$true)][string] $MaestroToken,
6-
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
6+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
77
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
88
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
99
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters

‎eng/common/post-build/redact-logs.ps1

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
[CmdletBinding(PositionalBinding=$False)]
2+
param(
3+
[Parameter(Mandatory=$true, Position=0)][string] $InputPath,
4+
[Parameter(Mandatory=$true)][string] $BinlogToolVersion,
5+
[Parameter(Mandatory=$false)][string] $DotnetPath,
6+
[Parameter(Mandatory=$false)][string] $PackageFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json',
7+
# File with strings to redact - separated by newlines.
8+
# For comments start the line with '# ' - such lines are ignored
9+
[Parameter(Mandatory=$false)][string] $TokensFilePath,
10+
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
11+
)
12+
13+
try {
14+
. $PSScriptRoot\post-build-utils.ps1
15+
16+
$packageName = 'binlogtool'
17+
18+
$dotnet = $DotnetPath
19+
20+
if (!$dotnet) {
21+
$dotnetRoot = InitializeDotNetCli -install:$true
22+
$dotnet = "$dotnetRoot\dotnet.exe"
23+
}
24+
25+
$toolList = & "$dotnet" tool list -g
26+
27+
if ($toolList -like "*$packageName*") {
28+
& "$dotnet" tool uninstall $packageName -g
29+
}
30+
31+
$toolPath = "$PSScriptRoot\..\..\..\.tools"
32+
$verbosity = 'minimal'
33+
34+
New-Item -ItemType Directory -Force -Path $toolPath
35+
36+
Push-Location -Path $toolPath
37+
38+
try {
39+
Write-Host "Installing Binlog redactor CLI..."
40+
Write-Host "'$dotnet' new tool-manifest"
41+
& "$dotnet" new tool-manifest
42+
Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion"
43+
& "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion
44+
45+
if (Test-Path $TokensFilePath) {
46+
Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath
47+
$TokensToRedact += Get-Content -Path $TokensFilePath | Foreach {$_.Trim()} | Where { $_ -notmatch "^# " }
48+
}
49+
50+
$optionalParams = [System.Collections.ArrayList]::new()
51+
52+
Foreach ($p in $TokensToRedact)
53+
{
54+
if($p -match '^\$\(.*\)$')
55+
{
56+
Write-Host ("Ignoring token {0} as it is probably unexpanded AzDO variable" -f $p)
57+
}
58+
elseif($p)
59+
{
60+
$optionalParams.Add("-p:" + $p) | Out-Null
61+
}
62+
}
63+
64+
& $dotnet binlogtool redact --input:$InputPath --recurse --in-place `
65+
@optionalParams
66+
67+
if ($LastExitCode -ne 0) {
68+
Write-PipelineTelemetryError -Category 'Redactor' -Type 'warning' -Message "Problems using Redactor tool (exit code: $LastExitCode). But ignoring them now."
69+
}
70+
}
71+
finally {
72+
Pop-Location
73+
}
74+
75+
Write-Host 'done.'
76+
}
77+
catch {
78+
Write-Host $_
79+
Write-PipelineTelemetryError -Category 'Redactor' -Message "There was an error while trying to redact logs. Error: $_"
80+
ExitWithExitCode 1
81+
}

‎eng/common/post-build/trigger-subscriptions.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param(
22
[Parameter(Mandatory=$true)][string] $SourceRepo,
33
[Parameter(Mandatory=$true)][int] $ChannelId,
44
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
5-
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
5+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
77
)
88

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
- group: AzureDevOps-Artifact-Feeds-Pats
4949
- name: runCodesignValidationInjection
5050
value: false
51-
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
52-
- template: /eng/common/templates/post-build/common-variables.yml
51+
# unconditional - needed for logs publishing (redactor tool version)
52+
- template: /eng/common/templates/post-build/common-variables.yml
5353

5454
pool:
5555
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -81,7 +81,7 @@ jobs:
8181
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
8282
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
8383
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
84-
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
84+
/p:MaestroApiEndpoint=https://maestro.dot.net
8585
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
8686
/p:OfficialBuildId=$(Build.BuildNumber)
8787
condition: ${{ parameters.condition }}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77

88
# Default Maestro++ API Endpoint and API Version
99
- name: MaestroApiEndPoint
10-
value: "https://maestro-prod.westus2.cloudapp.azure.com"
10+
value: "https://maestro.dot.net"
1111
- name: MaestroApiAccessToken
1212
value: $(MaestroAccessToken)
1313
- name: MaestroApiVersion
@@ -17,6 +17,8 @@ variables:
1717
value: 3.0.0
1818
- name: SymbolToolVersion
1919
value: 1.0.1
20+
- name: BinlogToolVersion
21+
value: 1.0.8
2022

2123
- name: runCodesignValidationInjection
2224
value: false

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ stages:
187187
parameters:
188188
StageLabel: 'Validation'
189189
JobLabel: 'Signing'
190+
BinlogToolVersion: $(BinlogToolVersion)
190191

191192
- job:
192193
displayName: SourceLink Validation

‎eng/common/templates/steps/publish-logs.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
parameters:
22
StageLabel: ''
33
JobLabel: ''
4+
CustomSensitiveDataList: ''
5+
# A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed
6+
BinlogToolVersion: '1.0.8'
47

58
steps:
69
- task: Powershell@2
@@ -12,7 +15,30 @@ steps:
1215
Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
1316
continueOnError: true
1417
condition: always()
15-
18+
19+
- task: PowerShell@2
20+
displayName: Redact Logs
21+
inputs:
22+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
23+
# For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
24+
# Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
25+
# If the file exists - sensitive data for redaction will be sourced from it
26+
# (single entry per line, lines starting with '# ' are considered comments and skipped)
27+
arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs'
28+
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
29+
-TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
30+
'$(publishing-dnceng-devdiv-code-r-build-re)'
31+
'$(MaestroAccessToken)'
32+
'$(dn-bot-all-orgs-artifact-feeds-rw)'
33+
'$(akams-client-id)'
34+
'$(akams-client-secret)'
35+
'$(microsoft-symbol-server-pat)'
36+
'$(symweb-symbol-server-pat)'
37+
'$(dn-bot-all-orgs-build-rw-code-rw)'
38+
${{parameters.CustomSensitiveDataList}}
39+
continueOnError: true
40+
condition: always()
41+
1642
- task: PublishBuildArtifacts@1
1743
displayName: Publish Logs
1844
inputs:

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
},
1818
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23572.2",
20-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23572.2"
19+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23601.1",
20+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23601.1"
2121
}
2222
}

0 commit comments

Comments
 (0)