From 6a9cc696f37b971f50969f51fc4daa603bb1ed08 Mon Sep 17 00:00:00 2001 From: tom-englert Date: Sat, 7 Apr 2018 13:30:13 +0200 Subject: [PATCH] V 1.15 --- Release notes.md | 5 ++++- ResXManager.VSIX/source.extension.vsixmanifest | 2 +- ResXManager/ResXManager.csproj | 18 +++++++++--------- Version.cs | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Release notes.md b/Release notes.md index 299fe308..1e5d4bd3 100644 --- a/Release notes.md +++ b/Release notes.md @@ -1,4 +1,7 @@ -1.14 +1.15 +- Fix #72 and related: Issues with mixed versions of System.Windows.Interactivity + +1.14 - Fix #107/#108: Excel import of unchanged or formatted cells. - Update Chinese translation diff --git a/ResXManager.VSIX/source.extension.vsixmanifest b/ResXManager.VSIX/source.extension.vsixmanifest index 77ed7cd8..976be01b 100644 --- a/ResXManager.VSIX/source.extension.vsixmanifest +++ b/ResXManager.VSIX/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + ResXManager The most popular tool to localize and manage all kind of applications with resx-based resources. Shows all resources of a solution and let's you edit the strings and their localizations in a well-arranged data grid. https://github.com/tom-englert/ResXResourceManager diff --git a/ResXManager/ResXManager.csproj b/ResXManager/ResXManager.csproj index 3f9fdb37..71585ff1 100644 --- a/ResXManager/ResXManager.csproj +++ b/ResXManager/ResXManager.csproj @@ -37,7 +37,7 @@ ResX Resource Manager tom-englert.de 0 - 1.14.0.0 + 1.15.0.0 false true true @@ -364,42 +364,42 @@ False - Exclude - True + Exclude + True Assembly False - Exclude - True + Exclude + True Assembly False - Exclude - True + Exclude + True File False - Exclude - True + Exclude + True Assembly diff --git a/Version.cs b/Version.cs index 9cad4113..07e0dac0 100644 --- a/Version.cs +++ b/Version.cs @@ -5,5 +5,5 @@ internal static class Product { - public const string Version = "1.14.0.0"; + public const string Version = "1.15.0.0"; }