From 9472d0d7da4c2d3c54098234b5219bd8be80d9b7 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Wed, 15 May 2024 20:52:59 +0100
Subject: [PATCH 1/4] Enable code signing with Azure Trusted Signing

---
 azure-pipelines.yml    | 85 ++++++++++++++++++++++++++++++++++++------
 src/IndentGuide.csproj |  1 -
 2 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 80bd83f..7e12364 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,7 +1,8 @@
-# .NET Desktop
-# Build and run tests for .NET Desktop or Windows classic desktop solutions.
-# Add steps that publish symbols, save build artifacts, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
+parameters:
+- name: Sign
+  displayName: Sign
+  type: boolean
+  default: false
 
 trigger:
 - master
@@ -10,9 +11,20 @@ pool:
   vmImage: 'windows-2022'
 
 variables:
-  solution: 'src/IndentGuide.sln'
-  buildPlatform: 'Any CPU'
-  buildConfiguration: 'Release'
+- ${{ if eq(parameters.Sign, 'true') }}:
+  - group: IndentGuideSigning
+- name: solution
+  value: 'src/IndentGuide.sln'
+- name: buildPlatform
+  value: 'Any CPU'
+- name: buildConfiguration
+  value: 'Release'
+- name: IntermediateOutputPath
+  value: '$(Build.BinariesDirectory)\obj'
+- name: OutputPath
+  value: '$(Build.BinariesDirectory)\bin'
+- name: Drop
+  value: '$(Build.ArtifactStagingDirectory)\drop'
 
 steps:
 - task: NuGetToolInstaller@0
@@ -26,6 +38,50 @@ steps:
     solution: '$(solution)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
+    msbuildArgs: '/p:CreateVsixContainer=false'
+
+- ${{ if eq(parameters.Sign, 'true') }}:
+  - task: TrustedSigning@0
+    displayName: Sign with Trusted Signing
+    inputs:
+      AzureTenantID: '$(Sign.AzureTenantID)'
+      AzureClientID: '$(Sign.AzureClientID)'
+      AzureClientSecret: '$(Sign.AzureClientSecret)'
+      Endpoint: '$(Sign.EndPoint)'
+      CodeSigningAccountName: '$(Sign.CodeSigningAccountName)'
+      CertificateProfileName: '$(Sign.CertificateProfileName)'
+      FilesFolder: '$(IntermediateOutputPath)'
+      FilesFolderFilter: 'dll'
+      FilesFolderRecurse: true
+      FilesFolderDepth: 2
+      FileDigest: 'SHA256'
+      TimestampRfc3161: 'http://timestamp.acs.microsoft.com'
+      TimestampDigest: 'SHA256'
+
+- task: VSBuild@1
+  inputs:
+    solution: '$(solution)'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+    msbuildArgs: '/t:CreateVsixContainer /p:OutDir="$(OutputPath)"'
+
+- ${{ if eq(parameters.Sign, 'true') }}:
+  - task: TrustedSigning@0
+    displayName: Sign with Trusted Signing
+    inputs:
+      AzureTenantID: '$(Sign.AzureTenantID)'
+      AzureClientID: '$(Sign.AzureClientID)'
+      AzureClientSecret: '$(Sign.AzureClientSecret)'
+      Endpoint: '$(Sign.EndPoint)'
+      CodeSigningAccountName: '$(Sign.CodeSigningAccountName)'
+      CertificateProfileName: '$(Sign.CertificateProfileName)'
+      FilesFolder: '$(OutputPath)'
+      FilesFolderFilter: 'vsix'
+      FilesFolderRecurse: true
+      FilesFolderDepth: 2
+      FileDigest: 'SHA256'
+      TimestampRfc3161: 'http://timestamp.acs.microsoft.com'
+      TimestampDigest: 'SHA256'
 
 - task: VisualStudioTestPlatformInstaller@1
   inputs:
@@ -38,7 +94,14 @@ steps:
     configuration: '$(buildConfiguration)'
     vsTestVersion: 'toolsInstaller'
 
-- task: PublishPipelineArtifact@0
-  inputs:
-    artifactName: 'bin'
-    targetPath: 'src/bin'
+- powershell: |
+    copy "$(OutputPath)\*.vsix" (mkdir "$(Drop)" -Force)
+  displayName: 'Copy VSIX to drop'
+
+- publish: $(Drop)
+  artifactName: drop
+  displayName: 'Publish drop'
+
+- publish: $(OutputDir)
+  artifactName: bin
+  displayName: 'Publish bin'
diff --git a/src/IndentGuide.csproj b/src/IndentGuide.csproj
index 6c9bfcd..682b757 100644
--- a/src/IndentGuide.csproj
+++ b/src/IndentGuide.csproj
@@ -289,7 +289,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VSTarget)\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From 8d7eb94aa6cdfbe8d5d4a59073e3a813ad777c32 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Wed, 15 May 2024 20:54:08 +0100
Subject: [PATCH 2/4] Fix publish steps

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7e12364..cf38f14 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -99,9 +99,9 @@ steps:
   displayName: 'Copy VSIX to drop'
 
 - publish: $(Drop)
-  artifactName: drop
+  artifact: drop
   displayName: 'Publish drop'
 
 - publish: $(OutputDir)
-  artifactName: bin
+  artifact: bin
   displayName: 'Publish bin'

From 1c0ebd4e5bc898abe46bb458b6b6e56ebb2ebd07 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Wed, 15 May 2024 22:00:38 +0100
Subject: [PATCH 3/4] Display names and run tests first

---
 azure-pipelines.yml | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cf38f14..4fc4e86 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,8 +13,6 @@ pool:
 variables:
 - ${{ if eq(parameters.Sign, 'true') }}:
   - group: IndentGuideSigning
-- name: solution
-  value: 'src/IndentGuide.sln'
 - name: buildPlatform
   value: 'Any CPU'
 - name: buildConfiguration
@@ -28,21 +26,37 @@ variables:
 
 steps:
 - task: NuGetToolInstaller@0
+  displayName: 'Update Nuget'
 
 - task: NuGetCommand@2
+  displayName: 'Restore Nuget dependencies'
   inputs:
-    restoreSolution: '$(solution)'
+    restoreSolution: 'src/IndentGuide.sln'
 
 - task: VSBuild@1
+  displayName: 'Build'
   inputs:
-    solution: '$(solution)'
+    solution: 'src/IndentGuide.sln'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
     msbuildArgs: '/p:CreateVsixContainer=false'
 
+- task: VisualStudioTestPlatformInstaller@1
+  displayName: 'Install test platform'
+  inputs:
+    packageFeedSelector: 'nugetOrg'
+    versionSelector: 'latestPreRelease'
+
+- task: VSTest@2
+  displayName: 'Run tests'
+  inputs:
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+    vsTestVersion: 'toolsInstaller'
+
 - ${{ if eq(parameters.Sign, 'true') }}:
   - task: TrustedSigning@0
-    displayName: Sign with Trusted Signing
+    displayName: 'Sign binaries'
     inputs:
       AzureTenantID: '$(Sign.AzureTenantID)'
       AzureClientID: '$(Sign.AzureClientID)'
@@ -59,15 +73,16 @@ steps:
       TimestampDigest: 'SHA256'
 
 - task: VSBuild@1
+  displayName: 'Build vsix package'
   inputs:
-    solution: '$(solution)'
+    solution: 'src/IndentGuide.csproj'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
     msbuildArgs: '/t:CreateVsixContainer /p:OutDir="$(OutputPath)"'
 
 - ${{ if eq(parameters.Sign, 'true') }}:
   - task: TrustedSigning@0
-    displayName: Sign with Trusted Signing
+    displayName: 'Sign vsix'
     inputs:
       AzureTenantID: '$(Sign.AzureTenantID)'
       AzureClientID: '$(Sign.AzureClientID)'
@@ -83,17 +98,6 @@ steps:
       TimestampRfc3161: 'http://timestamp.acs.microsoft.com'
       TimestampDigest: 'SHA256'
 
-- task: VisualStudioTestPlatformInstaller@1
-  inputs:
-    packageFeedSelector: 'nugetOrg'
-    versionSelector: 'latestPreRelease'
-
-- task: VSTest@2
-  inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
-    vsTestVersion: 'toolsInstaller'
-
 - powershell: |
     copy "$(OutputPath)\*.vsix" (mkdir "$(Drop)" -Force)
   displayName: 'Copy VSIX to drop'

From 5e7326f89977f173ef25d13d267c165fa17fdfe0 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Wed, 15 May 2024 22:20:20 +0100
Subject: [PATCH 4/4] Fix path

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4fc4e86..87dbc8f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -106,6 +106,6 @@ steps:
   artifact: drop
   displayName: 'Publish drop'
 
-- publish: $(OutputDir)
+- publish: $(OutputPath)
   artifact: bin
   displayName: 'Publish bin'