v 1.7.0

mike-ward · May 10, 2015 · ec5ef61 · ec5ef61
1 parent 4e0954b
commit ec5ef61
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/src/MarkdownEdit-Package/Package/markdown-edit.nuspec b/src/MarkdownEdit-Package/Package/markdown-edit.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>markdown-edit</id>
     <title>Markdown Edit</title>
-    <version>1.6.0</version>
+    <version>1.7.0</version>
     <authors>Mike Ward</authors>
     <owners>Mike Ward</owners>
     <summary>Desktop CommonMark Editor for Windows</summary>
@@ -13,7 +13,7 @@
     <licenseUrl>https://cdn.rawgit.com/mike-ward/Markdown-Edit/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <iconUrl>https://cdn.rawgit.com/mike-ward/Markdown-Edit/master/src/MarkdownEdit/logo.png</iconUrl>
-    <releaseNotes>Loalized version</releaseNotes>
+    <releaseNotes>Allow formatting of selection, change full-screen bahavior, suggest filenames</releaseNotes>
     <dependencies>
       <dependency id="DotNet4.5.2" />
     </dependencies>

diff --git a/src/MarkdownEdit-Package/Package/tools/ChocolateyInstall.ps1 b/src/MarkdownEdit-Package/Package/tools/ChocolateyInstall.ps1
@@ -1 +1 @@
-Install-ChocolateyPackage 'markdown-edit' 'msi' '/qb SKIPFRAMEWORKCHECK="1"' 'https://github.com/mike-ward/Markdown-Edit/releases/download/v1.6.0/MarkdownEditSetup.msi'
+Install-ChocolateyPackage 'markdown-edit' 'msi' '/qb SKIPFRAMEWORKCHECK="1"' 'https://github.com/mike-ward/Markdown-Edit/releases/download/v1.7.0/MarkdownEditSetup.msi'
diff --git a/src/MarkdownEdit/Languages/en/help.md b/src/MarkdownEdit/Languages/en/help.md
@@ -288,8 +288,10 @@ Limitations
 About
 -----
 
-Version 1.6.0\\ Home Page: <http://mike-ward.net/markdownedit>\\ Twitter:
-`@mikeward_aa`\\ Source: <https://github.com/mike-ward/Markdown-Edit>
+Version 1.7.0  
+Home Page: <http://mike-ward.net/markdownedit>  
+Twitter: `@mikeward_aa` 
+Source: <https://github.com/mike-ward/Markdown-Edit>
 
 Markdown Edit License
 ---------------------

diff --git a/src/MarkdownEdit/MarkdownEdit.csproj b/src/MarkdownEdit/MarkdownEdit.csproj
@@ -66,8 +66,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommonMark, Version=0.1.0.0, Culture=neutral, PublicKeyToken=001ef8810438905d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CommonMark.NET.0.8.5\lib\net45\CommonMark.dll</HintPath>
+      <HintPath>..\packages\CommonMark.NET.0.9.0\lib\net45\CommonMark.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>

diff --git a/src/MarkdownEdit/Properties/AssemblyInfo.cs b/src/MarkdownEdit/Properties/AssemblyInfo.cs
@@ -17,6 +17,6 @@
     ResourceDictionaryLocation.None,
     ResourceDictionaryLocation.SourceAssembly
     )]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
 [assembly: Guid("A9A0AE86-ED91-498F-A9F9-DB669C9879CE")]
diff --git a/src/MarkdownEdit/Resources/Help.txt b/src/MarkdownEdit/Resources/Help.txt
@@ -288,8 +288,10 @@ Limitations
 About
 -----
 
-Version 1.6.0\\ Home Page: <http://mike-ward.net/markdownedit>\\ Twitter:
-`@mikeward_aa`\\ Source: <https://github.com/mike-ward/Markdown-Edit>
+Version 1.7.0   
+Home Page: <http://mike-ward.net/markdownedit>   
+Twitter: `@mikeward_aa`  
+Source: <https://github.com/mike-ward/Markdown-Edit>
 
 Markdown Edit License
 ---------------------

diff --git a/src/MarkdownEdit/packages.config b/src/MarkdownEdit/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AvalonEdit" version="5.0.2" targetFramework="net452" />
-  <package id="CommonMark.NET" version="0.8.5" targetFramework="net452" />
-  <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net452" />
-  <package id="MahApps.Metro" version="1.1.2.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
-  <package id="NHunspell" version="1.2.5554.16953" targetFramework="net452" />
-  <package id="TinyIoC" version="1.3" targetFramework="net452" />
+  <package id="AvalonEdit" version="5.0.2" targetFramework="net452" userInstalled="true" />
+  <package id="CommonMark.NET" version="0.9.0" targetFramework="net452" userInstalled="true" />
+  <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net452" userInstalled="true" />
+  <package id="MahApps.Metro" version="1.1.2.0" targetFramework="net452" userInstalled="true" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" userInstalled="true" />
+  <package id="NHunspell" version="1.2.5554.16953" targetFramework="net452" userInstalled="true" />
+  <package id="TinyIoC" version="1.3" targetFramework="net452" userInstalled="true" />
 </packages>
diff --git a/src/Wix/Product.wxs b/src/Wix/Product.wxs
@@ -4,7 +4,7 @@
   <Product Id="*" 
            Name="Markdown Edit" 
            Language="1033" 
-           Version="1.6.0.0" 
+           Version="1.7.0.0" 
            Manufacturer="Mike Ward" 
            UpgradeCode="77d4d41b-4443-42c6-87dd-20771c9bb031">
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Install-ChocolateyPackage 'markdown-edit' 'msi' '/qb SKIPFRAMEWORKCHECK="1"' 'https://github.com/mike-ward/Markdown-Edit/releases/download/v1.6.0/MarkdownEditSetup.msi'
		Install-ChocolateyPackage 'markdown-edit' 'msi' '/qb SKIPFRAMEWORKCHECK="1"' 'https://github.com/mike-ward/Markdown-Edit/releases/download/v1.7.0/MarkdownEditSetup.msi'