From 3fd16a65f181c710fbbe872f36428176efee7ffb Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 22 Dec 2016 12:45:42 -0500
Subject: move models into namespace (#192)

---
 src/StardewModdingAPI/Framework/GitRelease.cs         | 19 -------------------
 src/StardewModdingAPI/Framework/Models/GitRelease.cs  | 19 +++++++++++++++++++
 .../Framework/Models/UserSettings.cs                  | 15 +++++++++++++++
 src/StardewModdingAPI/Framework/UpdateHelper.cs       |  1 +
 src/StardewModdingAPI/Framework/UserSettings.cs       | 15 ---------------
 src/StardewModdingAPI/Program.cs                      |  1 +
 src/StardewModdingAPI/StardewModdingAPI.csproj        |  4 ++--
 7 files changed, 38 insertions(+), 36 deletions(-)
 delete mode 100644 src/StardewModdingAPI/Framework/GitRelease.cs
 create mode 100644 src/StardewModdingAPI/Framework/Models/GitRelease.cs
 create mode 100644 src/StardewModdingAPI/Framework/Models/UserSettings.cs
 delete mode 100644 src/StardewModdingAPI/Framework/UserSettings.cs

(limited to 'src')

diff --git a/src/StardewModdingAPI/Framework/GitRelease.cs b/src/StardewModdingAPI/Framework/GitRelease.cs
deleted file mode 100644
index 0da57efd..00000000
--- a/src/StardewModdingAPI/Framework/GitRelease.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Newtonsoft.Json;
-
-namespace StardewModdingAPI.Framework
-{
-    /// <summary>Metadata about a GitHub release tag.</summary>
-    internal class GitRelease
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>The display name.</summary>
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        /// <summary>The semantic version string.</summary>
-        [JsonProperty("tag_name")]
-        public string Tag { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/StardewModdingAPI/Framework/Models/GitRelease.cs b/src/StardewModdingAPI/Framework/Models/GitRelease.cs
new file mode 100644
index 00000000..bc53468f
--- /dev/null
+++ b/src/StardewModdingAPI/Framework/Models/GitRelease.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+
+namespace StardewModdingAPI.Framework.Models
+{
+    /// <summary>Metadata about a GitHub release tag.</summary>
+    internal class GitRelease
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The display name.</summary>
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        /// <summary>The semantic version string.</summary>
+        [JsonProperty("tag_name")]
+        public string Tag { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/StardewModdingAPI/Framework/Models/UserSettings.cs b/src/StardewModdingAPI/Framework/Models/UserSettings.cs
new file mode 100644
index 00000000..a0074f77
--- /dev/null
+++ b/src/StardewModdingAPI/Framework/Models/UserSettings.cs
@@ -0,0 +1,15 @@
+namespace StardewModdingAPI.Framework.Models
+{
+    /// <summary>Contains user settings from SMAPI's JSON configuration file.</summary>
+    internal class UserSettings
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Whether to enable development features.</summary>
+        public bool DeveloperMode { get; set; }
+
+        /// <summary>Whether to check if a newer version of SMAPI is available on startup.</summary>
+        public bool CheckForUpdates { get; set; } = true;
+    }
+}
diff --git a/src/StardewModdingAPI/Framework/UpdateHelper.cs b/src/StardewModdingAPI/Framework/UpdateHelper.cs
index ddd1d840..e01e55c8 100644
--- a/src/StardewModdingAPI/Framework/UpdateHelper.cs
+++ b/src/StardewModdingAPI/Framework/UpdateHelper.cs
@@ -3,6 +3,7 @@ using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using StardewModdingAPI.Framework.Models;
 
 namespace StardewModdingAPI.Framework
 {
diff --git a/src/StardewModdingAPI/Framework/UserSettings.cs b/src/StardewModdingAPI/Framework/UserSettings.cs
deleted file mode 100644
index 6a4fb353..00000000
--- a/src/StardewModdingAPI/Framework/UserSettings.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace StardewModdingAPI.Framework
-{
-    /// <summary>Contains user settings from SMAPI's JSON configuration file.</summary>
-    internal class UserSettings
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Whether to enable development features.</summary>
-        public bool DeveloperMode { get; set; }
-
-        /// <summary>Whether to check if a newer version of SMAPI is available on startup.</summary>
-        public bool CheckForUpdates { get; set; } = true;
-    }
-}
diff --git a/src/StardewModdingAPI/Program.cs b/src/StardewModdingAPI/Program.cs
index 9ecb91e3..cc3cb2bc 100644
--- a/src/StardewModdingAPI/Program.cs
+++ b/src/StardewModdingAPI/Program.cs
@@ -14,6 +14,7 @@ using StardewModdingAPI.AssemblyRewriters;
 using StardewModdingAPI.Events;
 using StardewModdingAPI.Framework;
 using StardewModdingAPI.Framework.AssemblyRewriting;
+using StardewModdingAPI.Framework.Models;
 using StardewModdingAPI.Inheritance;
 using StardewValley;
 using Monitor = StardewModdingAPI.Framework.Monitor;
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index 9dec9881..0c6697cb 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -174,8 +174,8 @@
     <Compile Include="LogLevel.cs" />
     <Compile Include="Framework\ModRegistry.cs" />
     <Compile Include="Framework\UpdateHelper.cs" />
-    <Compile Include="Framework\GitRelease.cs" />
-    <Compile Include="Framework\UserSettings.cs" />
+    <Compile Include="Framework\Models\GitRelease.cs" />
+    <Compile Include="Framework\Models\UserSettings.cs" />
     <Compile Include="IMonitor.cs" />
     <Compile Include="Inheritance\ChangeType.cs" />
     <Compile Include="Inheritance\ItemStackChange.cs" />
-- 
cgit