From e178ed14be24e3971d50addaebb3d13c19c18304 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 23 Sep 2017 18:04:56 -0400
Subject: migrate SMAPI update check to new web API (#336)

---
 src/StardewModdingAPI/StardewModdingAPI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/StardewModdingAPI/StardewModdingAPI.csproj')

diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index 8da93bf4..d5fffd3f 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -219,7 +219,6 @@
     <Compile Include="LogLevel.cs" />
     <Compile Include="Framework\ModRegistry.cs" />
     <Compile Include="Framework\UpdateHelper.cs" />
-    <Compile Include="Framework\Models\GitRelease.cs" />
     <Compile Include="IMonitor.cs" />
     <Compile Include="Events\ChangeType.cs" />
     <Compile Include="Events\ItemStackChange.cs" />
@@ -274,6 +273,7 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <Import Project="..\StardewModdingAPI.Models\StardewModdingAPI.Models.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\common.targets" />
 </Project>
\ No newline at end of file
-- 
cgit 


From 57111a6e8fa6a23bb56f515b50f8b7ea5924d49f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 23 Sep 2017 20:03:45 -0400
Subject: update file name (#336)

---
 src/StardewModdingAPI/Framework/UpdateHelper.cs | 70 -------------------------
 src/StardewModdingAPI/Framework/WebApiClient.cs | 70 +++++++++++++++++++++++++
 src/StardewModdingAPI/StardewModdingAPI.csproj  |  2 +-
 3 files changed, 71 insertions(+), 71 deletions(-)
 delete mode 100644 src/StardewModdingAPI/Framework/UpdateHelper.cs
 create mode 100644 src/StardewModdingAPI/Framework/WebApiClient.cs

(limited to 'src/StardewModdingAPI/StardewModdingAPI.csproj')

diff --git a/src/StardewModdingAPI/Framework/UpdateHelper.cs b/src/StardewModdingAPI/Framework/UpdateHelper.cs
deleted file mode 100644
index 0ee57648..00000000
--- a/src/StardewModdingAPI/Framework/UpdateHelper.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using StardewModdingAPI.Models;
-
-namespace StardewModdingAPI.Framework
-{
-    /// <summary>Provides methods for interacting with the SMAPI web API.</summary>
-    internal class WebApiClient
-    {
-        /*********
-        ** Properties
-        *********/
-        /// <summary>The base URL for the web API.</summary>
-        private readonly Uri BaseUrl;
-
-        /// <summary>The API version number.</summary>
-        private readonly ISemanticVersion Version;
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="baseUrl">The base URL for the web API.</param>
-        /// <param name="version">The web API version.</param>
-        public WebApiClient(string baseUrl, ISemanticVersion version)
-        {
-#if !SMAPI_FOR_WINDOWS
-            baseUrl = baseUrl.Replace("https://", "http://"); // workaround for OpenSSL issues with the game's bundled Mono on Linux/Mac
-#endif
-            this.BaseUrl = new Uri(baseUrl);
-            this.Version = version;
-        }
-
-        /// <summary>Get the latest SMAPI version.</summary>
-        /// <param name="modKeys">The mod keys for which to fetch the latest version.</param>
-        public async Task<IDictionary<string, ModInfoModel>> GetModInfoAsync(params string[] modKeys)
-        {
-            string url = $"v{this.Version}/mods?modKeys={Uri.EscapeDataString(string.Join(",", modKeys))}";
-            return await this.GetAsync<Dictionary<string, ModInfoModel>>(url);
-        }
-
-
-        /*********
-        ** Private methods
-        *********/
-        /// <summary>Fetch the response from the backend API.</summary>
-        /// <typeparam name="T">The expected response type.</typeparam>
-        /// <param name="url">The request URL, optionally excluding the base URL.</param>
-        private async Task<T> GetAsync<T>(string url)
-        {
-            // build request (avoid HttpClient for Mac compatibility)
-            HttpWebRequest request = WebRequest.CreateHttp(new Uri(this.BaseUrl, url).ToString());
-            request.UserAgent = $"SMAPI/{this.Version}";
-
-            // fetch data
-            using (WebResponse response = await request.GetResponseAsync())
-            using (Stream responseStream = response.GetResponseStream())
-            using (StreamReader reader = new StreamReader(responseStream))
-            {
-                string responseText = reader.ReadToEnd();
-                return JsonConvert.DeserializeObject<T>(responseText);
-            }
-        }
-    }
-}
diff --git a/src/StardewModdingAPI/Framework/WebApiClient.cs b/src/StardewModdingAPI/Framework/WebApiClient.cs
new file mode 100644
index 00000000..0ee57648
--- /dev/null
+++ b/src/StardewModdingAPI/Framework/WebApiClient.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using StardewModdingAPI.Models;
+
+namespace StardewModdingAPI.Framework
+{
+    /// <summary>Provides methods for interacting with the SMAPI web API.</summary>
+    internal class WebApiClient
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The base URL for the web API.</summary>
+        private readonly Uri BaseUrl;
+
+        /// <summary>The API version number.</summary>
+        private readonly ISemanticVersion Version;
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="baseUrl">The base URL for the web API.</param>
+        /// <param name="version">The web API version.</param>
+        public WebApiClient(string baseUrl, ISemanticVersion version)
+        {
+#if !SMAPI_FOR_WINDOWS
+            baseUrl = baseUrl.Replace("https://", "http://"); // workaround for OpenSSL issues with the game's bundled Mono on Linux/Mac
+#endif
+            this.BaseUrl = new Uri(baseUrl);
+            this.Version = version;
+        }
+
+        /// <summary>Get the latest SMAPI version.</summary>
+        /// <param name="modKeys">The mod keys for which to fetch the latest version.</param>
+        public async Task<IDictionary<string, ModInfoModel>> GetModInfoAsync(params string[] modKeys)
+        {
+            string url = $"v{this.Version}/mods?modKeys={Uri.EscapeDataString(string.Join(",", modKeys))}";
+            return await this.GetAsync<Dictionary<string, ModInfoModel>>(url);
+        }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Fetch the response from the backend API.</summary>
+        /// <typeparam name="T">The expected response type.</typeparam>
+        /// <param name="url">The request URL, optionally excluding the base URL.</param>
+        private async Task<T> GetAsync<T>(string url)
+        {
+            // build request (avoid HttpClient for Mac compatibility)
+            HttpWebRequest request = WebRequest.CreateHttp(new Uri(this.BaseUrl, url).ToString());
+            request.UserAgent = $"SMAPI/{this.Version}";
+
+            // fetch data
+            using (WebResponse response = await request.GetResponseAsync())
+            using (Stream responseStream = response.GetResponseStream())
+            using (StreamReader reader = new StreamReader(responseStream))
+            {
+                string responseText = reader.ReadToEnd();
+                return JsonConvert.DeserializeObject<T>(responseText);
+            }
+        }
+    }
+}
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index d5fffd3f..07e98674 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -218,7 +218,7 @@
     <Compile Include="ITranslationHelper.cs" />
     <Compile Include="LogLevel.cs" />
     <Compile Include="Framework\ModRegistry.cs" />
-    <Compile Include="Framework\UpdateHelper.cs" />
+    <Compile Include="Framework\WebApiClient.cs" />
     <Compile Include="IMonitor.cs" />
     <Compile Include="Events\ChangeType.cs" />
     <Compile Include="Events\ItemStackChange.cs" />
-- 
cgit