From 71440a772bdc3137691d65261da3cf789ea93b87 Mon Sep 17 00:00:00 2001
From: Sridhar Periyasamy <sridhper@microsoft.com>
Date: Mon, 19 Sep 2016 13:19:27 -0700
Subject: [PATCH] Fix the VC Redist links in the installer.

The windows installer downloads the VC redist bundles as a remote payload
from a URL. This URL owned by the VC++ team recently changed to point to
 updated CRTs. This broke our windows installers. So we decided to upload
 the CRTs to a URL owned by the .Net Core team and use that for chaining
 the VC Redist bundle.
---
 packaging/windows/inc/crtvariables.wxi | 27 +++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/packaging/windows/inc/crtvariables.wxi b/packaging/windows/inc/crtvariables.wxi
index 12263d2bf..ee414f619 100644
--- a/packaging/windows/inc/crtvariables.wxi
+++ b/packaging/windows/inc/crtvariables.wxi
@@ -1,23 +1,24 @@
 <?xml version="1.0"?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <!-- These values were generated by running 'heat payload' against the CRTs downloaded from the fwlinks -->
+  <!-- These values were generated by running 'heat payload' against the CRTs downloaded from the download center links(DLC) -->
+  <!-- The DLC links are owned by the .Net Core team (contact leecow@microsoft.com) and CRTs that they point to should never be changed -->
 
-  <?define Crt_CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"?>
-  <?define Crt_CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"?>
-  <?define Crt_Description="Microsoft Visual C++ 2015 Redistributable ($(var.Platform)) - 14.0.23506"?>
-  <?define Crt_ProductName="Microsoft Visual C++ 2015 Redistributable ($(var.Platform)) - 14.0.23506"?>
-  <?define Crt_Version="14.0.23506.0"?>
-  <?define Crt_VersionRegistyKeyValue="v14.0.23506.00"?>
+  <?define Crt_CertificatePublicKey="371DD003A37769487A2A89A5A9DDB3026451B906"?>
+  <?define Crt_CertificateThumbprint="98ED99A67886D020C564923B7DF25E9AC019DF26"?>
+  <?define Crt_Description="Microsoft Visual C++ 2015 Redistributable ($(var.Platform)) - 14.0.24215"?>
+  <?define Crt_ProductName="Microsoft Visual C++ 2015 Redistributable ($(var.Platform)) - 14.0.24215"?>
+  <?define Crt_Version="14.0.24215.1"?>
+  <?define Crt_VersionRegistyKeyValue="v14.0.24215.01"?>
 
   <?if $(var.Platform)=x86?>
-  <?define Crt_DownloadUrl="http://go.microsoft.com/fwlink/?LinkID=615459&amp;clcid=0x409"?>
-  <?define Crt_Hash="17B381D3ADB22F00E4AB47CBD91CE0A5B1CCBC70"?>
-  <?define Crt_Size="13977352"?>
+  <?define Crt_DownloadUrl="https://download.microsoft.com/download/1/F/0/1F01DD22-748C-41A7-89DE-54D64355CDA6/vc_redist.x86.exe"?>
+  <?define Crt_Hash="72211BD2E7DFC91EA7C8FAC549C49C0543BA791B"?>
+  <?define Crt_Size="14456872"?>
   <?elseif $(var.Platform)=x64?>
-  <?define Crt_DownloadUrl="http://go.microsoft.com/fwlink/?LinkID=615460&amp;clcid=0x409"?>
-  <?define Crt_Hash="9A19A51D1F40CD5CD5ECB6E4E4F978F18DA8212A"?>
-  <?define Crt_Size="14773216"?>
+  <?define Crt_DownloadUrl="https://download.microsoft.com/download/1/F/0/1F01DD22-748C-41A7-89DE-54D64355CDA6/vc_redist.x64.exe"?>
+  <?define Crt_Hash="10B1683EA3FF5F36F225769244BF7E7813D54AD0"?>
+  <?define Crt_Size="15301888"?>
   <?else?>
   <?error Invalid Platform ($(var.Platform))?>
   <?endif?>