From 003e6617875aa6383830ac5b287074882139af94 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 5 Feb 2015 22:08:48 -0800
Subject: Issue #23260: Update Windows installer

---
 Tools/msi/core/core.wxs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 Tools/msi/core/core.wxs

(limited to 'Tools/msi/core/core.wxs')

diff --git a/Tools/msi/core/core.wxs b/Tools/msi/core/core.wxs
new file mode 100644
index 0000000000..d354e379ed
--- /dev/null
+++ b/Tools/msi/core/core.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+        <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
+        <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
+        
+        <PropertyRef Id="UpgradeTable" />
+        
+        <?ifdef IncludeDefaultFeature ?>
+        <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
+            <ComponentGroupRef Id="core_dll" />
+        </Feature>
+        <?endif ?>
+        <?ifdef IncludeSymbols ?>
+        <Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
+            <ComponentGroupRef Id="core_symbols" />
+        </Feature>
+        <?endif ?>
+        <?ifdef IncludeDebugBinaries ?>
+        <Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
+            <ComponentGroupRef Id="core_dll_d" />
+        </Feature>
+        <?endif ?>
+    </Product>
+</Wix>
-- 
cgit v1.2.1


From ccef7c0c175e37768224146c993e5a7a79f1a1b0 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 14 Feb 2015 10:30:54 -0800
Subject: Simplify MSI projects.

---
 Tools/msi/core/core.wxs | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'Tools/msi/core/core.wxs')

diff --git a/Tools/msi/core/core.wxs b/Tools/msi/core/core.wxs
index d354e379ed..0d4fbde978 100644
--- a/Tools/msi/core/core.wxs
+++ b/Tools/msi/core/core.wxs
@@ -6,20 +6,8 @@
         
         <PropertyRef Id="UpgradeTable" />
         
-        <?ifdef IncludeDefaultFeature ?>
         <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
             <ComponentGroupRef Id="core_dll" />
         </Feature>
-        <?endif ?>
-        <?ifdef IncludeSymbols ?>
-        <Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
-            <ComponentGroupRef Id="core_symbols" />
-        </Feature>
-        <?endif ?>
-        <?ifdef IncludeDebugBinaries ?>
-        <Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
-            <ComponentGroupRef Id="core_dll_d" />
-        </Feature>
-        <?endif ?>
     </Product>
 </Wix>
-- 
cgit v1.2.1