From fa4aaf2fb7c39462ffc06a44f77e36081da6ee95 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Tue, 11 Apr 2017 13:29:31 -0700
Subject: [PATCH] build: installer: add winfsp-msil.dll in installation bin
 directory

---
 build/VStudio/installer/Product.wxs              | 14 +++++++++-----
 tst/passthrough-dotnet/passthrough-dotnet.csproj |  5 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index bc9c9e6d..cbee6831 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -87,11 +87,14 @@
                 <Condition>NOT VersionNT64</Condition>
             </Component>
 
-            <!-- GAC the assembly and its policy -->
-            <Component Id="C.winfsp_msil.dll">
-                <File Name="winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
+            <!-- install assembly and also GAC it and its policy -->
+            <Component Id="C.winfsp_msil.dll" Guid="0D8BA6AE-9F87-402B-AE1A-95B0AE3BE179">
+                <File Id="FILE.winfsp_msil.dll" Name="winfsp-msil.dll" KeyPath="yes" />
             </Component>
-            <Component Id="C.policy.winfsp_msil.dll">
+            <Component Id="C.winfsp_msil.dll.GAC" Guid="6469467D-8C90-4889-8138-4028F9DA6E85">
+                <File Id="FILE.winfsp_msil.dll.GAC" Name="winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
+            </Component>
+            <Component Id="C.policy.winfsp_msil.dll.GAC">
                 <File Name="policy.1.0.winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
                 <File Name="policy.1.0.winfsp-msil.config" KeyPath="no" />
             </Component>
@@ -372,7 +375,8 @@
             <ComponentRef Id="C.winfsp_x64.dll" />
             <ComponentRef Id="C.winfsp_x86.dll.selfreg" />
             <ComponentRef Id="C.winfsp_msil.dll" />
-            <ComponentRef Id="C.policy.winfsp_msil.dll" />
+            <ComponentRef Id="C.winfsp_msil.dll.GAC" />
+            <ComponentRef Id="C.policy.winfsp_msil.dll.GAC" />
             <ComponentRef Id="C.launcher_x64.exe.svcinst" />
             <ComponentRef Id="C.launcher_x86.exe" />
             <ComponentRef Id="C.launcher_x64.exe" />
diff --git a/tst/passthrough-dotnet/passthrough-dotnet.csproj b/tst/passthrough-dotnet/passthrough-dotnet.csproj
index 739ee402..6fd9d2c5 100644
--- a/tst/passthrough-dotnet/passthrough-dotnet.csproj
+++ b/tst/passthrough-dotnet/passthrough-dotnet.csproj
@@ -53,8 +53,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="winfsp-msil">
-      <HintPath>..\..\build\VStudio\build\Debug\winfsp-msil.dll</HintPath>
+    <Reference Include="winfsp-msil, Version=1.1.17101.0, Culture=neutral, PublicKeyToken=b099876d8fa9b1f3, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\WinFsp\bin\winfsp-msil.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>