From 850978114b9df2eea67e5fc91ece7202af72ca25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 13:27:22 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23620.7 -> To Version 9.0.0-beta.23621.2 --- eng/Version.Details.xml | 16 +++---- eng/Versions.props | 2 +- eng/common/templates/steps/publish-logs.yml | 49 ++++++++++----------- global.json | 4 +- 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c8c61496..99e053618 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 667cc2151..651cb3369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23620.7 + 9.0.0-beta.23621.2 diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index de8f2d6a2..835e52751 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 70a8945a8..875330ea6 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.7", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23620.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23621.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23621.2" } } From cbb53c78011c473c57a73eddee5866ae98c028c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Dec 2023 13:23:15 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23620.7 -> To Version 9.0.0-beta.23621.2 From 76561e636142e29faa0f85a81e562067a0437b43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Dec 2023 13:23:25 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23620.7 -> To Version 9.0.0-beta.23621.2