Merge pull request #29182 from dotnet/marcpopMSFT-improvepublish

 Improve build stability by ensuring we aren't double publishing everywhere

Author: marcpopMSFT

.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)

.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

eng/CIBuild.cmd

@@ -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,19 +118,20 @@ 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
         env:
           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)