Merge pull request #642 from GitCredentialManager/main

New release 2.0.703

Author: ldennington

.azure-pipelines/templates/linux/compile.yml

@@ -1,9 +1,9 @@
 steps:
   - task: UseDotNet@2
-    displayName: Use .NET SDK 5.0.203
+    displayName: Use .NET SDK 6.0.201
     inputs:
       packageType: sdk
-      version: 5.0.203
+      version: 6.0.201
 
   - task: DotNetCoreCLI@2
     displayName: Compile common code

.azure-pipelines/templates/osx/compile.yml

@@ -1,9 +1,9 @@
 steps:
   - task: UseDotNet@2
-    displayName: Use .NET SDK 5.0.203
+    displayName: Use .NET SDK 6.0.201
     inputs:
       packageType: sdk
-      version: 5.0.203
+      version: 6.0.201
 
   - task: DotNetCoreCLI@2
     displayName: Compile common code and macOS Helpers

.azure-pipelines/templates/osx/pack.signed/step2-signpayload.yml

@@ -15,6 +15,17 @@ steps:
       buildType: 'current'
       artifactName: 'tmp.macpayload_unsigned'
       downloadPath: '$(Build.StagingDirectory)\payload'
+  
+  - task: UseDotNet@2
+    displayName: Use .NET SDK 6.0.201
+    inputs:
+      packageType: sdk
+      version: 6.0.201
+
+  - task: NuGetToolInstaller@0
+    displayName: Install NuGet tool >=4.3.0
+    inputs:
+      versionSpec: '>=4.3.0'
 
   # Must use the NuGet & MSBuild toolchain here rather than `dotnet`
   # because the signing tasks target the netfx MSBuild runtime only.

.azure-pipelines/templates/osx/pack.signed/step3-pack.yml

@@ -7,25 +7,25 @@ steps:
       downloadPath: '$(Build.StagingDirectory)/payload'
 
   - task: UseDotNet@2
-    displayName: Use .NET SDK 5.0.203
+    displayName: Use .NET SDK 6.0.201
     inputs:
       packageType: sdk
-      version: 5.0.203
+      version: 6.0.201
 
   - script: dotnet tool install --global nbgv
     displayName: Install Nerdbank.GitVersioning tool
 
   - script: nbgv cloud --common-vars
     displayName: Set version variables
 
-  - script: src/osx/Installer.Mac/pack.sh --payload='$(Build.StagingDirectory)/payload' --version='$(GitBuildVersion)' --output='$(Build.StagingDirectory)/components/com.microsoft.gitcredentialmanager.component.pkg'
+  - script: src/osx/Installer.Mac/pack.sh --payload='$(Build.StagingDirectory)/payload' --version='$(GitBuildVersionSimple)' --output='$(Build.StagingDirectory)/components/com.microsoft.gitcredentialmanager.component.pkg'
     displayName: Create component package
 
-  - script: src/osx/Installer.Mac/dist.sh --package-path='$(Build.StagingDirectory)/components' --version='$(GitBuildVersion)' --output='$(Build.StagingDirectory)/pkg/gcmcore-osx-$(GitBuildVersion).pkg' || exit 1
+  - script: src/osx/Installer.Mac/dist.sh --package-path='$(Build.StagingDirectory)/components' --version='$(GitBuildVersionSimple)' --output='$(Build.StagingDirectory)/pkg/gcmcore-osx-$(GitBuildVersionSimple).pkg' || exit 1
     displayName: Create product archive
 
   - task: PublishPipelineArtifact@0
     displayName: Upload unsigned package
     inputs:
       artifactName: 'tmp.macinstaller_unsigned'
-      targetPath: '$(Build.StagingDirectory)/pkg/gcmcore-osx-$(GitBuildVersion).pkg'
+      targetPath: '$(Build.StagingDirectory)/pkg/gcmcore-osx-$(GitBuildVersionSimple).pkg'

.azure-pipelines/templates/osx/pack.signed/step5-dist.yml

@@ -44,7 +44,7 @@ steps:
       rootFolderOrFile: '$(Build.StagingDirectory)/publish/payload/'
       includeRootFolder: false
       archiveType: 'tar'
-      archiveFile: '$(Build.StagingDirectory)/publish/gcmcore-osx-$(GitBuildVersion).tar.gz'
+      archiveFile: '$(Build.StagingDirectory)/publish/gcmcore-osx-$(GitBuildVersionSimple).tar.gz'
       replaceExistingArchive: true
 
   - task: ArchiveFiles@2

.azure-pipelines/templates/osx/pack.unsigned.yml

@@ -15,7 +15,7 @@ steps:
       rootFolderOrFile: '$(Build.StagingDirectory)/publish/payload'
       includeRootFolder: false
       archiveType: 'tar'
-      archiveFile: '$(Build.StagingDirectory)/publish/gcmcore-osx-$(GitBuildVersion).tar.gz'
+      archiveFile: '$(Build.StagingDirectory)/publish/gcmcore-osx-$(GitBuildVersionSimple).tar.gz'
       replaceExistingArchive: true
 
   - task: ArchiveFiles@2

.azure-pipelines/templates/windows/compile.signed.yml

@@ -11,10 +11,10 @@ steps:
       signType: '$(SignType)'
 
   - task: UseDotNet@2
-    displayName: Use .NET SDK 5.0.203
+    displayName: Use .NET SDK 6.0.201
     inputs:
       packageType: sdk
-      version: 5.0.203
+      version: 6.0.201
 
   - task: NuGetToolInstaller@0
     displayName: Install NuGet tool >=4.3.0

.azure-pipelines/templates/windows/compile.yml

@@ -1,9 +1,9 @@
 steps:
   - task: UseDotNet@2
-    displayName: Use .NET SDK 5.0.203
+    displayName: Use .NET SDK 6.0.201
     inputs:
       packageType: sdk
-      version: 5.0.203
+      version: 6.0.201
 
   - task: DotNetCoreCLI@2
     displayName: Restore packages

.azure-pipelines/templates/windows/pack.yml

@@ -18,7 +18,7 @@ steps:
       rootFolderOrFile: '$(Build.StagingDirectory)\publish\payload\'
       includeRootFolder: false
       archiveType: 'zip'
-      archiveFile: '$(Build.StagingDirectory)\publish\gcmcore-win-x86-$(GitBuildVersion).zip'
+      archiveFile: '$(Build.StagingDirectory)\publish\gcmcore-win-x86-$(GitBuildVersionSimple).zip'
       replaceExistingArchive: true
 
   - task: ArchiveFiles@2

.github/run_esrp_signing.py

@@ -4,6 +4,7 @@
 import pprint
 import subprocess
 import sys
+import re
 
 esrp_tool = os.path.join("esrp", "tools", "EsrpClient.exe")
 
@@ -96,8 +97,17 @@
 	"-p", "policy.json",
 	"-o", esrp_out,
 	"-l", "Verbose"],
+	capture_output=True,
+	text=True,
 	cwd=workspace)
 
+# Scrub log before printing
+log = re.sub(r'^.+Uploading.*to\s*destinationUrl\s*(.+?),.+$',
+    '***', 
+    result.stdout,
+    flags=re.IGNORECASE|re.MULTILINE)
+printf(log)
+
 if result.returncode != 0:
 	print("Failed to run ESRPClient.exe")
 	sys.exit(1)