From 9770efde14293012a05060fac4c27d0dbd82eeff Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 13 Apr 2017 16:04:13 -0700
Subject: [PATCH] build: dotnet: change assembly versioning scheme (fix to
 1.0.0.0)

---
 build/VStudio/dotnet/winfsp.net.csproj           | 4 +++-
 build/VStudio/installer/Product.wxs              | 9 ++++++++-
 build/VStudio/version.properties                 | 4 ++--
 tst/passthrough-dotnet/passthrough-dotnet.csproj | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/build/VStudio/dotnet/winfsp.net.csproj b/build/VStudio/dotnet/winfsp.net.csproj
index 2dcbe4ad..a66d08ed 100644
--- a/build/VStudio/dotnet/winfsp.net.csproj
+++ b/build/VStudio/dotnet/winfsp.net.csproj
@@ -87,7 +87,9 @@
     </ItemGroup>
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>set TargetName=$(TargetName)
+    <PostBuildEvent>exit /b 0
+
+set TargetName=$(TargetName)
 set MyAssemblyPolicyVersion=$(MyAssemblyPolicyVersion)
 set MyAssemblyVersion=$(MyAssemblyVersion)
 
diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index e42f63f9..383f5702 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -87,10 +87,11 @@
                 <Condition>NOT VersionNT64</Condition>
             </Component>
 
-            <!-- install assembly and also GAC it and its policy -->
+            <!-- install assembly -->
             <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.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>
@@ -98,6 +99,7 @@
                 <File Name="policy.1.0.winfsp-msil.dll" KeyPath="yes" Assembly=".net" />
                 <File Name="policy.1.0.winfsp-msil.config" KeyPath="no" />
             </Component>
+            -->
 
             <!-- On Win64 ServiceInstall launcher-x64.exe -->
             <Component Id="C.launcher_x64.exe.svcinst">
@@ -446,8 +448,10 @@
         </ComponentGroup>
         <ComponentGroup Id="C.WinFsp.net">
             <ComponentRef Id="C.winfsp_msil.dll" />
+            <!--
             <ComponentRef Id="C.winfsp_msil.dll.GAC" />
             <ComponentRef Id="C.policy.winfsp_msil.dll.GAC" />
+            -->
         </ComponentGroup>
         <ComponentGroup Id="C.WinFsp.smp.net">
             <ComponentRef Id="C.passthrough_dotnet.Program.cs" />
@@ -476,7 +480,9 @@
                 InstallDefault="local"
                 Absent="disallow">
                 <ComponentGroupRef Id="C.WinFsp.bin" />
+                <ComponentGroupRef Id="C.WinFsp.net" />
             </Feature>
+            <!--
             <Feature
                 Id="F.Net"
                 Level="10"
@@ -487,6 +493,7 @@
                 Absent="allow">
                 <ComponentGroupRef Id="C.WinFsp.net" />
             </Feature>
+            -->
             <Feature
                 Id="F.Developer"
                 Level="1000"
diff --git a/build/VStudio/version.properties b/build/VStudio/version.properties
index 0c509db0..ca988676 100644
--- a/build/VStudio/version.properties
+++ b/build/VStudio/version.properties
@@ -24,8 +24,8 @@
         <MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas>
         <MyFullVersion>$(MyCanonicalVersion).$(MyBuildNumber).$(MyGitRevision)</MyFullVersion>
 
-        <MyAssemblyPolicyVersion>$(MyVersion.Substring(0,$(MyVersion.IndexOf('.')))).0</MyAssemblyPolicyVersion>
-        <MyAssemblyVersion>$(MyVersion).0</MyAssemblyVersion>
+        <MyAssemblyPolicyVersion>$(MyCanonicalVersion.Substring(0,$(MyVersion.IndexOf('.')))).0</MyAssemblyPolicyVersion>
+        <MyAssemblyVersion>$(MyAssemblyPolicyVersion).0.0</MyAssemblyVersion>
     </PropertyGroup>
 
     <ItemDefinitionGroup>
diff --git a/tst/passthrough-dotnet/passthrough-dotnet.csproj b/tst/passthrough-dotnet/passthrough-dotnet.csproj
index 6fd9d2c5..9a6b0ae0 100644
--- a/tst/passthrough-dotnet/passthrough-dotnet.csproj
+++ b/tst/passthrough-dotnet/passthrough-dotnet.csproj
@@ -53,7 +53,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="winfsp-msil, Version=1.1.17101.0, Culture=neutral, PublicKeyToken=b099876d8fa9b1f3, processorArchitecture=MSIL">
+    <Reference Include="winfsp-msil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b099876d8fa9b1f3, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(MSBuildProgramFiles32)\WinFsp\bin\winfsp-msil.dll</HintPath>
     </Reference>