Update to Git v2.20.1.1 and posh-git v1.0.0-beta2

robmen · Dec 22, 2018 · c84bda6 · c84bda6
1 parent 49583db
commit c84bda6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/posh-git b/lib/posh-git
diff --git a/src/Package/GitComponents.wxs b/src/Package/GitComponents.wxs
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fg="http://www.firegiant.com/schemas/v3/wxs/fgwep.xsd">
   <Fragment>
-    <ComponentGroup Id='GitComponents' Directory='INSTALLFOLDER'>
-      <Component>
+    <ComponentGroup Id='GitComponents'>
+      <Component Directory='BinFolder'>
         <fg:HarvestFile Source='..\..\files\bin\git.exe' KeyIdentifier='git.exe' />
       </Component>
-      <Component>
+      <Component Directory='INSTALLFOLDER'>
         <fg:HarvestFolder Source='..\..\files\' Strategy='contentFileComponentsWithGeneratedKeyPath' />
       </Component>
     </ComponentGroup>

diff --git a/src/Package/GitProduct.wxs b/src/Package/GitProduct.wxs
@@ -12,7 +12,7 @@
     <Feature Id='Git'>
       <Component Directory='INSTALLFOLDER'>
         <RegistryValue Root='HKLM' Key='Software\Git' Name='InstallFolder' Value='[INSTALLFOLDER]' Type='string' />
-        <Environment Id='UpdatePath' Name='PATH' Value='[dir6224ijVLx94XYG2KL6z4YR8qrrs]' Action='set' Part='last' System='yes' />
+        <Environment Id='UpdatePath' Name='PATH' Value='[BinFolder]' Action='set' Part='last' System='yes' />
       </Component>
 
       <Component Directory='INSTALLFOLDER'>
@@ -30,6 +30,7 @@
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLFOLDER' Name='Git'>
+          <Directory Id='BinFolder' Name='bin' />
           <Directory Id='Mingw32Folder' Name='mingw32'>
             <Directory Id='LibexecFolder' Name='libexec'>
               <Directory Id='GitCoreFolder' Name='git-core' />
+38 −0		.travis.yml
+2 −1		.vscode/extensions.json
+9 −3		.vscode/launch.json
+11 −1		.vscode/settings.json
+28 −48		.vscode/tasks.json
+259 −40		CHANGELOG.md
+1 −1		ISSUE_TEMPLATE.md
+1 −1		LICENSE.txt
+1 −1		PSScriptAnalyzerSettings.psd1
+364 −120		README.md
+2 −1		appveyor.yml
+2 −2		chocolatey/packAndLocalInstall.ps1
+2 −2		chocolatey/poshgit.nuspec
+11 −11		chocolatey/tests/InstallChocolatey.Tests.ps1
+92 −0		src/AnsiUtils.ps1
+4 −2		src/CheckRequirements.ps1
+103 −0		src/ConsoleMode.ps1
+799 −263		src/GitPrompt.ps1
+38 −20		src/GitTabExpansion.ps1
+57 −236		src/GitUtils.ps1
+291 −0		src/PoshGitTypes.ps1
+229 −0		src/SshUtils.ps1
+75 −11		src/Utils.ps1
+29 −14		src/en-US/about_posh-git.help.txt
+25 −21		src/posh-git.psd1
+155 −95		src/posh-git.psm1
+16 −0		test/Ansi.Tests.ps1
+342 −36		test/DefaultPrompt.Tests.ps1
+13 −11		test/Get-GitBranch.Tests.ps1
+26 −10		test/Get-GitDirectory.Tests.ps1
+89 −74		test/Get-GitStatus.Tests.ps1
+53 −8		test/Shared.ps1
+5 −4		test/Ssh.Tests.ps1
+61 −21		test/TabExpansion.Tests.ps1
+26 −18		test/Utils.Tests.ps1
+0 −2		test/testDebugHarness.ps1