Sign multiple VSIXes

Author: benmcmorran

azure-pipelines.yml

@@ -91,11 +91,8 @@ steps:
     displayName: Build and pack extension
 
   # Extract the VSIXes, sign what we can, then pack it back up and publish it.
-  - task: ExtractFiles@1
+  - pwsh: Get-ChildItem out\vsix | Foreach-Object { 7z e $_.FullName -o$(Build.StagingDirectory)\vscode-arduino\$_.BaseName }
     displayName: Extract extension for signing
-    inputs:
-      archiveFilePatterns: out\vsix\*.vsix
-      destinationFolder: $(Build.StagingDirectory)\vscode-arduino
   - task: NuGetToolInstaller@1
     displayName: Install NuGet
   - task: NuGetAuthenticate@0
@@ -111,23 +108,18 @@ steps:
       msbuildArguments: /p:SignType=$(SignType)
     # MicroBuild signing will always fail on public PRs.
     condition: ne(variables['Build.Reason'], 'PullRequest')
-  - task: ArchiveFiles@2
+  - pwsh: Get-ChildItem -Directory $(Build.StagingDirectory)\vscode-arduino | Foreach-Object { 7z a ($_.FullName + ".vsix") $_.FullName\* -tzip }
     displayName: Pack signed files
-    inputs:
-      rootFolderOrFile: $(Build.StagingDirectory)\vscode-arduino
-      includeRootFolder: false
-      archiveType: zip
-      archiveFile: $(Build.StagingDirectory)\vscode-arduino.vsix
   - task: MSBuild@1
-    displayName: Sign VSIX
+    displayName: Sign VSIXes
     inputs:
       solution: .\build\SignVsix.proj
       msbuildArguments: /p:SignType=$(SignType)
     # MicroBuild signing will always fail on public PRs.
     condition: ne(variables['Build.Reason'], 'PullRequest')
-  - publish: $(Build.StagingDirectory)\vscode-arduino.vsix
-    artifact: VS Code extension VSIX
-    displayName: Publish extension VSIX as artifact
+  - publish: $(Build.StagingDirectory)\vscode-arduino
+    artifact: VS Code extension VSIXes
+    displayName: Publish extension VSIXes as artifact
 
   # Install the Arduino IDE and run tests.
   - script: curl -LO https://downloads.arduino.cc/arduino-1.8.19-windows.zip
@@ -186,7 +178,7 @@ steps:
       action: create
       target: $(Build.SourceVersion)
       tagSource: auto
-      assets: $(Build.StagingDirectory)\vscode-arduino.vsix
+      assets: $(Build.StagingDirectory)\vscode-arduino\*.vsix
       isPreRelease: $[contains(variables['Build.SourceBranch'], '-rc')]
     condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
 

build/SignFiles.proj

@@ -3,7 +3,7 @@
   <Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props" />
 
   <PropertyGroup>
-    <BaseOutputDirectory>$(BUILD_STAGINGDIRECTORY)\vscode-arduino\extension</BaseOutputDirectory>
+    <BaseOutputDirectory>$(BUILD_STAGINGDIRECTORY)\vscode-arduino</BaseOutputDirectory>
     <!-- These properties are required by MicroBuild, which only signs files that are under these paths -->
     <IntermediateOutputPath>$(BaseOutputDirectory)</IntermediateOutputPath>
     <OutDir>$(BaseOutputDirectory)</OutDir>

build/SignVsix.proj

@@ -3,14 +3,14 @@
   <Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props" />
 
   <PropertyGroup>
-    <BaseOutputDirectory>$(BUILD_STAGINGDIRECTORY)</BaseOutputDirectory>
+    <BaseOutputDirectory>$(BUILD_STAGINGDIRECTORY)\vscode-arduino</BaseOutputDirectory>
     <!-- These properties are required by MicroBuild, which only signs files that are under these paths -->
     <IntermediateOutputPath>$(BaseOutputDirectory)</IntermediateOutputPath>
     <OutDir>$(BaseOutputDirectory)</OutDir>
   </PropertyGroup>
 
   <ItemGroup>
-    <FilesToSign Include="$(OutDir)\vscode-arduino.vsix">
+    <FilesToSign Include="$(OutDir)\*.vsix">
       <Authenticode>VsixSHA2</Authenticode>
     </FilesToSign>
   </ItemGroup>