V 1.15

dotnet · Apr 7, 2018 · 6a9cc69 · 6a9cc69
1 parent 722e4f9
commit 6a9cc69
Showing 4 changed files with 15 additions and 12 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="43b35fe0-1f30-48de-887a-68256474202a" Version="1.13.0.0" Language="en-US" Publisher="tom-englert.de" />
+        <Identity Id="43b35fe0-1f30-48de-887a-68256474202a" Version="1.15.0.0" Language="en-US" Publisher="tom-englert.de" />
         <DisplayName>ResXManager</DisplayName>
         <Description xml:space="preserve">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.</Description>
         <MoreInfo>https://github.com/tom-englert/ResXResourceManager</MoreInfo>

diff --git a/ResXManager/ResXManager.csproj b/ResXManager/ResXManager.csproj
@@ -37,7 +37,7 @@
     <ProductName>ResX Resource Manager</ProductName>
     <PublisherName>tom-englert.de</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.14.0.0</ApplicationVersion>
+    <ApplicationVersion>1.15.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -364,42 +364,42 @@
   <ItemGroup>
     <PublishFile Include="AutoProperties">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="JetBrains.Annotations">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
     <PublishFile Include="Properties\Resources.Designer.tt">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="PropertyChanged">
       <Visible>False</Visible>
-      <PublishState>Exclude</PublishState>
-      <IncludeHash>True</IncludeHash>
       <Group>
       </Group>
       <TargetPath>
       </TargetPath>
+      <PublishState>Exclude</PublishState>
+      <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
   </ItemGroup>

diff --git 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";
 }