Skip to content

Commit d4947f7

Browse files
[main] Update dependencies from dotnet/arcade (#5388)
[main] Update dependencies from dotnet/arcade
1 parent 8941cb3 commit d4947f7

File tree

5 files changed

+35
-36
lines changed

5 files changed

+35
-36
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23620.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23628.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
9+
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23620.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23628.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
13+
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23620.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23628.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
17+
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23620.1</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23620.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23628.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23628.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
- name: SymbolToolVersion
1919
value: 1.0.1
2020
- name: BinlogToolVersion
21-
value: 1.0.8
21+
value: 1.0.9
2222

2323
- name: runCodesignValidationInjection
2424
value: false

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

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
JobLabel: ''
44
CustomSensitiveDataList: ''
55
# A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed
6-
BinlogToolVersion: '1.0.8'
6+
BinlogToolVersion: '1.0.9'
77

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

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "9.0.100-alpha.1.23615.4"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)