Move MSI to a separate solution

Move MSI to a separate solution, so that builing RedisServer.sln doesn't require having the Wix Toolset installed.

Move MSI to a separate solution
Move MSI to a separate solution, so that builing RedisServer.sln doesn't require having the Wix Toolset installed.
e28dbb53 · Alexis Campailla · 4a9a87bb · e28dbb53 · e28dbb53 · e28dbb53
12 changed file
--- a/Redis on Windows Release Notes.md
+++ b/Redis on Windows Release Notes.md
-MSOpenTech Redis 2.8.17 Release Notes
+MSOpenTech Redis 2.8.19 Release Notes
 =====================================

 Welcome to the binary release of Redis from Microsoft Open Technologies, Inc.
@@ -13,10 +13,10 @@ Porting Goals

 Our goal is to provide a version of Redis that runs on Windows with a performance essentially equal to the performance of Redis on an equivalent UNIX machine.

-What is new with the 2.8.17 release
+What is new with the 2.8.19 release
 -----------------------------------

-Our last official release was 2.8.12. We have merged in the changes up to 2.8.17. Please see the [release notes for the UNIX 2.8 branch](http://download.redis.io/redis-stable/00-RELEASENOTES) to understand how this impacts Redis functionality.
+Our last official release was 2.8.12. We have merged in the changes up to 2.8.19. Please see the [release notes for the UNIX 2.8 branch](http://download.redis.io/redis-stable/00-RELEASENOTES) to understand how this impacts Redis functionality.

 ### Network layer changes

@@ -32,4 +32,3 @@ How to develop for Redis
 ------------------------

 You will need a client library for accessing Redis. There are a wide variety of client libraries available as listed at <http://redis.io/clients>.
-
--- a/Redis on Windows.md
+++ b/Redis on Windows.md
@@ -105,4 +105,3 @@ Service Account
 ---------------

 When using Redis as a Windows service, the default installation configures Redis to run under the system’s NETWORK SERVICE account. There are some environments where another account must be used (perhaps a domain service account). Configuration of this account needs to be done manually at this point with the service control manager. If this is done, it is also important to give read/write/create permission to the folder that the Redis executable is in to this user identity.
-
--- a/Windows Service Documentation.md
+++ b/Windows Service Documentation.md
-Running Redis as a Service
+Running Redis as a Service
 ==========================

+If you installed Redis using the MSI package, then Redis was already installed as a Windows service. Nothing further to do. If you would like to change its settings, you can update the *redis.windows.conf* file and then restart the Redis service (Run -\> services.msc -\> Redis -\> Restart).
+
+During installation of the MSI you can either use the installer’s user interface to update the port that Redis listens at and the firewall exception or run it silently without a UI. The following examples show how to install from the command line:
+
+**default install (port 6379 and firewall exception ON):**
+
+*msiexec /i Redis-x64.msi *
+
+**set port and turn OFF firewall exception:**
+
+*msiexec /i Redis-x64.msi PORT=1234 FIREWALL\_ON=""*
+
+**set port and turn ON firewall exception:**
+
+*msiexec /i Redis-x64.msi PORT=1234 FIREWALL\_ON=1*
+
+**install with no user interface:**
+
+*msiexec /quiet /i Redis-x64.msi*
+
+If you did *not* install Redis using the MSI package, then you still run Redis as a Windows service by following these instructions:
+
 In order to better integrate with the Windows Services model, new command line arguments have been introduced to Redis. These service arguments require an elevated user context in order to connect to the service control manager. If these commands are invoked from a non-elevated context, Redis will attempt to create an elevated context in which to execute these commands. This will cause a User Account Control dialog to be displayed by Windows and may require Administrative user credentials in order to proceed.

 Installing the Service
@@ -71,4 +93,3 @@ redis-server --service-start –service-name redisService2
 redis-server --service-install –service-name redisService3 –port 10003

 redis-server --service-start –service-name redisService3
-
--- a/msvs/RedisServer.sln
+++ b/msvs/RedisServer.sln
@@ -42,10 +42,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReleasePackagingTool", "Rel
 		{A65C2CD6-72A3-441A-AEA3-D754BEA9A86A} = {A65C2CD6-72A3-441A-AEA3-D754BEA9A86A}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisMsi.CustomActions", "msi\RedisMsi.CustomActions\RedisMsi.CustomActions.csproj", "{A917027E-D229-46C9-B969-1F4CE7D5D2CA}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RedisMsi", "msi\RedisMsi\RedisMsi.wixproj", "{C829D256-16B4-4DC7-9BF9-6814F76B441E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -196,26 +192,6 @@ Global
 		{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x64.ActiveCfg = Release|x64
 		{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x64.Build.0 = Release|x64
 		{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x86.ActiveCfg = Release|x64
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Win32.ActiveCfg = Debug|x86
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x64.ActiveCfg = Debug|x64
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x86.ActiveCfg = Debug|x86
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Mixed Platforms.Build.0 = Release|x86
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Win32.ActiveCfg = Release|x86
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x64.ActiveCfg = Release|x64
-		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x86.ActiveCfg = Release|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Win32.ActiveCfg = Debug|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x64.ActiveCfg = Debug|x64
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x86.ActiveCfg = Debug|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Mixed Platforms.Build.0 = Release|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Win32.ActiveCfg = Release|x86
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x64.ActiveCfg = Release|x64
-		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x86.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/msvs/msi/RedisMsi.CustomActions/RedisMsi.CustomActions.csproj
+++ b/msvs/msi/RedisMsi.CustomActions/RedisMsi.CustomActions.csproj
@@ -10,9 +10,10 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>RedisMsi.CustomActions</RootNamespace>
    <AssemblyName>RedisMsi.CustomActions</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <DebugType>pdbonly</DebugType>
@@ -30,6 +32,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    <DebugSymbols>true</DebugSymbols>
@@ -39,6 +42,7 @@
    <PlatformTarget>x64</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <OutputPath>bin\x64\Release\</OutputPath>
@@ -48,6 +52,7 @@
    <PlatformTarget>x64</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />

--- a/msvs/msi/RedisMsi.sln
+++ b/msvs/msi/RedisMsi.sln
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RedisMsi", "RedisMsi\RedisMsi.wixproj", "{C829D256-16B4-4DC7-9BF9-6814F76B441E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisMsi.CustomActions", "RedisMsi.CustomActions\RedisMsi.CustomActions.csproj", "{A917027E-D229-46C9-B969-1F4CE7D5D2CA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Win32.ActiveCfg = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Win32.Build.0 = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x64.ActiveCfg = Debug|x64
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x64.Build.0 = Debug|x64
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x86.ActiveCfg = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x86.Build.0 = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Win32.ActiveCfg = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Win32.Build.0 = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x64.ActiveCfg = Release|x64
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x64.Build.0 = Release|x64
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x86.ActiveCfg = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x86.Build.0 = Release|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Win32.ActiveCfg = Debug|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Win32.Build.0 = Debug|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x64.ActiveCfg = Debug|x64
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x64.Build.0 = Debug|x64
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x86.ActiveCfg = Debug|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x86.Build.0 = Debug|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Win32.ActiveCfg = Release|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Win32.Build.0 = Release|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x64.ActiveCfg = Release|x64
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x64.Build.0 = Release|x64
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x86.ActiveCfg = Release|x86
+		{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs
+++ b/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?define RepoDir="$(var.ProjectDir)..\..\..\" ?>
+  <?define BinDir="$(var.RepoDir)msvs\$(var.Platform)\$(var.Configuration)\" ?>
+
  <Fragment>
    <!--Documentation files to install-->
    <ComponentGroup Id="DocumentationComponents" Directory="INSTALLFOLDER" Source="!(wix.DocumentationFolder)">

--- a/msvs/msi/RedisMsi/Components/FileComponents.wxs
+++ b/msvs/msi/RedisMsi/Components/FileComponents.wxs
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?define RepoDir="$(var.ProjectDir)..\..\..\" ?>
+  <?define BinDir="$(var.RepoDir)msvs\$(var.Platform)\$(var.Configuration)\" ?>
+
  <Fragment>
    <!--Files to install, other than the main executable-->
    <ComponentGroup Id="FileComponents" Directory="INSTALLFOLDER">
      
      <Component Id="cmp_redis_benchmarkEXE" Guid="*">
-        <File Source="$(var.RedisBenchmark.TargetDir)redis-benchmark.exe" />
+        <File Source="$(var.BinDir)redis-benchmark.exe" />
      </Component>

      <Component Id="cmp_redis_check_aofEXE" Guid="*">
-        <File Source="$(var.RedisCheckAof.TargetDir)redis-check-aof.exe" />
+        <File Source="$(var.BinDir)redis-check-aof.exe" />
      </Component>

      <Component Id="cmp_redis_check_dumpEXE" Guid="*">
-        <File Source="$(var.RedisCheckDump.TargetDir)redis-check-dump.exe" />
+        <File Source="$(var.BinDir)redis-check-dump.exe" />
      </Component>

      <Component Id="cmp_redis_cliEXE" Guid="*">
-        <File Source="$(var.RedisCli.TargetDir)redis-cli.exe" />
+        <File Source="$(var.BinDir)redis-cli.exe" />
      </Component>
      
    </ComponentGroup>

--- a/msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs
+++ b/msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs
@@ -2,6 +2,10 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
     xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
+
+  <?define RepoDir="$(var.ProjectDir)..\..\..\" ?>
+  <?define BinDir="$(var.RepoDir)msvs\$(var.Platform)\$(var.Configuration)\" ?>
+
  <Fragment>
    <!--This references a WiX property that gives us the localized name of the NETWORK SERVICE user-->
    <PropertyRef Id="WIX_ACCOUNT_NETWORKSERVICE" />
@@ -11,7 +15,7 @@
        The following component installs Redis as a Windows service.
      -->
      <Component Id="cmp_redis_server" Guid="{959AF3FA-9324-49CB-8915-0563398CDDF6}">
-        <File Id="file_redis_serverEXE" Source="$(var.RedisServer.TargetDir)redis-server.exe" KeyPath="yes" />
+        <File Id="file_redis_serverEXE" Source="$(var.BinDir)redis-server.exe" KeyPath="yes" />
        <File Id="file_redis_serviceCONF" Source="!(wix.DocumentationFolder)\redis.windows-service.conf" />

        <ServiceInstall Id="redisService"
@@ -67,7 +71,7 @@
        properties in Visual Studio for details).
      -->
      <Component Id="cmp_EventLogDLL" Guid="{5BF66AB1-DC93-4FBB-9A16-005CE9C523BC}">
-        <File Id="file_EventLogDLL" Source="$(var.RedisServer.TargetDir)EventLog.dll" />
+        <File Id="file_EventLogDLL" Source="$(var.BinDir)EventLog.dll" />
        <util:EventSource KeyPath="yes"
                          EventMessageFile="[#file_EventLogDLL]"
                          Name="redis"

--- a/msvs/msi/RedisMsi/Product.wxs
+++ b/msvs/msi/RedisMsi/Product.wxs
@@ -17,6 +17,7 @@
        
      
  -->
+
  <Product Id="*" 
           Name="Redis on Windows" 
           Language="1033" 

--- a/msvs/msi/RedisMsi/RedisMsi.wixproj
+++ b/msvs/msi/RedisMsi/RedisMsi.wixproj
@@ -45,46 +45,6 @@
    <Compile Include="Product.wxs" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\RedisBenchmark\RedisBenchmark.vcxproj">
-      <Name>RedisBenchmark</Name>
-      <Project>{b00d4bb5-44de-405e-839c-d16f547006cf}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\RedisCheckAof\RedisCheckAof.vcxproj">
-      <Name>RedisCheckAof</Name>
-      <Project>{a65c2cd6-72a3-441a-aea3-d754bea9a86a}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\RedisCheckDump\RedisCheckDump.vcxproj">
-      <Name>RedisCheckDump</Name>
-      <Project>{52193a97-d010-41d6-bf2b-33e8e764e308}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\RedisCli\RedisCli.vcxproj">
-      <Name>RedisCli</Name>
-      <Project>{392bbb91-3934-4a56-af42-65c5728311e8}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
-    <ProjectReference Include="..\..\RedisServer.vcxproj">
-      <Name>RedisServer</Name>
-      <Project>{46842776-68a5-ec98-6a09-1859bbfc73aa}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
    <ProjectReference Include="..\RedisMsi.CustomActions\RedisMsi.CustomActions.csproj">
      <Name>RedisMsi.CustomActions</Name>
      <Project>{a917027e-d229-46c9-b969-1f4ce7d5d2ca}</Project>

--- a/msvs/setups/documentation/Redis on Windows Release Notes.docx
+++ b/msvs/setups/documentation/Redis on Windows Release Notes.docx