diff --git a/AddIns/ScreenCaptureAddin/Properties/AssemblyInfo.cs b/AddIns/ScreenCaptureAddin/Properties/AssemblyInfo.cs index 498ea7439..99208eb38 100644 --- a/AddIns/ScreenCaptureAddin/Properties/AssemblyInfo.cs +++ b/AddIns/ScreenCaptureAddin/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.12")] \ No newline at end of file +[assembly: AssemblyVersion("1.6.0")] \ No newline at end of file diff --git a/AddIns/WebLogAddin/Properties/AssemblyInfo.cs b/AddIns/WebLogAddin/Properties/AssemblyInfo.cs index 356ac7944..137e83119 100644 --- a/AddIns/WebLogAddin/Properties/AssemblyInfo.cs +++ b/AddIns/WebLogAddin/Properties/AssemblyInfo.cs @@ -31,4 +31,4 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.5.12")] +[assembly: AssemblyVersion("1.6.0")] diff --git a/Changelog.md b/Changelog.md index 61585f712..c7106995c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,8 +6,11 @@ > #### Upgrades: Explicitly uninstall pre-1.4.10 Versions! > If you have versions **prior to 1.4.10** installed, we recommend you do a **full uninstall using Programs and Features** before updating Markdown Monster. Because the install location changed, the new low rights installer can run into permission problems updating in the old **Program Files** location. A manual Uninstall/Re-install ensures that files get moved to **%LocalAppData%** which doesn't require admin privileges. -### 1.5.15 -*not released yet* +### 1.6 +*September 6th, 2017* + +* **Version Rollup Release** +This release is a version rollup release that combines all the recent additions into a point release. * **Edit and Remove Hyperlink Context Menu Options** Added menu options to edit hyper links in the link editor or to remove the hyperlink and just retain the text of the link. diff --git a/Install/Builds/CurrentRelease/MarkdownMonster_Version.xml b/Install/Builds/CurrentRelease/MarkdownMonster_Version.xml index 0f70142da..4f85515e3 100644 Binary files a/Install/Builds/CurrentRelease/MarkdownMonster_Version.xml and b/Install/Builds/CurrentRelease/MarkdownMonster_Version.xml differ diff --git a/Install/Chocolatey/build.ps1 b/Install/Chocolatey/build.ps1 index 011e06a6b..a39439c9a 100644 --- a/Install/Chocolatey/build.ps1 +++ b/Install/Chocolatey/build.ps1 @@ -6,7 +6,7 @@ cd "$PSScriptRoot" -$releasePath = "C:\projects2010\MarkdownMonsterAddins\MarkdownMonsterReleases\v1.5" +$releasePath = "C:\projects2010\MarkdownMonsterAddins\MarkdownMonsterReleases\v1.6" #$file = "MarkdownMonsterSetup-0.55.exe" $file = gci "$releasePath" | sort LastWriteTime | select -last 1 | select -ExpandProperty "Name" @@ -19,7 +19,7 @@ write-host $sha $filetext = @" `$packageName = 'markdownmonster' `$fileType = 'exe' -`$url = 'https://github.com/RickStrahl/MarkdownMonsterReleases/raw/master/v1.5/$file' +`$url = 'https://github.com/RickStrahl/MarkdownMonsterReleases/raw/master/v1.6/$file' `$silentArgs = '/VERYSILENT' `$validExitCodes = @(0) diff --git a/Install/Chocolatey/markdownmonster.nuspec b/Install/Chocolatey/markdownmonster.nuspec index ca17f3f93..e836e6468 100644 --- a/Install/Chocolatey/markdownmonster.nuspec +++ b/Install/Chocolatey/markdownmonster.nuspec @@ -2,7 +2,7 @@ MarkdownMonster - 1.5.12 + 1.6.0 Markdown Monster Rick Strahl, West Wind Technologies West Wind Technologies diff --git a/Install/Chocolatey/tools/chocolateyInstall.ps1 b/Install/Chocolatey/tools/chocolateyInstall.ps1 index 27aa66718..4aef92287 100644 Binary files a/Install/Chocolatey/tools/chocolateyInstall.ps1 and b/Install/Chocolatey/tools/chocolateyInstall.ps1 differ diff --git a/Install/CreateRelease.ps1 b/Install/CreateRelease.ps1 index fef20e262..389872e52 100644 --- a/Install/CreateRelease.ps1 +++ b/Install/CreateRelease.ps1 @@ -8,12 +8,12 @@ $version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($releaseFile).Fi $version = $version.Trim().Replace(".0","") "Writing Version File for: " + $version -$finalFile = "..\..\MarkdownMonsterAddins\MarkdownMonsterReleases\v1.5\MarkdownMonsterSetup-${version}.exe" +$finalFile = "..\..\MarkdownMonsterAddins\MarkdownMonsterReleases\v1.6\MarkdownMonsterSetup-${version}.exe" copy $releaseFile $finalFile copy $releaseFile "..\..\MarkdownMonsterAddins\MarkdownMonsterReleases\CurrentRelease\MarkdownMonsterSetup.exe" cd "..\..\MarkdownMonsterAddins\MarkdownMonsterReleases" -git add -f "v1.5/MarkdownMonsterSetup-${version}.exe" +git add -f "v1.6/MarkdownMonsterSetup-${version}.exe" git commit -m "$version" git push origin master diff --git a/MarkdownMonster/Properties/AssemblyInfo.cs b/MarkdownMonster/Properties/AssemblyInfo.cs index ae9f5bf51..663cb06ea 100644 --- a/MarkdownMonster/Properties/AssemblyInfo.cs +++ b/MarkdownMonster/Properties/AssemblyInfo.cs @@ -53,5 +53,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.12")] - +[assembly: AssemblyVersion("1.6.0")] \ No newline at end of file