diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9cbd9b4af9f..fb2c61b327f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
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
- c0c425d9b85b125bbaf59581639355f1d2b99149
+ a1e4795fcba619bba3534700b660ad6d2e3ce859
-
+
https://github.com/dotnet/arcade
- c0c425d9b85b125bbaf59581639355f1d2b99149
+ a1e4795fcba619bba3534700b660ad6d2e3ce859
-
+
https://github.com/dotnet/arcade
- c0c425d9b85b125bbaf59581639355f1d2b99149
+ a1e4795fcba619bba3534700b660ad6d2e3ce859
diff --git a/eng/Versions.props b/eng/Versions.props
index 322ec1ebacd..2569eede788 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -55,9 +55,9 @@
- 9.0.0-beta.23620.7
- 9.0.0-beta.23620.7
- 9.0.0-beta.23620.7
+ 9.0.0-beta.23621.2
+ 9.0.0-beta.23621.2
+ 9.0.0-beta.23621.2
17.4.0-preview-20220707-01
diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml
index de8f2d6a235..835e5275128 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 290240c0649..70c4d275153 100644
--- a/global.json
+++ b/global.json
@@ -14,9 +14,9 @@
"version": "9.0.100-alpha.1.23618.3"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.7",
- "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23620.7",
- "Microsoft.DotNet.Helix.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",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23621.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23621.6"
},