From 9ba9ece5892eb750b81c13abdd24a264e124a0d3 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Thu, 23 Nov 2017 13:43:49 -0800
Subject: [PATCH] Removing Visual C++ 2015 runtimes

* VCRedist 2017 installs as an update for 2015 (http://disq.us/p/1hjcta0)
  * This prevents installing or uninstalling the 2015 versions after installing 2017
  * (Because both 2015 and 2017 use these regkeys: HKEY_LOCAL_MACHINE(Wow6432Node|)\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0)
---
 .bin/Scripts/functions/setup.py  | 6 ------
 .bin/Scripts/settings/sources.py | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index 84976888..821c1e99 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -103,12 +103,6 @@ VCR_REDISTS = [
     {'Name': 'Visual C++ 2013 x64...',
         'Cmd': [r'2013\x64\vcredist.exe', '/install',
             '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2015 Update 3 x32...',
-        'Cmd': [r'2015u3\x32\vcredist.exe', '/install',
-            '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2015 Update 3 x64...',
-        'Cmd': [r'2015u3\x64\vcredist.exe', '/install',
-            '/passive', '/norestart']},
     {'Name': 'Visual C++ 2017 x32...',
         'Cmd': [r'2017\x32\vcredist.exe', '/install',
             '/passive', '/norestart']},
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 35316108..1e705d9e 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -65,10 +65,6 @@ VCREDIST_SOURCES = {
         '32': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe',
         '64': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe',
         },
-    '2015u3': {
-        '32': 'https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x86.exe',
-        '64': 'https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x64.exe',
-        },
     '2017': {
         '32': 'https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe',
         '64': 'https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe',