Merge pull request #105 from microsoft/master

Cut new release

Author: mjcheetham

.azure-pipelines/continuous-integration.yml

@@ -3,20 +3,22 @@ trigger:
 
 variables:
   configuration: Release
+  winImage: vs2017-win2016
+  osxImage: macos-latest
 
 jobs:
 - job: windows
   displayName: Windows
   pool:
-    vmImage: vs2017-win2016
+    vmImage: $(winImage)
   steps:
   - template: templates/windows/compile.yml
   - template: templates/windows/pack.yml
 
 - job: osx
   displayName: macOS
   pool:
-    vmImage: macOS 10.13
+    vmImage: $(osxImage)
   steps:
   - template: templates/osx/compile.yml
   - template: templates/osx/pack.unsigned.yml

.azure-pipelines/pull-request.yml

@@ -3,20 +3,22 @@ trigger: none
 
 variables:
   configuration: Release
+  winImage: vs2017-win2016
+  osxImage: macos-latest
 
 jobs:
 - job: windows
   displayName: Windows
   pool:
-    vmImage: vs2017-win2016
+    vmImage: $(winImage)
   steps:
   - template: templates/windows/compile.yml
   - template: templates/windows/pack.yml
 
 - job: osx
   displayName: macOS
   pool:
-    vmImage: macOS 10.13
+    vmImage: $(osxImage)
   steps:
   - template: templates/osx/compile.yml
   - template: templates/osx/pack.unsigned.yml

.azure-pipelines/release.yml

@@ -3,20 +3,23 @@ trigger:
 
 variables:
   configuration: Release
+  signPool: VSEng-MicroBuildVS2017
+  winImage: vs2017-win2016
+  osxImage: macos-latest
 
 jobs:
 - job: windows
   displayName: Windows
   pool:
-    name: VSEng-MicroBuildVS2017
+    name: $(signPool)
   steps:
   - template: templates/windows/compile.yml
   - template: templates/windows/pack.yml
 
 - job: osx_step1
   displayName: macOS (Build & Layout)
   pool:
-    vmImage: macOS 10.13
+    vmImage: $(osxImage)
   steps:
   - template: templates/osx/compile.yml
   - template: templates/osx/pack.signed/step1-layout.yml
@@ -26,7 +29,7 @@ jobs:
   dependsOn: osx_step1
   condition: succeeded()
   pool:
-    name: VSEng-MicroBuildVS2017
+    name: $(signPool)
   steps:
   - template: templates/osx/pack.signed/step2-signpayload.yml
 
@@ -35,7 +38,7 @@ jobs:
   dependsOn: osx_step2
   condition: succeeded()
   pool:
-    vmImage: macOS 10.13
+    vmImage: $(osxImage)
   steps:
   - template: templates/osx/pack.signed/step3-pack.yml
 
@@ -44,7 +47,7 @@ jobs:
   dependsOn: osx_step3
   condition: succeeded()
   pool:
-    name: VSEng-MicroBuildVS2017
+    name: $(signPool)
   steps:
   - template: templates/osx/pack.signed/step4-signpack.yml
 
@@ -53,6 +56,6 @@ jobs:
   dependsOn: osx_step4
   condition: succeeded()
   pool:
-    vmImage: macOS 10.13
+    vmImage: $(osxImage)
   steps:
   - template: templates/osx/pack.signed/step5-dist.yml

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

@@ -1,22 +1,22 @@
 steps:
-- task: DotNetCoreInstaller@0
-  displayName: Install .NET Core SDK 2.2.100
-  inputs:
-    packageType: sdk
-    version: '2.2.100'
+  - task: UseDotNet@2
+    displayName: Use .NET Core SDK 3.1.x
+    inputs:
+      packageType: sdk
+      version: 3.1.x
 
-- task: DotNetCoreCLI@2
-  displayName: Compile common code and macOS Helpers
-  inputs:
-    command: build
-    projects: 'Git-Credential-Manager.sln'
-    arguments: '--configuration=Mac$(configuration)'
+  - task: DotNetCoreCLI@2
+    displayName: Compile common code and macOS Helpers
+    inputs:
+      command: build
+      projects: 'Git-Credential-Manager.sln'
+      arguments: '--configuration=Mac$(configuration)'
 
-- task: DotNetCoreCLI@2
-  displayName: Run common unit tests
-  inputs:
-    command: test
-    projects: 'Git-Credential-Manager.sln'
-    arguments: '--configuration=Mac$(configuration)'
-    publishTestResults: true
-    testRunTitle: 'Unit tests - common (macOS)'
+  - task: DotNetCoreCLI@2
+    displayName: Run common unit tests
+    inputs:
+      command: test
+      projects: 'Git-Credential-Manager.sln'
+      arguments: '--configuration=Mac$(configuration)'
+      publishTestResults: true
+      testRunTitle: 'Unit tests (macOS)'

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

@@ -6,16 +6,16 @@ steps:
       artifactName: 'tmp.macpayload_signed'
       downloadPath: '$(Build.StagingDirectory)/payload'
 
-  - task: DotNetCoreInstaller@0
-    displayName: Install .NET Core SDK 2.2.100
+  - task: UseDotNet@2
+    displayName: Use .NET Core SDK 3.1.x
     inputs:
       packageType: sdk
-      version: '2.2.100'
+      version: 3.1.x
 
-  - script: dotnet tool install --tool-path './.tmp' nbgv
+  - script: dotnet tool install --global nbgv
     displayName: Install Nerdbank.GitVersioning tool
 
-  - script: ./.tmp/nbgv cloud --common-vars
+  - 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)/pkg/gcmcore-osx-$(GitBuildVersion).pkg'

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

@@ -28,7 +28,31 @@ steps:
       cp -f  "$(Build.StagingDirectory)"/pkg/*.pkg "$(Build.StagingDirectory)/publish/"
       cp -Rf "$(Build.StagingDirectory)/payload/"  "$(Build.StagingDirectory)/publish/payload/"
       cp -Rf "$(Build.StagingDirectory)/symbols/"  "$(Build.StagingDirectory)/publish/payload.sym/"
-    displayName: Prepare final build artifact
+    displayName: Prepare final build artifacts
+
+  - script: dotnet tool install --global nbgv
+    displayName: Install Nerdbank.GitVersioning tool
+
+  - script: nbgv cloud --common-vars
+    displayName: Set version variables
+
+  - task: ArchiveFiles@2
+    displayName: Create payload archive
+    inputs:
+      rootFolderOrFile: '$(Build.StagingDirectory)\publish\payload\'
+      includeRootFolder: false
+      archiveType: 'tar'
+      archiveFile: '$(Build.StagingDirectory)\publish\gcmcore-osx-$(GitBuildVersion).tar.gz'
+      replaceExistingArchive: true
+
+  - task: ArchiveFiles@2
+    displayName: Create symbol archive
+    inputs:
+      rootFolderOrFile: '$(Build.StagingDirectory)\publish\payload.sym\'
+      includeRootFolder: false
+      archiveType: 'tar'
+      archiveFile: '$(Build.StagingDirectory)\publish\symbols-osx.tar.gz'
+      replaceExistingArchive: true
 
   - task: PublishPipelineArtifact@0
     displayName: Publish signed installer artifacts

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

@@ -1,6 +1,34 @@
 steps:
+  - script: |
+      cp -R "out/osx/Installer.Mac/pkg/$(configuration)" "$(Build.StagingDirectory)/publish/"
+    displayName: Prepare final build artifacts
+
+  - script: dotnet tool install --global nbgv
+    displayName: Install Nerdbank.GitVersioning tool
+
+  - script: nbgv cloud --common-vars
+    displayName: Set version variables
+
+  - task: ArchiveFiles@2
+    displayName: Create payload archive
+    inputs:
+      rootFolderOrFile: '$(Build.StagingDirectory)/publish/payload'
+      includeRootFolder: false
+      archiveType: 'tar'
+      archiveFile: '$(Build.StagingDirectory)/publish/gcmcore-osx-$(GitBuildVersion).tar.gz'
+      replaceExistingArchive: true
+
+  - task: ArchiveFiles@2
+    displayName: Create symbol archive
+    inputs:
+      rootFolderOrFile: '$(Build.StagingDirectory)/publish/payload.sym/'
+      includeRootFolder: false
+      archiveType: 'tar'
+      archiveFile: '$(Build.StagingDirectory)/publish/symbols-osx.tar.gz'
+      replaceExistingArchive: true
+
   - task: PublishPipelineArtifact@0
     displayName: Publish unsigned installer artifacts
     inputs:
         artifactName: 'Installer.Mac.Unsigned'
-        targetPath: 'out/osx/Installer.Mac/pkg/$(configuration)'
+        targetPath: '$(Build.StagingDirectory)/publish'

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

@@ -1,50 +1,36 @@
 steps:
-- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
-  displayName: Install signing plugin
-  condition: and(succeeded(), eq(variables['SignType'], 'real'))
-  inputs:
-    signType: '$(SignType)'
+  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
+    displayName: Install signing plugin
+    condition: and(succeeded(), eq(variables['SignType'], 'real'))
+    inputs:
+      signType: '$(SignType)'
 
-- task: DotNetCoreInstaller@0
-  displayName: Install .NET Core SDK 2.2.100
-  inputs:
-    packageType: sdk
-    version: '2.2.100'
+  - task: UseDotNet@2
+    displayName: Use .NET Core SDK 3.1.x
+    inputs:
+      packageType: sdk
+      version: 3.1.x
 
-- task: NuGetToolInstaller@0
-  displayName: Install NuGet tool >=4.3.0
-  inputs:
-    versionSpec: '>=4.3.0'
+  - task: DotNetCoreCLI@2
+    displayName: Restore packages
+    inputs:
+      command: restore
+      projects: 'Git-Credential-Manager.sln'
+      arguments: '--configuration=Windows$(configuration)'
 
-- task: NuGetCommand@2
-  displayName: Restore packages
-  inputs:
-    command: restore
-    restoreSolution: 'Git-Credential-Manager.sln'
-    configuration: 'Windows$(configuration)'
+  - task: DotNetCoreCLI@2
+    displayName: Compile common code and Windows Helpers
+    inputs:
+      command: build
+      projects: 'Git-Credential-Manager.sln'
+      arguments: '--configuration=Windows$(configuration)'
 
-- task: MSBuild@1
-  displayName: Compile common code and Windows helpers
-  inputs:
-    solution: 'Git-Credential-Manager.sln'
-    configuration: 'Windows$(configuration)'
-
-- task: VSTest@2
-  displayName: Run common unit tests
-  inputs:
-    testAssemblyVer2: |
-      out\shared\*.Tests\bin\**\*.Tests.dll
-    configuration: 'Windows$(configuration)'
-    otherConsoleOptions: '/Framework:.NETCoreApp,Version=2.1'
-    testRunTitle: 'Unit tests - common (Windows)'
-
-# Uncomment once Windows helpers have unit tests
-# - task: VSTest@2
-#   displayName: Run helpers unit tests
-#   inputs:
-#     testAssemblyVer2: |
-#       out\windows\*.Tests\bin\**\*.Tests.dll
-#     configuration: 'Windows$(configuration)'
-#     otherConsoleOptions: '/Framework:.NETFramework,Version=v4.6.1'
-#     testRunTitle: 'Unit tests - helpers (Windows)'
+  - task: DotNetCoreCLI@2
+    displayName: Run common unit tests
+    inputs:
+      command: test
+      projects: 'Git-Credential-Manager.sln'
+      arguments: '--configuration=Mac$(configuration)'
+      publishTestResults: true
+      testRunTitle: 'Unit tests (Windows)'
 

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

@@ -1,10 +1,34 @@
 steps:
+  - script: dotnet tool install --global nbgv
+    displayName: Install Nerdbank.GitVersioning tool
+
+  - script: nbgv cloud --common-vars
+    displayName: Set version variables
+
   - script: |
       xcopy "out\windows\Installer.Windows\bin\$(configuration)\net461"       "$(Build.StagingDirectory)\publish\"
       xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x64" "$(Build.StagingDirectory)\publish\payload\"
       mkdir "$(Build.StagingDirectory)\publish\payload.sym\"
       move  "$(Build.StagingDirectory)\publish\payload\*.pdb"                 "$(Build.StagingDirectory)\publish\payload.sym\"
-    displayName: Prepare final build artifact
+    displayName: Prepare final build artifacts
+
+  - task: ArchiveFiles@2
+    displayName: Create payload archive
+    inputs:
+      rootFolderOrFile: '$(Build.StagingDirectory)\publish\payload\'
+      includeRootFolder: false
+      archiveType: 'zip'
+      archiveFile: '$(Build.StagingDirectory)\publish\gcmcore-win-x64-$(GitBuildVersion).zip'
+      replaceExistingArchive: true
+
+  - task: ArchiveFiles@2
+    displayName: Create symbol archive
+    inputs:
+      rootFolderOrFile: '$(Build.StagingDirectory)\publish\payload.sym\'
+      includeRootFolder: false
+      archiveType: 'zip'
+      archiveFile: '$(Build.StagingDirectory)\publish\symbols-win-x64.zip'
+      replaceExistingArchive: true
 
   - task: PublishPipelineArtifact@0
     displayName: Publish unsigned installer artifacts

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp2.1/git-credential-manager-core.dll",
+            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp3.1/git-credential-manager-core.dll",
             "args": ["get"],
             "cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
             "console": "integratedTerminal",