#86 NHibernate.dll in Custom Actions

oleg-shilo · Jun 9, 2017 · a248dd6 · a248dd6
1 parent 7ee7a23
commit a248dd6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/Source/src/WixSharp.Samples/VSProjects/DTF_ExternalAssembly.csproj b/Source/src/WixSharp.Samples/VSProjects/DTF_ExternalAssembly.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>InstallFiles</RootNamespace>
     <AssemblyName>DTF_ExternalAssembly</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -32,6 +32,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -102,6 +103,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -110,4 +114,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Signing/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Signing/setup.cs
@@ -13,9 +13,6 @@ static public void Main(string[] args)
             new Project("MyProduct",
                 new Dir(@"%ProgramFiles%\My Company\My Product",
                     new File(@"Files\Bin\MyApp.exe")))
-            // new File(@"Files\Bin\MyApp.exe"),
-            // new Dir(@"Docs\Manual",
-            //     new File(@"Files\Docs\Manual.txt"))))
             {
                 DigitalSignature = new DigitalSignature
                 {

diff --git a/Source/src/WixSharp.Samples/WixSharp.Msi.dll b/Source/src/WixSharp.Samples/WixSharp.Msi.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.UI.dll b/Source/src/WixSharp.Samples/WixSharp.UI.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.dll b/Source/src/WixSharp.Samples/WixSharp.dll
diff --git a/Source/src/WixSharp/ProjectValidator.cs b/Source/src/WixSharp/ProjectValidator.cs
@@ -1,4 +1,5 @@
 #region Licence...
+
 /*
 The MIT License (MIT)
 
@@ -23,7 +24,9 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-#endregion
+
+#endregion Licence...
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -32,8 +35,10 @@ THE SOFTWARE.
 using System.Reflection;
 using System.Text;
 using Microsoft.Deployment.WindowsInstaller;
+
 using IO = System.IO;
 using Reflection = System.Reflection;
+
 using System.Drawing;
 
 namespace WixSharp
@@ -66,7 +71,6 @@ public static void Validate(Project project)
 
             if (project.MajorUpgradeStrategy != null)
             {
-
                 if (project.MajorUpgradeStrategy.UpgradeVersions == null && project.MajorUpgradeStrategy.PreventDowngradingVersions == null)
                 {
                     throw new UpgradeStrategyValidationException("Project MajorUpgradeStrategy.UpgradeVersions and PreventDowngradingVersions are not defined.");
@@ -222,7 +226,13 @@ public string OriginalAssemblyFile(string file)
             if (asm == null)
                 asm = System.Reflection.Assembly.ReflectionOnlyLoadFrom(file);
 
-            return IO.Path.Combine(dir, asm.ManifestModule.ScopeName);
+            var name = asm.ManifestModule.ScopeName;
+            if (Path.GetExtension(name) != Path.GetExtension(file))
+            {
+                name = Path.GetFileNameWithoutExtension(name) + Path.GetExtension(file);
+            }
+
+            return IO.Path.Combine(dir, name);
         }
 
         public void ValidateCAAssembly(string file, string dtfAsm)
@@ -286,4 +296,4 @@ void ValidateCAAssemblyImpl(string file, string refAsms)
             catch { }
         }
     }
-}
+}