Publish v1.6.1

Fixed broken installer by reworking to remove a newly introduced dependency.
coldino · Jan 27, 2018 · 6142dec · 6142dec
1 parent 017e7f5
commit 6142dec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/LarkatorGUI/CalibrationWindow.xaml.cs b/LarkatorGUI/CalibrationWindow.xaml.cs
@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
 using System;
 using System.Diagnostics;
-using System.Runtime.Serialization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -81,52 +80,44 @@ public ExampleCalibration()
         }
     }
 
-    [DataContract]
     public class Calibration : DependencyObject
     {
-        [JsonIgnore]
         public Bounds Bounds
         {
             get { return (Bounds)GetValue(BoundsProperty); }
             set { SetValue(BoundsProperty, value); }
         }
 
-        [DataMember]
         public string Filename
         {
             get { return (string)GetValue(FilenameProperty); }
             set { SetValue(FilenameProperty, value); }
         }
 
-        [DataMember]
         public double OffsetX
         {
             get { return (double)GetValue(OffsetXProperty); }
             set { SetValue(OffsetXProperty, value); }
         }
 
-        [DataMember]
         public double OffsetY
         {
             get { return (double)GetValue(OffsetYProperty); }
             set { SetValue(OffsetYProperty, value); }
         }
 
-        [DataMember]
         public double ScaleX
         {
             get { return (double)GetValue(ScaleXProperty); }
             set { SetValue(ScaleXProperty, value); }
         }
 
-        [DataMember]
         public double ScaleY
         {
             get { return (double)GetValue(ScaleYProperty); }
             set { SetValue(ScaleYProperty, value); }
         }
 
-        [JsonIgnore]
         public string Output
         {
             get { return (string)GetValue(OutputProperty); }
@@ -172,7 +163,18 @@ public void Recalculate()
             OffsetX = minX - ScaleX * 10;
             OffsetY = minY - ScaleY * 10;
 
-            Output = JsonConvert.SerializeObject(this, Formatting.Indented);
+            Output = RecreateOutput();
+        }
+
+        private string RecreateOutput()
+        {
+            return $"{{\n" +
+                $"  \"Filename\": \"{Filename}\",\n" +
+                $"  \"OffsetX\": \"{OffsetX}\",\n" +
+                $"  \"OffsetY\": \"{OffsetY}\",\n" +
+                $"  \"ScaleX\": \"{ScaleX}\",\n" +
+                $"  \"ScaleY\": \"{ScaleY}\"\n" +
+                $"}},";
         }
     }
 

diff --git a/LarkatorGUI/LarkatorGUI.csproj b/LarkatorGUI/LarkatorGUI.csproj
@@ -30,8 +30,8 @@
     <ProductName>Larkator</ProductName>
     <PublisherName>coldino</PublisherName>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>1.6.0.%2a</ApplicationVersion>
+    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationVersion>1.6.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -94,23 +94,10 @@
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Runtime.Serialization.Primitives, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\program files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\ref\netcoreapp2.0\System.Runtime.Serialization.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />