From bac7602dc0e8dba80013c046e474500846b5afe2 Mon Sep 17 00:00:00 2001
From: Tomas Grosup <tomasgrosup@microsoft.com>
Date: Thu, 5 Jun 2025 10:29:37 +0200
Subject: [PATCH] Do not used arcades publish for signed build of vsixes
 (#18660)

---
 azure-pipelines.yml | 2 +-
 eng/Build.ps1       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 328babc4c8..73800a4542 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -133,7 +133,7 @@ extends:
             - checkout: self
               clean: true
             - template: /eng/restore-internal-tools.yml
-            - script: eng\CIBuildNoPublish.cmd
+            - script: eng\CIBuild.cmd
                       -configuration $(_BuildConfig)
                       -prepareMachine
                       -testAllButIntegrationAndAot
diff --git a/eng/Build.ps1 b/eng/Build.ps1
index fe2fe5731b..3c6dc0350e 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -562,6 +562,7 @@ try {
     $script:BuildMessage = "Failure building product"
     if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild -and -not $productBuild) {
         $originalSignValue = $sign
+        $originalPublishValue = $publish
         if ($msbuildEngine -eq "dotnet") {
             # Building FSharp.sln and VisualFSharp.sln with .NET Core MSBuild
             # don't produce any artifacts to sign. Skip signing in this case.
@@ -571,9 +572,12 @@ try {
             BuildSolution "FSharp.sln" $False
         }
         else {
+            # vsixes do not count as publishing artifacts from Arcade perspective, and arcade publish.proj is failing when it encounters 0 items to publish.
+            $publish = $False
             BuildSolution "VisualFSharp.sln" $False
         }
         $sign = $originalSignValue
+        $publish = $originalPublishValue
     }
 
     if ($testBenchmarks) {