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

Author: RussKie

azure-pipelines.yml

@@ -104,7 +104,7 @@ variables:
       value: >-
             /p:DotNetPublishUsingPipelines=true
     - name: _OfficialBuildIdArgs
-      value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+      value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:configureDotNetFinalVersionKind=true
     # needed for signing
     - name: _SignType
       value: real

eng/MSBuild/ProjectStaging.props

@@ -21,6 +21,6 @@
         https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Versioning.md#package-version
       -->
     <SuppressFinalPackageVersion />
-    <SuppressFinalPackageVersion Condition=" '$(_IsStable)' != 'true' ">true</SuppressFinalPackageVersion>
+    <SuppressFinalPackageVersion Condition=" '$(configureDotNetFinalVersionKind)' == 'true And '$(_IsStable)' != 'true' ">true</SuppressFinalPackageVersion>
   </PropertyGroup>
 </Project>