stackify
diff --git a/‎Scripts/codesign.ps1‎
Lines changed: 0 additions & 22 deletions b/‎Scripts/codesign.ps1‎
Lines changed: 0 additions & 22 deletions
diff --git a/‎azure-pipelines.yml‎
Lines changed: 15 additions & 14 deletions b/‎azure-pipelines.yml‎
Lines changed: 15 additions & 14 deletions
@@ -24,7 +24,9 @@ parameters:
     displayName: 'Execute Veracode SCA'
     type: boolean
     default: false
-    
+variables:
+  - group: code-signing
+
 steps:
   - checkout: self
     clean: true
@@ -36,12 +38,12 @@ steps:
       KeyVaultName: keyvault-build-resources
       RunAsPreJob: true
   - task: PowerShell@2
-    displayName: PowerShell Script
+    displayName: 'Veracode SCA Scan'
     condition: and(succeeded(), eq('${{ parameters.RUN_VERACODE_SCA }}', 'true'))
     inputs:
       targetType: inline
       script: >
-        $Env:SRCCLR_API_TOKEN="$(SRCCLR_API_TOKEN)"; Set-ExecutionPolicy AllSigned -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://download.srcclr.com/ci.ps1')); srcclr scan .\Src\StackifyLib;
+        $Env:SRCCLR_API_TOKEN="$(SRCCLR_API_TOKEN)"; Set-ExecutionPolicy AllSigned -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://download.sourceclear.com/ci.ps1')); srcclr scan .\Src\StackifyLib;
   - task: DownloadSecureFile@1
     name: SNK
     displayName: Download Strong Name Key
@@ -71,13 +73,6 @@ steps:
       }
     displayName: Uncoment signing attribute
   
-  - task: PowerShell@2
-    displayName: 'Setup Code Signing'
-    inputs:
-      targetType: filePath
-      filePath: ./Scripts/codesign.ps1
-      arguments: '$(codeSigning2023) $(codeSigning2023-pw)'
-      workingDirectory: $(Build.SourcesDirectory)
   - task: DotNetCoreCLI@2
     displayName: dotnet restore
     inputs:
@@ -101,11 +96,17 @@ steps:
       command: pack
       searchPatternPack: Src\StackifyLib\*.csproj;
       nobuild: true
-  - task: PowerShell@2
-    displayName: 'Sign Nuget Packages'
+  - task: DotNetCoreCLI@2
+    continueOnError: true
     inputs:
-      targetType: inline
-      script: dotnet nuget sign $(Build.ArtifactStagingDirectory)\*.nupkg --certificate-path $(Build.SourcesDirectory)/certificate.pfx --certificate-password $(codeSigning2023-pw) --timestamper http://timestamp.sectigo.com
+      command: 'custom'
+      custom: 'tool'
+      arguments: 'install --global NuGetKeyVaultSignTool'
+    displayName: Install NuGetKeyVaultSignTool
+  - task: CmdLine@2
+    displayName: 'Sign nuget package'
+    inputs:
+      script: NuGetKeyVaultSignTool sign $(Build.ArtifactStagingDirectory)\StackifyLib.signed.*.nupkg -kvu "$(SigningVaultURL)" -kvi "$(SigningAppClientId)" -kvt "$(SigningAppTenantId)" -kvs "$(SigningClientSecret)" -kvc "$(SigningCertName)" -tr http://timestamp.digicert.com
       workingDirectory: $(Build.SourcesDirectory)
   - task: PowerShell@2
     displayName: Rename signed assemblies