From c630aa27e562b946ad662c944b8b2d879f401d77 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 10 Apr 2017 20:38:49 -0700
Subject: [PATCH] Removing VC Redist from the bundle now that CoreRT no longer
 needs it.

---
 packaging/windows/clisdk/bundle.wxs    | 34 --------------------------
 packaging/windows/inc/crtvariables.wxi | 26 --------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 packaging/windows/inc/crtvariables.wxi

diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index 1ab894dd5..dc0ebe2f2 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -4,7 +4,6 @@
      xmlns:swid="http://schemas.microsoft.com/wix/TagExtension"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?include "Variables.wxi" ?>
-  <?include "..\inc\crtvariables.wxi" ?>
 
   <Bundle Name="$(var.ProductName)" Manufacturer="$(var.Manufacturer)"
           Version="$(var.DisplayVersion)" UpgradeCode="$(var.UpgradeCode)"
@@ -27,22 +26,6 @@
     <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
 
     <Chain DisableSystemRestore="yes" ParallelCache="yes">
-      <ExePackage Name="VC_redist.$(var.Platform).exe"
-                  DownloadUrl="$(var.Crt_DownloadUrl)"
-                  DetectCondition='(VCRedist_KeyExists AND VCRedist_KeyValue &gt;= "v14.0.23506.00")'
-                  InstallCommand="/q /norestart"
-                  PerMachine="yes"
-                  Vital="yes"
-                  Permanent="yes"
-                  Compressed="no">
-        <RemotePayload CertificatePublicKey="$(var.Crt_CertificatePublicKey)" 
-                       CertificateThumbprint="$(var.Crt_CertificateThumbprint)" 
-                       Description="$(var.Crt_Description)" 
-                       Hash="$(var.Crt_Hash)" 
-                       ProductName="$(var.Crt_ProductName)" 
-                       Size="$(var.Crt_Size)" 
-                       Version="$(var.Crt_Version)" />
-      </ExePackage>
       <MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
@@ -59,23 +42,6 @@
   </Bundle>
 
   <Fragment>
-    <util:RegistrySearch
-       Id="VCRedist_KeyExists"
-       Variable="VCRedist_KeyExists"
-       Root="HKLM"
-       Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.Platform)"
-       Value="Version"
-       Win64="no"
-       Result="exists" />
-    <util:RegistrySearch
-       Id="VCRedist_KeyValue"
-       Variable="VCRedist_KeyValue"
-       Root="HKLM"
-       Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.Platform)"
-       Value="Version"
-       Win64="no"
-       Result="value" />
-
     <PayloadGroup Id="DotnetCoreBAPayloads">
       <Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" />
       <Payload Name="thm.wxl" Compressed="yes" SourceFile="bundle.wxl" />
diff --git a/packaging/windows/inc/crtvariables.wxi b/packaging/windows/inc/crtvariables.wxi
deleted file mode 100644
index ee414f619..000000000
--- a/packaging/windows/inc/crtvariables.wxi
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 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="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="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="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?>  
-
-</Include>
\ No newline at end of file