[1ES] Add windows pool and remove extra sign step (#2513)

Azure · Jun 5, 2024 · 2ece46d · 2ece46d
1 parent 0889b68
commit 2ece46d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 38 deletions.
diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
@@ -46,7 +46,6 @@ pr:
     - test/TestUtility
     - tools/
 
-
 resources:
   repositories:
   - repository: 1es

diff --git a/eng/ci/templates/official/jobs/build-artifacts.yml b/eng/ci/templates/official/jobs/build-artifacts.yml
@@ -11,6 +11,11 @@ jobs:
       path: $(Build.ArtifactStagingDirectory)/NugetPackages
       artifact: NugetPackages
 
+  pool:
+    name: 1es-pool-azfunc
+    image: 1es-windows-2022
+    os: windows
+
   variables:
     ${{ if and( not(contains(variables['Build.SourceBranch'], '/release/')),  not(startsWith(variables['Build.SourceBranch'], 'refs/tags')) ) }}:
       buildNumberTemp: $(Build.BuildNumber)
@@ -32,43 +37,7 @@ jobs:
     displayName: Sign SDK assemblies
     inputs:
       ConnectedServiceName: ESRP Service-internal
-      FolderPath: sdk/Sdk/bin/Release
-      Pattern: Microsoft.Azure.Functions.Worker.Sdk*.dll
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "KeyCode": "CP-230012",
-            "OperationCode": "SigntoolSign",
-            "Parameters": {
-              "OpusName": "Microsoft",
-              "OpusInfo": "http://www.microsoft.com",
-              "FileDigest": "/fd \"SHA256\"",
-              "PageHash": "/NPH",
-              "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-            },
-            "ToolName": "sign",
-            "ToolVersion": "1.0"
-          },
-          {
-            "KeyCode": "CP-230012",
-            "OperationCode": "SigntoolVerify",
-            "Parameters": {},
-            "ToolName": "sign",
-            "ToolVersion": "1.0"
-          }
-        ]
-
-  - task: DeleteFiles@1
-    displayName: Delete CodeSignSummary files
-    inputs:
-      contents: '**/CodeSignSummary-*.md'
-
-  - task: EsrpCodeSigning@2
-    displayName: Sign SDK Analyzers assemblies
-    inputs:
-      ConnectedServiceName: ESRP Service-internal
-      FolderPath: sdk/Sdk.Analyzers/bin/Release
+      FolderPath: sdk
       Pattern: Microsoft.Azure.Functions.Worker.Sdk*.dll
       signConfigType: inlineSignParams
       inlineOperation: |
@@ -98,6 +67,7 @@ jobs:
   - task: DeleteFiles@1
     displayName: Delete CodeSignSummary files
     inputs:
+      sourceFolder: sdk
       contents: '**/CodeSignSummary-*.md'
 
   - task: EsrpCodeSigning@2
@@ -134,6 +104,7 @@ jobs:
   - task: DeleteFiles@1
     displayName: Delete CodeSignSummary files
     inputs:
+      sourceFolder: src
       contents: '**/CodeSignSummary-*.md'
 
   - task: DotNetCoreCLI@2
@@ -182,4 +153,5 @@ jobs:
   - task: DeleteFiles@1
     displayName: Delete CodeSignSummary files
     inputs:
+      sourceFolder: $(Build.ArtifactStagingDirectory)/NugetPackages
       contents: '**/CodeSignSummary-*.md'