Changes to the updater

FelisDiligens · Jun 22, 2022 · 5d9d3bb · 5d9d3bb
1 parent 0be1955
commit 5d9d3bb
Show file tree

Hide file tree

Showing 10 changed files with 1,567 additions and 9 deletions.
diff --git a/Fo76ini/Forms/FormExceptionDialog/FormExceptionDialog.cs b/Fo76ini/Forms/FormExceptionDialog/FormExceptionDialog.cs
@@ -40,17 +40,16 @@ public static FormExceptionDialog OpenDialog(Exception ex)
                                              $"Running as admin:  " + (Utils.HasAdminRights() ? "Yes" : "No") + "\r\n" +
                                              $"Game edition:      {currentGameEdition}\r\n" +
                                              $"System locale:     {System.Globalization.CultureInfo.CurrentUICulture.Name}\r\n" +
-                                             $"App locale:        {Localization.Locale}" +
-                                             "\r\n";
+                                             $"App locale:        {Localization.Locale}\r\n";
             } 
             catch { }
 
-            form.textBoxDebugText.Text += $"************** Stack trace **************\r\n" +
+            form.textBoxDebugText.Text += $"\r\n************** Stack trace **************\r\n" +
                                           $"If any files are listed (like \"D:\\Workspace\\...\\*.cs:line 123\"):\r\nThose are files on *my* computer, so don't worry if you can't find them.\r\n\r\n" +
                                           $"{ex.GetType()}: {ex.Message}\r\n{ex.StackTrace}\r\n";
 
             if (ex.InnerException != null)
-                form.textBoxDebugText.Text += $"\r\n\r\n************** Inner Exception **************\r\n" +
+                form.textBoxDebugText.Text += $"\r\n************** Inner Exception **************\r\n" +
                                               $"{ex.InnerException.GetType()}: {ex.InnerException.Message}\r\n{ex.InnerException.StackTrace}\r\n";
 
             form.ShowDialog();

diff --git a/Fo76ini_Updater/Fo76ini_Updater.csproj b/Fo76ini_Updater/Fo76ini_Updater.csproj
@@ -24,7 +24,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -44,10 +44,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="INIFileParser, Version=2.5.2.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
-      <HintPath>packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll</HintPath>
+      <HintPath>..\Fo76ini\packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\Fo76ini\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Fo76ini_Updater/Fo76ini_Updater.csproj.user b/Fo76ini_Updater/Fo76ini_Updater.csproj.user
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>