Enable new git-credential-manager when available

robmen · Sep 6, 2016 · ac975b2 · ac975b2
1 parent 0793bb9
commit ac975b2
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/GitCredStoreComponents.wxs b/src/GitCredStoreComponents.wxs
@@ -11,6 +11,7 @@
         </ComponentGroup>
 
         <CustomActionRef Id='InstallGitCredentials' />
+        <CustomActionRef Id='InstallGitCredentialManager' />
     </Fragment>
 
     <Fragment>
@@ -22,7 +23,7 @@
     <Fragment>
         <SetProperty Id='InstallGitCredentials' Value='"[#GitCredStoreExe]" -s "[#fil5C1B2C7A3DD12792819E6707E7478542]"'
                      Before='InstallGitCredentials' Sequence='execute' />
-        <CustomAction Id='InstallGitCredentials' BinaryKey='WixCA' DllEntry='CAQuietExec'
+        <CustomAction Id='InstallGitCredentials' BinaryKey='WixCA' DllEntry='WixQuietExec'
                       Execute='deferred' Return='ignore' Impersonate='yes'/>
 
         <PropertyRef Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" />
@@ -31,4 +32,17 @@
             <Custom Action='InstallGitCredentials' Before='InstallFinalize'>NOT Installed AND NOT WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED</Custom>
         </InstallExecuteSequence>
     </Fragment>
+
+    <Fragment>
+        <SetProperty Id='InstallGitCredentialManager' Value='"[#fil65820BAC8645ECCA80F578593ABCC673]" config --global credential.helper manager'
+                     Before='InstallGitCredentialManager' Sequence='execute' />
+        <CustomAction Id='InstallGitCredentialManager' BinaryKey='WixCA' DllEntry='WixQuietExec'
+                      Execute='deferred' Return='ignore' Impersonate='yes'/>
+
+        <PropertyRef Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" />
+
+        <InstallExecuteSequence>
+            <Custom Action='InstallGitCredentialManager' Before='InstallFinalize'>NOT Installed AND WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
 </Wix>