Fix regression

microsoft · Dec 6, 2021 · 0aec4f6 · 0aec4f6
1 parent d12d864
commit 0aec4f6
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -280,66 +280,66 @@
   <ItemGroup>
     <PublishFile Include="Samples\basket.xml">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\basket.xsd">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\Employee.xml">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\Employee.xsd">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\Hamlet.xml">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\rss.xml">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\rsspretty.xsl">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\willy.xsl">
       <Visible>False</Visible>
-      <Group></Group>
-      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <FileType>File</FileType>
     </PublishFile>
   </ItemGroup>

diff --git 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
@@ -9,7 +9,7 @@
     <history>https://github.com/microsoft/XmlNotepad/blob/master/src/Updates/Updates.xml</history>
     <frequency>1.00:00:00</frequency>
   </application>
-  <version number="2.8.0.51">
+  <version number="2.8.0.52">
     <bug>Improve handling of on changes made to the loaded XML file outside of XML notepad.</bug>
     <feature>Add theming to the default stylesheet</feature>
   </version>

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ApplicationRevision>51</ApplicationRevision>
-    <ApplicationVersion>2.8.0.51</ApplicationVersion>
+    <ApplicationRevision>52</ApplicationRevision>
+    <ApplicationVersion>2.8.0.52</ApplicationVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/XmlNotepadPackage/Package.appxmanifest b/src/XmlNotepadPackage/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
-  <Identity Name="5632ff08-aa93-439a-b09f-677eb3664250" Publisher="CN=Chris Lovett, O=Chris Lovett, STREET=18606 201st Ave NE, L=Woodinville, S=WA, PostalCode=98077, C=US" Version="2.8.0.51" />
+  <Identity Name="5632ff08-aa93-439a-b09f-677eb3664250" Publisher="CN=Chris Lovett, O=Chris Lovett, STREET=18606 201st Ave NE, L=Woodinville, S=WA, PostalCode=98077, C=US" Version="2.8.0.52" />
   <Properties>
     <DisplayName>XML Notepad</DisplayName>
     <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>

diff --git a/src/XmlNotepadSetup/Product.wxs b/src/XmlNotepadSetup/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="XmlNotepad" Language="1033" Version="2.8.0.51" Manufacturer="Lovett Software" UpgradeCode="14C1B5E8-3198-4AF2-B4BC-351017A109D3">
+  <Product Id="*" Name="XmlNotepad" Language="1033" Version="2.8.0.52" Manufacturer="Lovett Software" UpgradeCode="14C1B5E8-3198-4AF2-B4BC-351017A109D3">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade Schedule="afterInstallFinalize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
     <MediaTemplate />