From 0dce83fa2bf6ad4df937fb6a1baa1f9e404e68f4 Mon Sep 17 00:00:00 2001 From: Vineeth Thomas Alex Date: Tue, 3 Feb 2026 17:44:45 -0600 Subject: [PATCH 1/7] Remove Windows pool from build stage Removed Windows pool configuration from build stage, since template job defines pool --- .pipelines/OneBranch.Official.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.pipelines/OneBranch.Official.yml b/.pipelines/OneBranch.Official.yml index 996f2a60..cf292815 100644 --- a/.pipelines/OneBranch.Official.yml +++ b/.pipelines/OneBranch.Official.yml @@ -48,9 +48,6 @@ extends: stages: - stage: build - pool: - type: windows - jobs: - template: .pipelines/jobs/OneBranchBuild.yml@self parameters: From 37521f57f75034c8fd60d3982f687bd9ded8e38c Mon Sep 17 00:00:00 2001 From: Vineeth Thomas Alex Date: Wed, 4 Feb 2026 14:19:51 -0600 Subject: [PATCH 2/7] Remove prefast in OneBranch.PullRequest.yml Prefast is enabled in the build stage template job --- .pipelines/OneBranch.PullRequest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pipelines/OneBranch.PullRequest.yml b/.pipelines/OneBranch.PullRequest.yml index bc08bbdd..ea488432 100644 --- a/.pipelines/OneBranch.PullRequest.yml +++ b/.pipelines/OneBranch.PullRequest.yml @@ -41,8 +41,6 @@ extends: enabled: false sbom: enabled: true - prefast: - enabled: true stages: - stage: build From f558b3703b3f13a839c1fcb873fbb1f4c78e0c92 Mon Sep 17 00:00:00 2001 From: Vineeth Thomas Alex Date: Wed, 4 Feb 2026 14:24:23 -0600 Subject: [PATCH 3/7] Add -SkipDuplicate option to NuGet push arguments --- .pipelines/jobs/OneBranchNuGet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/jobs/OneBranchNuGet.yml b/.pipelines/jobs/OneBranchNuGet.yml index 02133ee0..54760b64 100644 --- a/.pipelines/jobs/OneBranchNuGet.yml +++ b/.pipelines/jobs/OneBranchNuGet.yml @@ -72,4 +72,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' \ No newline at end of file + 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 -SkipDuplicate' From 8ae9be2b7de00b12f66cdc15fc93945ebe0c7de9 Mon Sep 17 00:00:00 2001 From: Vineeth Thomas Alex Date: Wed, 4 Feb 2026 16:55:57 -0600 Subject: [PATCH 4/7] Update .pipelines/jobs/OneBranchNuGet.yml Co-authored-by: Ryan Shepherd --- .pipelines/jobs/OneBranchNuGet.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.pipelines/jobs/OneBranchNuGet.yml b/.pipelines/jobs/OneBranchNuGet.yml index 54760b64..4851674c 100644 --- a/.pipelines/jobs/OneBranchNuGet.yml +++ b/.pipelines/jobs/OneBranchNuGet.yml @@ -15,7 +15,10 @@ 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' From 17f765454728442a3e7acfc54afc5d93b2f0b8a1 Mon Sep 17 00:00:00 2001 From: Vineeth Thomas Alex Date: Wed, 4 Feb 2026 16:57:14 -0600 Subject: [PATCH 5/7] Update NuGet push command arguments Removed the -SkipDuplicate option from the NuGet push command. --- .pipelines/jobs/OneBranchNuGet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/jobs/OneBranchNuGet.yml b/.pipelines/jobs/OneBranchNuGet.yml index 4851674c..baaf7a9c 100644 --- a/.pipelines/jobs/OneBranchNuGet.yml +++ b/.pipelines/jobs/OneBranchNuGet.yml @@ -75,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 -SkipDuplicate' + 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' From 6390abc1dbe4522057f6511e360f784175538295 Mon Sep 17 00:00:00 2001 From: Ryan Shepherd Date: Thu, 5 Feb 2026 09:57:04 -0800 Subject: [PATCH 6/7] Set pre-release NuGet version in VSIX build --- .pipelines/jobs/OneBranchVsix.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.pipelines/jobs/OneBranchVsix.yml b/.pipelines/jobs/OneBranchVsix.yml index 18b74403..1b03f71d 100644 --- a/.pipelines/jobs/OneBranchVsix.yml +++ b/.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 }} From 646df5fe3e6c778718b5002d114e53d282671bd6 Mon Sep 17 00:00:00 2001 From: Vineeth Thomas Alex Date: Thu, 5 Feb 2026 13:03:48 -0600 Subject: [PATCH 7/7] Change ob_sdl_prefast_runDuring to 'Guardian' --- .pipelines/jobs/OneBranchNuGet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/jobs/OneBranchNuGet.yml b/.pipelines/jobs/OneBranchNuGet.yml index baaf7a9c..86720289 100644 --- a/.pipelines/jobs/OneBranchNuGet.yml +++ b/.pipelines/jobs/OneBranchNuGet.yml @@ -21,7 +21,7 @@ jobs: PackageVersion: ${{ parameters.BuildVersion }}-unofficial ob_sdl_prefast_enabled: true - ob_sdl_prefast_runDuring: 'Build' + ob_sdl_prefast_runDuring: 'Guardian' ob_sdl_checkCompliantCompilerWarnings: true steps: