From bdeec459ddbd844d2e5ea7a863d379c04d3ca137 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Mon, 19 Sep 2022 13:57:39 -0700
Subject: [PATCH] Merge pull request #27899 from
 dotnet/marcpopMSFT-improvebuildstability701xx

Improve build stability by ensuring we aren't double publishing everywhere
---
 .vsts-ci-richnav.yml |  7 ++++++-
 .vsts-ci.yml         |  2 ++
 eng/CIBuild.cmd      |  2 --
 eng/build.yml        | 13 ++++++++-----
 4 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 eng/CIBuild.cmd

diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml
index af94b6a6561c..e8ead69477c1 100644
--- a/.vsts-ci-richnav.yml
+++ b/.vsts-ci-richnav.yml
@@ -52,7 +52,12 @@ stages:
           - _SignArgs: ''
           - _InternalRuntimeDownloadArgs: ''
         steps:
-        - script: eng\CIBuild.cmd
+        - powershell: eng\common\build.ps1
+                    -restore
+                    -ci
+                    -build
+                    -pack
+                    -sign
                     -configuration $(_BuildConfig)
                     $(_PublishArgs)
                     $(_SignArgs)
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 6d0da507b761..0fc8afdf5ce2 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -14,6 +14,8 @@ variables:
     value: Roslyn-Project-System
   - name: _DotNetPublishToBlobFeed
     value: false
+  - name: _CIBuild
+    value: -restore -build -sign -pack -ci
   - name: _DotNetArtifactsCategory
     value: .NETCore
   - name: _DotNetValidationArtifactsCategory
diff --git a/eng/CIBuild.cmd b/eng/CIBuild.cmd
deleted file mode 100644
index 5bb05a4c5ed6..000000000000
--- a/eng/CIBuild.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" -restore -build -sign -pack -ci %*"
\ No newline at end of file
diff --git a/eng/build.yml b/eng/build.yml
index 833f00859dd5..9f9b8ffe12de 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -65,7 +65,8 @@ jobs:
         env:
           Token: $(dn-bot-dnceng-artifact-feeds-rw)
     - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
-      - script: eng\CIBuild.cmd
+      - powershell: eng\common\build.ps1
+                  $(_CIBuild)
                   -configuration $(_BuildConfig)
                   $(_PublishArgs)
                   $(_SignArgs)
@@ -90,7 +91,8 @@ jobs:
             HelixAccessToken: $(_HelixApiToken)
 
     - ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}:
-      - script: eng\CIBuild.cmd
+      - powershell: eng\common\build.ps1
+                  $(_CIBuild)
                   -configuration $(_BuildConfig)
                   $(_SignArgs)
                   $(_OfficialBuildIdArgs)
@@ -116,11 +118,11 @@ jobs:
             HelixAccessToken: $(_HelixApiToken)
 
     - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}:
-      - script: eng\CIBuild.cmd
+      - powershell: eng\common\build.ps1
+                  $(_CIBuild)
                   -configuration $(_BuildConfig)
                   $(_SignArgs)
                   $(_OfficialBuildIdArgs)
-                  $(_Test)
                   $(_InternalRuntimeDownloadArgs)
                   /p:RunTestsAsTool=true
         displayName: Build
@@ -128,7 +130,8 @@ jobs:
           BuildConfig: $(_BuildConfig)
 
     - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}:
-      - script: eng/common/cibuild.sh
+      - script: eng/common/build.sh
+                  $(_CIBuild)
                   --configuration $(_BuildConfig)
                   $(_SignArgs)
                   $(_OfficialBuildIdArgs)