From c03e3982513945c830dd2d9aab9140b781ad58a4 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 24 Jul 2019 14:48:55 -0700
Subject: [PATCH] Tweaks to VSTool source and executable for compatibility with
 VS 2017

---
 indra/tools/vstool/VSTool.exe | Bin 24576 -> 24576 bytes
 indra/tools/vstool/main.cs    |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe
index 854290b90ad1c9ed8676919a9c144d05330cb245..751540413a0af3256f6bbb30f9a49c7232699d9a 100755
GIT binary patch
delta 6884
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
BEtmiR

delta 7234
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

diff --git a/indra/tools/vstool/main.cs b/indra/tools/vstool/main.cs
index ef2e582b902..1d6b2f14d15 100755
--- a/indra/tools/vstool/main.cs
+++ b/indra/tools/vstool/main.cs
@@ -556,7 +556,7 @@ namespace VSTool
                         break;
 
                     case "12.00":
-                        version = "VC120";
+                        version = "VC150";
                         break;
 
                     default:
@@ -603,6 +603,10 @@ namespace VSTool
                     progid = "VisualStudio.DTE.12.0";
                     break;
 
+                case "VC150":
+                    progid = "VisualStudio.DTE.15.0";
+                    break;
+
                 default:
                     throw new ApplicationException("Can't handle VS version: " + version);
             }
-- 
GitLab