From ee9d2c9725ca637eac14f79ba733e01f47a9b554 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 16 Jul 2019 19:57:00 +0200
Subject: [PATCH 1/2] fixup! WIP .gitignore: ignore library directories created
 by MSVC VS2008 buildsystem

We can drop this, it really only was necessary for VS2008 (which we no
longer support).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .gitignore | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc9d4c04dc..582853f6b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,42 +186,6 @@
 /gitweb/static/gitweb.js
 /gitweb/static/gitweb.min.*
 /command-list.h
-/libgit
-/test-chmtime
-/test-ctype
-/test-config
-/test-date
-/test-delta
-/test-dump-cache-tree
-/test-dump-split-index
-/test-dump-untracked-cache
-/test-fake-ssh
-/test-scrap-cache-tree
-/test-genrandom
-/test-hashmap
-/test-index-version
-/test-line-buffer
-/test-match-trees
-/test-mergesort
-/test-mktemp
-/test-parse-options
-/test-path-utils
-/test-prio-queue
-/test-read-cache
-/test-regex
-/test-revision-walking
-/test-run-command
-/test-sha1
-/test-sha1-array
-/test-sigchain
-/test-string-list
-/test-submodule-config
-/test-subprocess
-/test-svn-fe
-/test-urlmatch-normalization
-/test-wildmatch
-/vcs-svn_lib
-/xdiff_lib
 *.tar.gz
 *.dsc
 *.deb

From 0b1375180b07de682667f12ca104a092d9d20a27 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 16 Jul 2019 20:15:47 +0200
Subject: [PATCH 2/2] fixup! contrib/buildsystems: add a backend for modern
 Visual Studio versions

`xdiff` now actually includes `compat/mingw.c` indirectly, which
requires OpenSSL, so we have to ensure that `xdiff` has `libgit` as a
dependency, to give the latter's pre-compile script a chance to provide
OpenSSL via `vcpkg`.

Without this, the Visual Studio build will attempt to compile `xdiff`
before having `openssl/ssl.h`.

This fixes https://github.com/git-for-windows/git/issues/2217

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 contrib/buildsystems/Generators/Vcxproj.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index 00ef26fddd..4b02524b10 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -228,7 +228,7 @@ EOM
     print F << "EOM";
   </ItemGroup>
 EOM
-    if (!$static_library || $target =~ 'vcs-svn') {
+    if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') {
       my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
       my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
 
@@ -238,11 +238,15 @@ EOM
       <Project>$uuid_libgit</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+EOM
+      if (!($name =~ 'xdiff')) {
+        print F << "EOM";
     <ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
       <Project>$uuid_xdiff_lib</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
 EOM
+      }
       if ($name =~ /(test-(line-buffer|svn-fe)|^git-remote-testsvn)\.exe$/) {
         my $uuid_vcs_svn_lib = $$build_structure{"LIBS_vcs-svn/lib_GUID"};
         print F << "EOM";