diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj index 5f4d64ab..bbda47d9 100644 --- a/src/Application/Application.csproj +++ b/src/Application/Application.csproj @@ -280,66 +280,66 @@ False - - Include True + + File False - - Include True + + File False - - Include True + + File False - - Include True + + File False - - Include True + + File False - - Include True + + File False - - Include True + + File False - - Include True + + File diff --git a/src/Model/Settings.cs b/src/Model/Settings.cs index f059fc7d..019486dc 100644 --- a/src/Model/Settings.cs +++ b/src/Model/Settings.cs @@ -106,6 +106,10 @@ private Color MergeColor(Color c1, Color c2) public override bool Equals(object obj) { + if (obj == null) + { + return false; + } ThemeColors t = obj as ThemeColors; if (t != null) { diff --git a/src/Updates/Updates.xml b/src/Updates/Updates.xml index fdf393fe..9e5f1aac 100644 --- a/src/Updates/Updates.xml +++ b/src/Updates/Updates.xml @@ -9,7 +9,7 @@ https://github.com/microsoft/XmlNotepad/blob/master/src/Updates/Updates.xml 1.00:00:00 - + Improve handling of on changes made to the loaded XML file outside of XML notepad. Add theming to the default stylesheet diff --git a/src/Version/Version.cs b/src/Version/Version.cs index c7e44c86..4836d8fc 100644 --- a/src/Version/Version.cs +++ b/src/Version/Version.cs @@ -15,5 +15,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2.8.0.51")] -[assembly: AssemblyFileVersion("2.8.0.51")] +[assembly: AssemblyVersion("2.8.0.52")] +[assembly: AssemblyFileVersion("2.8.0.52")] diff --git a/src/Version/Version.props b/src/Version/Version.props index 592184e5..89149f4a 100644 --- a/src/Version/Version.props +++ b/src/Version/Version.props @@ -1,7 +1,7 @@ - 51 - 2.8.0.51 + 52 + 2.8.0.52 diff --git a/src/XmlNotepadPackage/Package.appxmanifest b/src/XmlNotepadPackage/Package.appxmanifest index 7c27fe4d..b0fe4f48 100644 --- a/src/XmlNotepadPackage/Package.appxmanifest +++ b/src/XmlNotepadPackage/Package.appxmanifest @@ -1,6 +1,6 @@  - + XML Notepad Microsoft Corporation diff --git a/src/XmlNotepadSetup/Product.wxs b/src/XmlNotepadSetup/Product.wxs index b4608f85..2b4577b4 100644 --- a/src/XmlNotepadSetup/Product.wxs +++ b/src/XmlNotepadSetup/Product.wxs @@ -1,6 +1,6 @@  - +