!fixup! Change $(BuildScriptArgs) name to avoid circular reference

- nit: include new `$(BuildNumberArg)` in `$(SharedFxArgs)`

Author: dougbu

.azure/pipelines/ci.yml

@@ -20,24 +20,25 @@ variables:
 - name: TeamName
   value: AspNetCore
 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-  - name: BuildScriptArgs
+  - name: BuildNumberArg
     value: ''
 - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-  - name: BuildScriptArgs
+  - name: BuildNumberArg
     value: '/p:BuildNumber=$(Build.BuildId)'
   - name: SharedFxArgs
     value: '/t:Prepare
             /t:Restore
             /t:GeneratePropsFiles
-            /t:BuildSharedFx'
+            /t:BuildSharedFx
+            $(BuildNumberArg)'
 
 jobs:
 - template: jobs/default-build.yml
   parameters:
     jobName: Windows_Build
     jobDisplayName: "Build and test: Windows"
     agentOs: Windows
-    buildArgs: $(BuildScriptArgs)
+    buildArgs: $(BuildNumberArg)
     codeSign: true
     beforeBuild:
     - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1"
@@ -49,13 +50,13 @@ jobs:
       jobName: MacOs_Build
       jobDisplayName: "Build and test : MacOS"
       agentOs: MacOS
-      buildArgs: $(BuildScriptArgs)
+      buildArgs: $(BuildNumberArg)
   - template: jobs/default-build.yml
     parameters:
       jobName: Linux_Build
       jobDisplayName: "Build and test : Linux"
       agentOs: Linux
-      buildArgs: $(BuildScriptArgs)
+      buildArgs: $(BuildNumberArg)
 
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - job: Windows_SharedFx
@@ -105,7 +106,6 @@ jobs:
     - script: .\build.cmd
               -ci
               /p:SignType=$(_SignType)
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFxRID=win-x64
               /bl:artifacts/logs/SharedFx-win-x64.binlog
@@ -121,7 +121,6 @@ jobs:
     - script: .\build.cmd
               -ci
               /p:SignType=$(_SignType)
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFxRID=win-x86
               /bl:artifacts/logs/SharedFx-win-x86.binlog
@@ -137,7 +136,7 @@ jobs:
     - script: .\build.cmd
               -ci
               /p:SignType=$(_SignType)
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /p:SkipArtifactInfoTargets=true
               /p:DisableSignCheck=true
               /t:DoCodeSigning
@@ -201,7 +200,6 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFxRID=osx-x64
               /bl:artifacts/logs/SharedFx-osx-x64.binlog
@@ -249,7 +247,6 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFXRid=linux-x64
               /bl:artifacts/logs/SharedFx-linux-x64.binlog
@@ -261,7 +258,6 @@ jobs:
       displayName: Build linux-x64 SharedFX
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
               $(SharedFxArgs)
               /p:SharedFXRid=linux-arm
               /p:IsLinuxArmSupported=true
@@ -311,7 +307,7 @@ jobs:
     - script: ./$(BuildDirectory)/dockerbuild.sh
               alpine
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /t:Prepare
               /t:GeneratePropsFiles
               /t:BuildSharedFx
@@ -446,7 +442,7 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/Signed/
     - script: .\build.cmd
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /p:SignType=$(_SignType)
               /t:BuildFallbackArchive
               /bl:artifacts/logs/PackageArchive.binlog
@@ -534,7 +530,7 @@ jobs:
         targetFolder: $(Build.SourcesDirectory)/.deps/Signed/
     - script: ./$(BuildDirectory)/build.sh
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /t:BuildInstallers
               /bl:artifacts/logs/SharedFx-Installers.binlog
       env:
@@ -706,7 +702,7 @@ jobs:
         contents: korebuild.json
     - script: .\build.cmd
               -ci
-              $(BuildScriptArgs)
+              $(BuildNumberArg)
               /t:Publish
               /p:BuildBranch=$(Build.SourceBranchName)
               /bl:artifacts/logs/Publish.binlog