From f966f8e3b3b0bd51da0315abe1beac1b2a0d6682 Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <KirillOsenkov@users.noreply.github.com>
Date: Mon, 22 Jan 2018 14:31:13 -0800
Subject: [PATCH 1/5] Save MSBuild .binlog as an AppVeyor artifact

---
 appveyor.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 242d934c2..82f856e6d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,10 +11,17 @@ before_build:
   - nuget restore
 
 build_script:
-  - msbuild "GitCredentialManager.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /consoleloggerparameters:Verbosity=normal /nodeReuse:false /target:"Build" /property:Configuration="%configuration%";Platform="%platform%"
+  - msbuild "GitCredentialManager.sln" /bl:GitCredentialManager.binlog /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /consoleloggerparameters:Verbosity=normal /nodeReuse:false /target:"Build" /property:Configuration="%configuration%";Platform="%platform%"
 
 cache:
   - packages -> **\packages.config
 
 matrix:
   fast_finish: true
+
+artifacts:
+  - path: GitCredentialManager.binlog
+    name: MSBuild Log
+
+on_failure:
+  - appveyor PushArtifact GitCredentialManager.binlog

From 0d6f8ab2b7cbb0cabce337b7be0b0ed06cebd84c Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <github@osenkov.com>
Date: Mon, 22 Jan 2018 14:37:43 -0800
Subject: [PATCH 2/5] Use VS 2017 on the CI agents to use the new /bl feature
 of MSBuild.

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 82f856e6d..0f54c7695 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,7 @@
 version: "{build}"
 
+image: Visual Studio 2017
+
 clone_depth: 10
 
 configuration:

From 0da887d497c015baf36146faeb8bb296da765f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=20Wyman=20=E2=88=9E?= <jwyman@microsoft.com>
Date: Mon, 22 Jan 2018 17:52:38 -0500
Subject: [PATCH 3/5] enable parallel builds

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

diff --git a/appveyor.yml b/appveyor.yml
index 0f54c7695..1d08a626e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,7 +13,7 @@ before_build:
   - nuget restore
 
 build_script:
-  - msbuild "GitCredentialManager.sln" /bl:GitCredentialManager.binlog /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /consoleloggerparameters:Verbosity=normal /nodeReuse:false /target:"Build" /property:Configuration="%configuration%";Platform="%platform%"
+  - msbuild "GitCredentialManager.sln" /bl:GitCredentialManager.binlog /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /consoleloggerparameters:Verbosity=normal /m /nodeReuse:false /target:"Build" /property:Configuration="%configuration%";Platform="%platform%"
 
 cache:
   - packages -> **\packages.config

From 83f2e7aefe23c83091eab0a5d6a41b9de7ad4e1e Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <github@osenkov.com>
Date: Mon, 22 Jan 2018 15:08:50 -0800
Subject: [PATCH 4/5] Make sure dependent projects are built before
 Installer.proj.

---
 Installer/Installer.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Installer/Installer.proj b/Installer/Installer.proj
index 94472ea6a..8eb44502f 100644
--- a/Installer/Installer.proj
+++ b/Installer/Installer.proj
@@ -88,6 +88,7 @@
   </ItemGroup>
   <Target Name="AfterBuild" AfterTargets="Build" />
   <Target Name="Build" BeforeTargets="AfterBuild">
+    <MSBuild Projects="@(ProjectReference)" Targets="Build" />
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <MakeDir Directories="$(OutputPath)" />
     <Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(IntermediateOutputPath)" />

From bfdf2b549063880c0a1f94712bedd14c9d79f949 Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <github@osenkov.com>
Date: Mon, 22 Jan 2018 15:40:41 -0800
Subject: [PATCH 5/5] Make sure directory enumeration happens after it's been
 populated

Currently the glob enumeration happens too early. None of the outputs of the dependent projects have been produced. We need to enumerate the directory after evaluation, during the actual build and after the dependent projects have been built.
---
 Installer/Installer.proj | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Installer/Installer.proj b/Installer/Installer.proj
index 8eb44502f..bbcbfef45 100644
--- a/Installer/Installer.proj
+++ b/Installer/Installer.proj
@@ -58,13 +58,6 @@
       <Name>Microsoft.Vsts.Authentication</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <FilesToCopy Include="$(SolutionDir)\Cli-CredentialHelper\$(InputPath)\*.*" />
-    <FilesToCopy Include="$(SolutionDir)\Cli-Askpass\$(InputPath)\git-askpass.exe" />
-    <FilesToCopy Include="$(SolutionDir)\LICENSE.TXT" />
-    <FilesToCopy Include="$(SolutionDir)\README.md" />
-    <FilesToCopy Include="$(ProjectDir)\Setup.iss" />
-  </ItemGroup>
   <ItemGroup>
     <FilesToSign Include="$(SigningTarget)">
       <Authenticode>Microsoft</Authenticode>
@@ -89,6 +82,16 @@
   <Target Name="AfterBuild" AfterTargets="Build" />
   <Target Name="Build" BeforeTargets="AfterBuild">
     <MSBuild Projects="@(ProjectReference)" Targets="Build" />
+
+    <!-- need to declare the items after dependencies have built, so that glob enumeration happens after the files are produced-->
+    <ItemGroup>
+      <FilesToCopy Include="$(SolutionDir)\Cli-CredentialHelper\$(InputPath)\*.*" />
+      <FilesToCopy Include="$(SolutionDir)\Cli-Askpass\$(InputPath)\git-askpass.exe" />
+      <FilesToCopy Include="$(SolutionDir)\LICENSE.TXT" />
+      <FilesToCopy Include="$(SolutionDir)\README.md" />
+      <FilesToCopy Include="$(ProjectDir)\Setup.iss" />
+    </ItemGroup>
+
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <MakeDir Directories="$(OutputPath)" />
     <Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(IntermediateOutputPath)" />