diff --git a/CHANGELOG.md b/CHANGELOG.md index 4697b4cc7..2c7566a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ ([PR #422](https://github.com/dahlbyk/posh-git/pull/422)) - `Add-PoshGitToProfile` will no longer modify a signed `$PROFILE` script; it also learned `-Confirm` ([PR #428](https://github.com/dahlbyk/posh-git/pull/428)) +- Overwrite pre-0.7 posh-git prompt on import + ([PR #425](https://github.com/dahlbyk/posh-git/pull/425)) +- Fix Chocolatey deprecation warning with dependency on 0.9.10 + ([PR #426](https://github.com/dahlbyk/posh-git/pull/426)) ## 0.7.0 - February 14, 2017 This release has focused on improving the "getting started" experience by adding an `Add-PoshGitToProfile` command that diff --git a/chocolatey/poshgit.nuspec b/chocolatey/poshgit.nuspec index e83c9064b..0cb3ece6d 100644 --- a/chocolatey/poshgit.nuspec +++ b/chocolatey/poshgit.nuspec @@ -3,7 +3,7 @@ poshgit posh-git - 0.7.0 + 0.7.1-pre0 Keith Dahlby, Mark Embling, Jeremy Skinner, Keith Hill Keith Dahlby ### posh-git @@ -27,9 +27,10 @@ Note on performance: displaying file status in the git prompt for a very large r Provides prompt with Git status summary information and tab completion for Git commands, parameters, remotes and branch names. poshgit posh-git powershell git https://github.com/dahlbyk/posh-git - https://github.com/dahlbyk/posh-git/blob/v0.7.0/LICENSE.txt + https://github.com/dahlbyk/posh-git/blob/master/LICENSE.txt false + diff --git a/chocolatey/tools/chocolateyInstall.ps1 b/chocolatey/tools/chocolateyInstall.ps1 index f51c0f998..a09893e43 100644 --- a/chocolatey/tools/chocolateyInstall.ps1 +++ b/chocolatey/tools/chocolateyInstall.ps1 @@ -1,6 +1,5 @@ try { - $binRoot = Get-BinRoot - $poshgitPath = join-path $binRoot 'poshgit' + $poshgitPath = join-path (Get-ToolsLocation) 'poshgit' try { if (test-path($poshgitPath)) { diff --git a/chocolatey/tools/chocolateyUninstall.ps1 b/chocolatey/tools/chocolateyUninstall.ps1 index 30ab3bba4..48fe9fc40 100644 --- a/chocolatey/tools/chocolateyUninstall.ps1 +++ b/chocolatey/tools/chocolateyUninstall.ps1 @@ -1,6 +1,5 @@ try { - $binRoot = Get-BinRoot - $poshgitPath = join-path $binRoot 'poshgit' + $poshgitPath = join-path (Get-ToolsLocation) 'poshgit' $currentVersionPath = Get-ChildItem "$poshgitPath\*posh-git*\" | Sort-Object -Property LastWriteTime | Select-Object -Last 1 diff --git a/src/posh-git.psd1 b/src/posh-git.psd1 index 52a97e74b..9abbb178d 100644 --- a/src/posh-git.psd1 +++ b/src/posh-git.psd1 @@ -4,7 +4,7 @@ ModuleToProcess = 'posh-git.psm1' # Version number of this module. -ModuleVersion = '0.7.0' +ModuleVersion = '0.7.1.0' # ID used to uniquely identify this module GUID = '74c9fd30-734b-4c89-a8ae-7727ad21d1d5' @@ -52,25 +52,27 @@ VariablesToExport = @() # Aliases to export from this module AliasesToExport = @('??') -# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell. +# Private data to pass to the module specified in RootModule/ModuleToProcess. +# This may also contain a PSData hashtable with additional module metadata used by PowerShell. PrivateData = @{ PSData = @{ - # Tags applied to this module. These help with module discovery in online galleries. Tags = @('git', 'prompt', 'tab', 'tab-completion', 'tab-expansion', 'tabexpansion') # A URL to the license for this module. - LicenseUri = 'https://github.com/dahlbyk/posh-git/blob/v0.7.0/LICENSE.txt' + LicenseUri = 'https://github.com/dahlbyk/posh-git/blob/master/LICENSE.txt' # A URL to the main website for this project. ProjectUri = 'https://github.com/dahlbyk/posh-git' # ReleaseNotes of this module - ReleaseNotes = 'https://github.com/dahlbyk/posh-git/blob/v0.7.0/CHANGELOG.md' + ReleaseNotes = 'https://github.com/dahlbyk/posh-git/blob/master/CHANGELOG.md' - } # End of PSData hashtable + # TODO: REMOVE BEFOE RELEASE + PreReleaseVersion = 'pre0' + } -} # End of PrivateData hashtable +} }