From 7749000efd853a5661fab1a0acb104f2fb049229 Mon Sep 17 00:00:00 2001
From: ryfu-msft <ryfu@microsoft.com>
Date: Fri, 28 Jun 2024 11:22:22 -0700
Subject: [PATCH 1/3] update signing

---
 azure-pipelines.nuget.yml | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.nuget.yml b/azure-pipelines.nuget.yml
index 6d80fc8759..95889beec3 100644
--- a/azure-pipelines.nuget.yml
+++ b/azure-pipelines.nuget.yml
@@ -81,10 +81,15 @@ jobs:
           solution: "$(solution)"
           configuration: "$(buildConfiguration)"
 
-      - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+      - task: EsrpCodeSigning@5
         displayName: "ESRP CodeSigning - Package contents"
         inputs:
           ConnectedServiceName: "WindowsPackageManager ESRP CodeSigning"
+          AppRegistrationClientId: '32216f16-efc9-4013-9fae-c6a2c54a3fc0'
+          AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+          AuthAKVName: 'PeetDevOpsKeyVault'
+          AuthCertName: 'ESRPAuth'
+          AuthSignCertName: 'ESRPRequestSigning'
           FolderPath: src
           Pattern: |
             *\$(buildConfiguration)\WinGetUtil\WinGetUtil.dll
@@ -161,10 +166,15 @@ jobs:
           packDestination: '$(Build.ArtifactStagingDirectory)'
           basePath: $(Pipeline.Workspace)
 
-      - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+      - task: EsrpCodeSigning@5
         displayName: "ESRP CodeSigning - NuGet package"
         inputs:
           ConnectedServiceName: "WindowsPackageManager ESRP CodeSigning"
+          AppRegistrationClientId: '32216f16-efc9-4013-9fae-c6a2c54a3fc0'
+          AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+          AuthAKVName: 'PeetDevOpsKeyVault'
+          AuthCertName: 'ESRPAuth'
+          AuthSignCertName: 'ESRPRequestSigning'
           FolderPath: "$(Build.ArtifactStagingDirectory)"
           Pattern: "$(packageName).$(version).nupkg"
           signConfigType: inlineSignParams
@@ -193,11 +203,11 @@ jobs:
           ArtifactName: $(packageName)
           publishLocation: Container
 
-      - task: NuGetCommand@2
-        displayName: Push WingetUtil nuget package to nuget.org
-        inputs:
-          command: push
-          nuGetFeedType: external
-          includeNugetOrg: true
-          packagesToPush: '$(Build.ArtifactStagingDirectory)\$(packageName).$(version).nupkg'
-          publishFeedCredentials: "WindowsPackageManagerAzurePipelineNuget - NuGet.org"
+      # - task: NuGetCommand@2
+      #   displayName: Push WingetUtil nuget package to nuget.org
+      #   inputs:
+      #     command: push
+      #     nuGetFeedType: external
+      #     includeNugetOrg: true
+      #     packagesToPush: '$(Build.ArtifactStagingDirectory)\$(packageName).$(version).nupkg'
+      #     publishFeedCredentials: "WindowsPackageManagerAzurePipelineNuget - NuGet.org"

From 9464415f2e29d9408bace4c48b0ae00485503cd1 Mon Sep 17 00:00:00 2001
From: ryfu-msft <ryfu@microsoft.com>
Date: Fri, 28 Jun 2024 12:48:37 -0700
Subject: [PATCH 2/3] uncomment selection

---
 azure-pipelines.nuget.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/azure-pipelines.nuget.yml b/azure-pipelines.nuget.yml
index 95889beec3..27b46300b5 100644
--- a/azure-pipelines.nuget.yml
+++ b/azure-pipelines.nuget.yml
@@ -203,11 +203,11 @@ jobs:
           ArtifactName: $(packageName)
           publishLocation: Container
 
-      # - task: NuGetCommand@2
-      #   displayName: Push WingetUtil nuget package to nuget.org
-      #   inputs:
-      #     command: push
-      #     nuGetFeedType: external
-      #     includeNugetOrg: true
-      #     packagesToPush: '$(Build.ArtifactStagingDirectory)\$(packageName).$(version).nupkg'
-      #     publishFeedCredentials: "WindowsPackageManagerAzurePipelineNuget - NuGet.org"
+      - task: NuGetCommand@2
+        displayName: Push WingetUtil nuget package to nuget.org
+        inputs:
+          command: push
+          nuGetFeedType: external
+          includeNugetOrg: true
+          packagesToPush: '$(Build.ArtifactStagingDirectory)\$(packageName).$(version).nupkg'
+          publishFeedCredentials: "WindowsPackageManagerAzurePipelineNuget - NuGet.org"

From 7ce5d22b78d754dba369fab086043ef9359cee5d Mon Sep 17 00:00:00 2001
From: ryfu-msft <ryfu@microsoft.com>
Date: Fri, 28 Jun 2024 12:52:19 -0700
Subject: [PATCH 3/3] fix spelling

---
 .github/actions/spelling/expect.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 87fa38e2b4..5542cb8220 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -8,6 +8,7 @@ admx
 AFAIK
 aicli
 AICLIC
+AKV
 allusers
 alreadyinstalled
 AMap
@@ -40,7 +41,7 @@ azurewebsites
 bcp
 BEFACEF
 BFirst
-bght
+bght
 bigcatalog
 BITMAPINFOHEADER
 bitspace
@@ -74,7 +75,7 @@ CODEOWNERS
 COINIT
 COMGLB
 commandline
-compressapi
+compressapi
 concurrencysal
 contactsupport
 contentfiles
@@ -342,6 +343,7 @@ PCCERT
 PCs
 pcwsz
 PDWORD
+Peet
 peetdev
 PEGI
 PFM
@@ -401,7 +403,7 @@ roy
 runspace
 runtimeclass
 ryfu
-rzkzqaqjwj
+rzkzqaqjwj
 sacl
 SARL
 SASURL