- Code housekeeping

oleg-shilo · May 6, 2019 · 135ef49 · 135ef49
1 parent 8506612
commit 135ef49
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/Source/src/WixSharp.Samples/VSProjects/Signing.csproj b/Source/src/WixSharp.Samples/VSProjects/Signing.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>
@@ -101,11 +101,15 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Registry/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Registry/setup.cs
@@ -26,14 +26,13 @@ static public void Main()
                 new RegValue(fullSetup, RegistryHive.LocalMachine, @"Software\My Company\My Product", "LICENSE_KEY", "01020304")
                 {
                     AttributesDefinition = "Type=binary"
-                }
-                ,
+                },
                 // HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\My Company\My Product
                 new RegValue(fullSetup, RegistryHive.LocalMachine, @"Software\My Company\My Product", "Message", "Hello"),
                 new RegValue(fullSetup, RegistryHive.LocalMachine, @"Software\My Company\My Product", "Count", 777),
                 new RegValue(fullSetup, RegistryHive.ClassesRoot, @"test\shell\open\command", "", "\"[INSTALLDIR]test.exe\" \"%1\""),
-                new RemoveRegistryValue(fullSetup, @"Software\My Company\My Product"),
-                new RemoveRegistryKey(fullSetup, @"Software\My Company\My Product"));
+                // new RemoveRegistryValue(fullSetup, @"Software\My Company\My Product"), // remove "My Product" value on install
+                new RemoveRegistryKey(fullSetup, @"Software\My Company\My Product")); // remove the whole "My Product" on uninstall
 
         project.GUID = new Guid("6f330b47-2577-43ad-9095-1861ba25889b");
         project.UI = WUI.WixUI_ProgressOnly;

diff --git a/Source/src/WixSharp/DigitalSignature.cs b/Source/src/WixSharp/DigitalSignature.cs
@@ -70,9 +70,9 @@ public virtual int Apply(string fileToSign)
                 PrepareOptionalArguments(), WellKnownLocations, UseCertificateStore, false, OutputLevel);
 
             Console.WriteLine(retValue != 0
-                ? $"Could not sign the {fileToSign} file."
+                ? $"Error: Could not sign the {fileToSign} file."
                 : $"The file {fileToSign} was signed successfully.");
-            
+
             return retValue;
         }