Revert "fixup! Fix load order of ProjectStaging and restrict package version validation to only official builds"

This reverts commit d953d0a.

Author: RussKie

azure-pipelines-public.yml

@@ -66,8 +66,6 @@ variables:
     value: Release
   - name: PostBuildSign
     value: false
-  - name: _BrandingArgs
-    value: ''
   # needed for darc (dependency flow) publishing
   - name: _PublishArgs
     value: ''

azure-pipelines.yml

@@ -78,13 +78,9 @@ variables:
   - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/validation/'), eq(variables['Build.Reason'], 'Manual')) }}:
     - name: PostBuildSign
       value: false
-    - name: _BrandingArgs
-      value: /p:configureDotNetFinalVersionKind=true
   - ${{ else }}:
     - name: PostBuildSign
       value: true
-    - name: _BrandingArgs
-      value: ''
 
   # Produce test-signed build for PR and Public builds
   - ${{ if or(eq(variables['runAsPublic'], 'true'), eq(variables['Build.Reason'], 'PullRequest')) }}:

eng/pipelines/templates/BuildAndTest.yml

@@ -49,7 +49,6 @@ steps:
             -warnAsError ${{ parameters.warnAsError }}
             /bl:${{ parameters.repoLogPath }}/build.binlog
             $(_OfficialBuildIdArgs)
-            $(_BrandingArgs)
     displayName: Build
 
   - ${{ if ne(parameters.skipTests, 'true') }}:
@@ -145,7 +144,6 @@ steps:
               -configuration ${{ parameters.buildConfig }}
               /bl:${{ parameters.repoLogPath }}/transport.binlog
               $(_OfficialBuildIdArgs)
-              $(_BrandingArgs)
       displayName: Pack docs transport package
 
     - pwsh: |
@@ -161,5 +159,4 @@ steps:
               /bl:${{ parameters.repoLogPath }}/pack.binlog
               /p:Restore=false /p:Build=false
               $(_OfficialBuildIdArgs)
-              $(_BrandingArgs)
       displayName: Pack, sign, and publish