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
literal 24576
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
W1gZ#B5vU?iMWBj66@fnq1pXH?h%2K2

literal 24576
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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