Merge pull request #41 from mjcheetham/windows-installer

 Add Windows payload and installer projects

Author: mjcheetham

.azure-pipelines/continuous-integration.yml

@@ -11,6 +11,7 @@ jobs:
     vmImage: vs2017-win2016
   steps:
   - template: templates/windows/compile.yml
+  - template: templates/windows/pack.yml
 
 - job: osx
   displayName: macOS

.azure-pipelines/pull-request.yml

@@ -11,6 +11,7 @@ jobs:
     vmImage: vs2017-win2016
   steps:
   - template: templates/windows/compile.yml
+  - template: templates/windows/pack.yml
 
 - job: osx
   displayName: macOS

.azure-pipelines/release.yml

@@ -11,6 +11,7 @@ jobs:
     name: VSEng-MicroBuildVS2017
   steps:
   - template: templates/windows/compile.yml
+  - template: templates/windows/pack.yml
 
 - job: osx_step1
   displayName: macOS (Build & Layout)

.azure-pipelines/templates/osx/pack.signed/step1-layout.yml

@@ -11,5 +11,5 @@ steps:
   - task: PublishPipelineArtifact@0
     displayName: Upload symbols
     inputs:
-      artifactName: 'Symbols.Mac'
+      artifactName: 'tmp.macsymbols'
       targetPath: '$(Build.StagingDirectory)/symbols'

.azure-pipelines/templates/osx/pack.signed/step4-signpack.yml

@@ -37,13 +37,21 @@ steps:
       artifactName: 'tmp.macpayload_signed'
       downloadPath: '$(Build.StagingDirectory)\payload'
 
+  - task: DownloadPipelineArtifact@1
+    displayName: Download symbols
+    inputs:
+      buildType: 'current'
+      artifactName: 'tmp.macsymbols'
+      downloadPath: '$(Build.StagingDirectory)\symbols'
+
   - script: |
       xcopy "$(Build.StagingDirectory)\pkg\*.pkg" "$(Build.StagingDirectory)\publish\"
       xcopy "$(Build.StagingDirectory)\payload"   "$(Build.StagingDirectory)\publish\payload\"
+      xcopy "$(Build.StagingDirectory)\symbols"   "$(Build.StagingDirectory)\publish\payload.sym\"
     displayName: Prepare final build artifact
 
   - task: PublishPipelineArtifact@0
-    displayName: Upload signed package and payload
+    displayName: Publish signed installer artifacts
     inputs:
       artifactName: 'Installer.Mac.Signed'
       targetPath: '$(Build.StagingDirectory)\publish'

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

@@ -0,0 +1,21 @@
+steps:
+  - script: |
+      xcopy "out\windows\Installer.Windows\bin\$(configuration)\net461" "$(Build.StagingDirectory)\publish\"
+      xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461"   "$(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
+
+  - task: PublishPipelineArtifact@0
+    displayName: Publish unsigned installer artifacts
+    condition: and(succeeded(), ne(variables['SignType'], 'real'))
+    inputs:
+        artifactName: 'Installer.Windows.Unsigned'
+        targetPath: '$(Build.StagingDirectory)\publish'
+
+  - task: PublishPipelineArtifact@0
+    displayName: Publish signed installer artifacts
+    condition: and(succeeded(), eq(variables['SignType'], 'real'))
+    inputs:
+        artifactName: 'Installer.Windows.Signed'
+        targetPath: '$(Build.StagingDirectory)\publish'

Directory.Build.props

@@ -17,6 +17,7 @@
     <RepoPath>$(MSBuildThisFileDirectory)</RepoPath>
     <RepoSrcPath>$(RepoPath)src\</RepoSrcPath>
     <RepoOutPath>$(RepoPath)out\</RepoOutPath>
+    <RepoAssetsPath>$(RepoPath)assets\</RepoAssetsPath>
   </PropertyGroup>
 
   <ItemGroup>

Git-Credential-Manager.sln

@@ -39,6 +39,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication.Helpe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI", "src\windows\GitHub.UI\GitHub.UI.csproj", "{6AD4EA05-44A7-45DD-92C8-6A4C8870FB50}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer.Windows", "src\windows\Installer.Windows\Installer.Windows.csproj", "{85903170-9E52-4B53-A6E4-3F416F684FAE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.Windows", "src\windows\Payload.Windows\Payload.Windows.csproj", "{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{65E53644-7FB7-4EC2-8C41-4356F7A4C0C4}"
+ProjectSection(SolutionItems) = preProject
+	assets\gcm-transparent.png = assets\gcm-transparent.png
+	assets\gcmicon.ico = assets\gcmicon.ico
+	assets\gcmicon128.bmp = assets\gcmicon128.bmp
+	assets\gcmicon16.bmp = assets\gcmicon16.bmp
+	assets\gcmicon256.bmp = assets\gcmicon256.bmp
+	assets\gcmicon32.bmp = assets\gcmicon32.bmp
+	assets\gcmicon64.bmp = assets\gcmicon64.bmp
+	assets\gcmweb.png = assets\gcmweb.png
+EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -193,6 +209,22 @@ Global
 		{6AD4EA05-44A7-45DD-92C8-6A4C8870FB50}.WindowsDebug|Any CPU.Build.0 = Debug|Any CPU
 		{6AD4EA05-44A7-45DD-92C8-6A4C8870FB50}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{6AD4EA05-44A7-45DD-92C8-6A4C8870FB50}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.WindowsDebug|Any CPU.Build.0 = Debug|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{85903170-9E52-4B53-A6E4-3F416F684FAE}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.WindowsDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.WindowsDebug|Any CPU.Build.0 = Debug|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.MacDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.MacRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.WindowsRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549}.WindowsRelease|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -215,6 +247,8 @@ Global
 		{74FA0AA4-B5C1-4F3B-B182-277FC2D50715} = {3D279E2D-E011-45CF-8EA8-3D71D1300443}
 		{47A55897-B044-4508-B0FD-85B3947AF842} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 		{6AD4EA05-44A7-45DD-92C8-6A4C8870FB50} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
+		{85903170-9E52-4B53-A6E4-3F416F684FAE} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
+		{8DBBAB0A-970D-4BE3-958C-8CDC92F76549} = {66722747-1B61-40E4-A89B-1AC8E6D62EA9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0EF9FC65-E6BA-45D4-A455-262A9EA4366B}