From 964689acf5948e5f6677085655efad6120246014 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 13:49:42 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20231219.2 (#8571)

[main] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml                     | 20 ++++-----
 eng/Versions.props                          |  4 +-
 eng/common/build.cmd                        |  3 ++
 eng/common/templates/steps/publish-logs.yml | 49 +++++++++++----------
 global.json                                 |  4 +-
 5 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 eng/common/build.cmd

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 686620f9244..c6d3606cca4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -157,25 +157,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23615.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23619.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
+      <Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23615.2">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23619.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
+      <Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23615.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23619.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
+      <Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.23615.2">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.23619.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
+      <Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23615.2">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23619.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
+      <Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 785737363f8..2f772e842e1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>9.0.0-beta.23615.2</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.23615.2</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetApiCompatVersion>9.0.0-beta.23619.2</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.23619.2</MicrosoftDotNetCodeAnalysisPackageVersion>
   </PropertyGroup>
   <!-- Sourcelink -->
   <PropertyGroup>
diff --git a/eng/common/build.cmd b/eng/common/build.cmd
new file mode 100644
index 00000000000..99daf368aba
--- /dev/null
+++ b/eng/common/build.cmd
@@ -0,0 +1,3 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
+exit /b %ErrorLevel%
diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml
index dadf1c464cd..d5e96ed099b 100644
--- a/eng/common/templates/steps/publish-logs.yml
+++ b/eng/common/templates/steps/publish-logs.yml
@@ -15,30 +15,31 @@ steps:
       Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
   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()
-      
+
+# 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: PublishBuildArtifacts@1
   displayName: Publish Logs
   inputs:
diff --git a/global.json b/global.json
index 1900ee366ab..693e6a16ab0 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23615.2"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23619.2",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23619.2"
   },
   "sdk": {
     "version": "9.0.100-alpha.1.23615.4"