Sign everything... But don't fail if the signing fails

MarshallOfSound · Jan 5, 2016 · 324806b · 324806b
1 parent 768bd99
commit 324806b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/Google Play Music.Bootstrapper/Bundle.wxs b/Google Play Music.Bootstrapper/Bundle.wxs
@@ -6,6 +6,7 @@
           UpgradeCode="cd40bffe-ea0f-4e9b-aeaf-2416f44ad40f" Compressed="yes" DisableModify="yes"
           IconSourceFile="..\Google Play Music\Resources\Icons\Icon1.ico"
           HelpUrl="https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/issues" DisableRepair="yes">
+    <OptionalUpdateRegistration />
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
       <bal:WixStandardBootstrapperApplication LicenseUrl="" SuppressOptionsUI="yes" ShowVersion="yes"
                                               LogoFile="icon.png" SuppressRepair="yes" />

diff --git a/Google Play Music.Bootstrapper/Google Play Music.Bootstrapper.wixproj b/Google Play Music.Bootstrapper/Google Play Music.Bootstrapper.wixproj
@@ -57,9 +57,6 @@
     <Content Include="info.rtf" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
-  <PropertyGroup>
-    <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 Wix.targets.
@@ -69,9 +66,12 @@
 	</Target>
 	-->
   <Target Name="SignBundleEngine">
-    <Exec Command="Signtool.exe sign /a &quot;@(SignBundleEngine)&quot;" />
+    <Exec Command="Signtool.exe sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll &quot;@(SignBundleEngine)&quot;" IgnoreExitCode="true" />
   </Target>
   <Target Name="SignBundle">
-    <Exec Command="Signtool.exe sign /a &quot;@(SignBundle)&quot;" />
+    <Exec Command="Signtool.exe sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll &quot;@(SignBundle)&quot;" IgnoreExitCode="true" />
   </Target>
+  <PropertyGroup>
+    <PostBuildEvent>"signtool.exe" sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll "$(ProjectDir)bin\$(Platform)\$(Configuration)\$(TargetFileName)" 2>nul 1>nul</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/Google Play Music.Installer/Google Play Music.Installer.wixproj b/Google Play Music.Installer/Google Play Music.Installer.wixproj
@@ -97,9 +97,9 @@
 	</Target>
 	-->
   <Target Name="SignCabs">
-    <Exec Command="Signtool.exe sign /a &quot;%(SignCabs.FullPath)&quot;" />
+    <Exec Command="Signtool.exe sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll &quot;%(SignCabs.FullPath)&quot;" IgnoreExitCode="true" />
   </Target>
   <Target Name="SignMsi">
-    <Exec Command="signtool.exe sign /a &quot;%(SignMsi.FullPath)&quot;" />
+    <Exec Command="signtool.exe sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll &quot;%(SignMsi.FullPath)&quot;" IgnoreExitCode="true" />
   </Target>
 </Project>
diff --git a/Google Play Music.Installer/Product.wxs b/Google Play Music.Installer/Product.wxs
@@ -18,6 +18,9 @@
                  Platform="$(var.Platform)"
                  AdminImage="yes" />
         <MediaTemplate EmbedCab="yes" CompressionLevel="mszip" />
+        <MajorUpgrade
+          Schedule="afterInstallInitialize" AllowDowngrades="no" 
+          DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
 
         <!-- ====== Product Prerequisites ====== -->
         <!-- Required on both 32 and 64 bit machines -->

diff --git a/Google Play Music/Google Play Music.csproj b/Google Play Music/Google Play Music.csproj
@@ -360,6 +360,9 @@
   <Import Project="..\packages\Ncapsulate.Grunt.Shadow.0.4.5.3\build\Ncapsulate.Grunt.targets" Condition="Exists('..\packages\Ncapsulate.Grunt.Shadow.0.4.5.3\build\Ncapsulate.Grunt.targets')" />
   <Import Project="..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets')" />
   <Import Project="..\packages\CefSharp.Common.45.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.45.0.0\build\CefSharp.Common.targets')" />
+  <PropertyGroup>
+    <PostBuildEvent>"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe" sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll "$(ProjectDir)bin\$(Platform)\$(Configuration)\$(TargetFileName)" 2>nul 1>nul</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">