Remove Windows pool from build stage (#1535)

* Remove Windows pool from build stage

Removed Windows pool configuration from build stage, since template job defines pool

* Remove prefast in OneBranch.PullRequest.yml

Prefast is enabled in the build stage template job

* Add -SkipDuplicate option to NuGet push arguments

* Update .pipelines/jobs/OneBranchNuGet.yml

Co-authored-by: Ryan Shepherd <[email protected]>

* Update NuGet push command arguments

Removed the -SkipDuplicate option from the NuGet push command.

* Set pre-release NuGet version in VSIX build

* Change ob_sdl_prefast_runDuring to 'Guardian'

---------

Co-authored-by: Ryan Shepherd <[email protected]>

Author: vineeththomasalex

.pipelines/OneBranch.Official.yml

@@ -48,9 +48,6 @@ extends:
 
     stages:
     - stage: build
-      pool:
-        type: windows
-
       jobs:
       - template: .pipelines/jobs/OneBranchBuild.yml@self
         parameters:

.pipelines/OneBranch.PullRequest.yml

@@ -41,8 +41,6 @@ extends:
         enabled: false
       sbom:
         enabled: true
-      prefast:
-        enabled: true
 
     stages:
     - stage: build

.pipelines/jobs/OneBranchNuGet.yml

@@ -15,10 +15,13 @@ jobs:
 
     variables:
       ob_outputDirectory: '$(Build.SourcesDirectory)\out'
-      PackageVersion: ${{ parameters.BuildVersion }}
+      ${{ if eq(parameters.OfficialBuild, true) }}:
+        PackageVersion: ${{ parameters.BuildVersion }}
+      ${{ else }}:
+        PackageVersion: ${{ parameters.BuildVersion }}-unofficial
 
       ob_sdl_prefast_enabled: true
-      ob_sdl_prefast_runDuring: 'Build'
+      ob_sdl_prefast_runDuring: 'Guardian'
       ob_sdl_checkCompliantCompilerWarnings: true
 
     steps:
@@ -72,4 +75,4 @@ jobs:
         displayName: 'Publish NuGet package'
         inputs:
           command: 'custom'
-          arguments: 'push $(ob_outputDirectory)\packages\Microsoft.Windows.CppWinRT.$(PackageVersion).nupkg -NonInteractive -Source https://microsoft.pkgs.visualstudio.com/_packaging/CppWinRT/nuget/v3/index.json -ApiKey VSTS'
+          arguments: 'push $(ob_outputDirectory)\packages\Microsoft.Windows.CppWinRT.$(PackageVersion).nupkg -NonInteractive -Source https://microsoft.pkgs.visualstudio.com/_packaging/CppWinRT/nuget/v3/index.json -ApiKey VSTS'

.pipelines/jobs/OneBranchVsix.yml

@@ -27,6 +27,11 @@ jobs:
         VsixFilename: Microsoft.Windows.CppWinRT
 
   variables:
+    ${{ if eq(parameters.OfficialBuild, true) }}:
+      PackageVersion: ${{ parameters.BuildVersion }}
+    ${{ else }}:
+      PackageVersion: ${{ parameters.BuildVersion }}-unofficial
+
     ob_outputDirectory: $(Build.SourcesDirectory)\out
     ob_artifactSuffix: $(VsVersion)_$(Deployment)
 
@@ -91,7 +96,7 @@ jobs:
       displayName: Build VSIX
       inputs:
         solution: $(Build.SourcesDirectory)\vsix\vsix.sln
-        msbuildArgs: /t:vsix_$(VsVersion) /m /p:CppWinRTVersion=${{ parameters.BuildVersion }},clean_intermediate_files=true,Deployment=$(Deployment),NatvisDirx86=$(Build.SourcesDirectory)\x86\$(Deployment)\,NatvisDirx64=$(Build.SourcesDirectory)\x64\$(Deployment)\,NatvisDirarm64=$(Build.SourcesDirectory)\arm64\$(Deployment)\,NupkgDir=$(Pipeline.Workspace)\nuget\packages /bl:$(ob_outputDirectory)\output.binlog
+        msbuildArgs: /t:vsix_$(VsVersion) /m /p:CppWinRTVersion=$(PackageVersion),clean_intermediate_files=true,Deployment=$(Deployment),NatvisDirx86=$(Build.SourcesDirectory)\x86\$(Deployment)\,NatvisDirx64=$(Build.SourcesDirectory)\x64\$(Deployment)\,NatvisDirarm64=$(Build.SourcesDirectory)\arm64\$(Deployment)\,NupkgDir=$(Pipeline.Workspace)\nuget\packages /bl:$(ob_outputDirectory)\output.binlog
         platform: 'Any CPU'
         configuration: ${{ parameters.BuildConfiguration }}