V 1.18

dotnet · Apr 28, 2018 · 6077f88 · 6077f88
1 parent a5e5310
commit 6077f88
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Release notes.md b/Release notes.md
@@ -1,4 +1,7 @@
-1.17
+1.18
+- Fix Update all dependencies to use and reference only the latest version of System.Windows.Interactivity
+
+1.17
 - Fix #117, #122, #123 and related: Issues with mixed versions of System.Windows.Interactivity
 
 1.16

diff --git a/ResXManager.Infrastructure/CultureKey.cs b/ResXManager.Infrastructure/CultureKey.cs
@@ -80,9 +80,9 @@ private static bool InternalEquals([CanBeNull] CultureKey left, [CanBeNull] Cult
         {
             if (ReferenceEquals(left, right))
                 return true;
-            if (ReferenceEquals(left, null))
+            if (left is null)
                 return false;
-            if (ReferenceEquals(right, null))
+            if (right is null)
                 return false;
 
             return Equals(left.Culture, right.Culture);
@@ -128,9 +128,9 @@ private static int Compare([CanBeNull] CultureKey left, [CanBeNull] CultureKey r
         {
             if (ReferenceEquals(left, right))
                 return 0;
-            if (ReferenceEquals(left, null))
+            if (left is null)
                 return -1;
-            if (ReferenceEquals(right, null))
+            if (right is null)
                 return 1;
 
             return string.Compare(left.ToString(), right.ToString(), StringComparison.OrdinalIgnoreCase);

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.17.0.0" Language="en-US" Publisher="tom-englert.de" />
+        <Identity Id="43b35fe0-1f30-48de-887a-68256474202a" Version="1.18.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
@@ -36,7 +36,7 @@
     <ProductName>ResX Resource Manager</ProductName>
     <PublisherName>tom-englert.de</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.17.0.0</ApplicationVersion>
+    <ApplicationVersion>1.18.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/Version.cs b/Version.cs
@@ -5,5 +5,5 @@
 
 internal static class Product
 {
-    public const string Version = "1.17.0.0";
+    public const string Version = "1.18.0.0";
 }