Fix msi build

9a8aade2 · Alexis Campailla · 23fdac78 · 9a8aade2 · 9a8aade2
Showing with 7 addition and 3 deletion

msvs/msi/RedisWindowsX64/Components/WindowsServiceComponents.wxs ...i/RedisWindowsX64/Components/WindowsServiceComponents.wxs +1 -1

src/Win32_Interop/Win32_Interop.vcxproj src/Win32_Interop/Win32_Interop.vcxproj +6 -2

未找到文件。
--- a/msvs/msi/RedisWindowsX64/Components/WindowsServiceComponents.wxs
+++ b/msvs/msi/RedisWindowsX64/Components/WindowsServiceComponents.wxs
@@ -88,7 +88,7 @@
    <!--
      Custom actions that update the redis config file during installation
    -->
-    <Binary Id="RedisCADLL" SourceFile="$(var.RedisWindowsX64.CustomActions.TargetDir)RedisWindowsX64.CustomActions.CA.dll" />
+    <Binary Id="RedisCADLL" SourceFile="$(var.RedisWindowsX64.CustomActions.TargetDir)RedisWindowsX64.CustomActions.dll" />
    <CustomAction Id="ca_UpdateRedisConfig" BinaryKey="RedisCADLL" DllEntry="UpdateRedisConfig" Execute="deferred" Return="check" />
    <SetProperty Id="ca_UpdateRedisConfig" Value="CONFIG_PATH=[#file_redis_serviceCONF];PORT=[PORT];" Sequence="execute" Before="ca_UpdateRedisConfig" />


--- a/src/Win32_Interop/Win32_Interop.vcxproj
+++ b/src/Win32_Interop/Win32_Interop.vcxproj
@@ -60,7 +60,9 @@
      <FileType>Document</FileType>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">md resources
 mc.exe -A -b -c -h . -r resources EventLog.mc
-rc.exe -foresources/EventLog.res resources/EventLog.rc</Command>
+rc.exe -foresources/EventLog.res resources/EventLog.rc
+link.exe -dll -noentry resources/EventLog.res -out:$(TargetDir)EventLog.dll
+</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">md resources
 mc.exe -A -b -c -h . -r resources EventLog.mc
 rc.exe -foresources/EventLog.res resources/EventLog.rc
@@ -70,7 +72,9 @@ link.exe -dll -noentry resources/EventLog.res -out:$(TargetDir)EventLog.dll
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EventLog.h</Outputs>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">md resources
 mc.exe -A -b -c -h . -r resources EventLog.mc
-rc.exe -foresources/EventLog.res resources/EventLog.rc</Command>
+rc.exe -foresources/EventLog.res resources/EventLog.rc
+link.exe -dll -noentry resources/EventLog.res -out:$(TargetDir)EventLog.dll
+</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">md resources
 mc.exe -A -b -c -h . -r resources EventLog.mc
 rc.exe -foresources/EventLog.res resources/EventLog.rc