diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c25b927..6e4df6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,14 +8,14 @@ - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d diff --git a/eng/common/helixpublish.proj b/eng/common/helixpublish.proj index d7f1858..c1323bf 100644 --- a/eng/common/helixpublish.proj +++ b/eng/common/helixpublish.proj @@ -1,3 +1,4 @@ + diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index dbf99d8..a735fe9 100644 --- a/eng/common/internal/Directory.Build.props +++ b/eng/common/internal/Directory.Build.props @@ -1,4 +1,6 @@ + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 7f5ce6d..8fa77e5 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,6 @@ + net472 false @@ -27,4 +28,5 @@ + diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index de8f2d6..835e527 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -15,31 +15,30 @@ steps: Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - -# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675 -# - task: PowerShell@2 -# displayName: Redact Logs -# inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 -# # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml -# # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' -# # If the file exists - sensitive data for redaction will be sourced from it -# # (single entry per line, lines starting with '# ' are considered comments and skipped) -# arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' -# -BinlogToolVersion ${{parameters.BinlogToolVersion}} -# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' -# '$(publishing-dnceng-devdiv-code-r-build-re)' -# '$(MaestroAccessToken)' -# '$(dn-bot-all-orgs-artifact-feeds-rw)' -# '$(akams-client-id)' -# '$(akams-client-secret)' -# '$(microsoft-symbol-server-pat)' -# '$(symweb-symbol-server-pat)' -# '$(dn-bot-all-orgs-build-rw-code-rw)' -# ${{parameters.CustomSensitiveDataList}} -# continueOnError: true -# condition: always() - + +- task: PowerShell@2 + displayName: Redact Logs + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml + # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # If the file exists - sensitive data for redaction will be sourced from it + # (single entry per line, lines starting with '# ' are considered comments and skipped) + arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + '$(publishing-dnceng-devdiv-code-r-build-re)' + '$(MaestroAccessToken)' + '$(dn-bot-all-orgs-artifact-feeds-rw)' + '$(akams-client-id)' + '$(akams-client-secret)' + '$(microsoft-symbol-server-pat)' + '$(symweb-symbol-server-pat)' + '$(dn-bot-all-orgs-build-rw-code-rw)' + ${{parameters.CustomSensitiveDataList}} + continueOnError: true + condition: always() + - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: diff --git a/global.json b/global.json index e75f3f6..fcdb5ca 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24052.3" } }