Fix github issue 182: Error when changing from roaming to local (1st time use).

Author: clovett

publish.cmd

@@ -8,8 +8,6 @@ for /f "usebackq" %%i in (`xsl -e -s src\Version\version.xsl src\Version\version
     set VERSION=%%i
 )
 
-set WINGET=1
-
 echo ### Publishing version %VERSION%...
 set WINGET=1
 set GITRELEASE=1
@@ -31,9 +29,6 @@ if not EXIST src\XmlNotepadSetup\bin\Release\XmlNotepadSetup.msi goto :nomsi
 if EXIST src\XmlNotepadSetup\bin\Release\XmlNotepadSetup.zip del src\XmlNotepadSetup\bin\Release\XmlNotepadSetup.zip
 if "%LOVETTSOFTWARE_STORAGE_CONNECTION_STRING%" == "" goto :nokey
 
-where wingetcreate > nul 2>&1
-if ERRORLEVEL 1 winget install wingetcreate
-
 copy /y src\Updates\Updates.xml publish\
 if ERRORLEVEL 1 goto :eof
 copy /y src\Updates\Updates.xslt publish\
@@ -65,13 +60,16 @@ del notes.txt
 if "%UPLOAD%" == "0" goto :winget
 
 echo Uploading ClickOnce installer to XmlNotepad
-call AzurePublishClickOnce.cmd %~dp0publish downloads/XmlNotepad "%LOVETTSOFTWARE_STORAGE_CONNECTION_STRING%"
+call AzurePublishClickOnce.cmd publish downloads/XmlNotepad "%LOVETTSOFTWARE_STORAGE_CONNECTION_STRING%"
 if ERRORLEVEL 1 goto :uploadfailed
 
 
 echo ============ Done publishing ClickOnce installer to XmlNotepad ==============
 :winget
 
+where wingetcreate > nul 2>&1
+if ERRORLEVEL 1 winget install wingetcreate
+
 if "%WINGET%"=="0" goto :skipwinget
 if not exist %WINGET_SRC% goto :nowinget
 

src/Updates/Updates.xml

@@ -9,6 +9,9 @@
     <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.57">
+    <feature>Fix bug 182: Error when changing from roaming to local (1st time use).</feature>
+  </version>
   <version number="2.8.0.56">	  
     <feature>Add support for a XmlNotepad.template.settings file that can provide default settings in an enterprise wide deployment of XmlNotepad.</feature>
   </version>

src/Version/Version.cs

@@ -15,5 +15,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.8.0.56")]
-[assembly: AssemblyFileVersion("2.8.0.56")]
+[assembly: AssemblyVersion("2.8.0.57")]
+[assembly: AssemblyFileVersion("2.8.0.57")]

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>56</ApplicationRevision>
-    <ApplicationVersion>2.8.0.56</ApplicationVersion>
+    <ApplicationRevision>57</ApplicationRevision>
+    <ApplicationVersion>2.8.0.57</ApplicationVersion>
   </PropertyGroup>
 </Project>

src/XmlNotepad/SettingsLoader.cs

@@ -140,7 +140,10 @@ public void MoveSettings(Settings settings)
                     {
                         File.Delete(newLocation);
                     }
-                    File.Move(existingLocation, newLocation);
+                    if (File.Exists(existingLocation))
+                    {
+                        File.Move(existingLocation, newLocation);
+                    }                    
                     settings.FileName = newLocation;
                     this._settingsLocation = location;
                 }

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.56" />
+  <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.57" />
   <Properties>
     <DisplayName>XML Notepad</DisplayName>
     <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>

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.56" Manufacturer="Lovett Software" UpgradeCode="14C1B5E8-3198-4AF2-B4BC-351017A109D3">
+  <Product Id="*" Name="XmlNotepad" Language="1033" Version="2.8.0.57" 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 />
@@ -54,6 +54,15 @@
       <Component Id="SgmlReaderDll.dll" Guid="70c0cd62-a6e5-4da4-9336-3fcef1bfb0d1">
         <File Id="SgmlReaderDll.dll" KeyPath="yes" Checksum="yes" />
       </Component>
+      <Component Id="Newtonsoft.Json.dll" Guid="D7A433F2-C782-4BF0-AD2C-1BA25B82F15D">
+        <File Id="Newtonsoft.Json.dll" KeyPath="yes" Checksum="yes" />
+      </Component>
+      <Component Id="System.Security.AccessControl.dll" Guid="D1AD74AB-E816-410E-866B-1E8C02717C11">
+        <File Id="System.Security.AccessControl.dll" KeyPath="yes" Checksum="yes" />
+      </Component>
+      <Component Id="System.Security.Principal.Windows.dll" Guid="65319865-B926-422C-93A3-C1938A0DEAC7">
+        <File Id="System.Security.Principal.Windows.dll" KeyPath="yes" Checksum="yes" />
+      </Component>
       <Component Id="Microsoft.Web.WebView2.Core.dll" Guid="e2a18224-f75d-4a1b-ba41-10b2700f5db6">
         <File Id="Microsoft.Web.WebView2.Core.dll" KeyPath="yes" Checksum="yes" />
       </Component>
@@ -273,6 +282,9 @@
       <ComponentRef Id="FontBuilder.dll" />
       <ComponentRef Id="SimpleGoogleAnalytics.dll" />
       <ComponentRef Id="SgmlReaderDll.dll" />
+      <ComponentRef Id="Newtonsoft.Json.dll" />
+      <ComponentRef Id="System.Security.AccessControl.dll" />
+      <ComponentRef Id="System.Security.Principal.Windows.dll" />
       <ComponentRef Id="Microsoft.Web.WebView2.Core.dll" />
       <ComponentRef Id="Microsoft.Web.WebView2.WinForms.dll" />
       <ComponentRef Id="design.htm" />