From 2d36105c33ffba77eb979ef6ef0d2e7d906b09bc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 23 Sep 2017 20:53:12 -0400
Subject: drop support for SMAPI 1.x (#360)

---
 src/StardewModdingAPI/Utilities/SButton.cs | 14 ++------------
 src/StardewModdingAPI/Utilities/SDate.cs   |  4 ----
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/StardewModdingAPI/Utilities')

diff --git a/src/StardewModdingAPI/Utilities/SButton.cs b/src/StardewModdingAPI/Utilities/SButton.cs
index 33058a64..fa5ae648 100644
--- a/src/StardewModdingAPI/Utilities/SButton.cs
+++ b/src/StardewModdingAPI/Utilities/SButton.cs
@@ -6,12 +6,7 @@ namespace StardewModdingAPI.Utilities
 {
     /// <summary>A unified button constant which includes all controller, keyboard, and mouse buttons.</summary>
     /// <remarks>Derived from <see cref="Keys"/>, <see cref="Buttons"/>, and <see cref="System.Windows.Forms.MouseButtons"/>.</remarks>
-#if SMAPI_1_x
-    internal
-#else
-    public
-#endif
-    enum SButton
+    public enum SButton
     {
         /// <summary>No valid key.</summary>
         None = 0,
@@ -594,12 +589,7 @@ namespace StardewModdingAPI.Utilities
     }
 
     /// <summary>Provides extension methods for <see cref="SButton"/>.</summary>
-#if SMAPI_1_x
-    internal
-#else
-    public
-#endif
-    static class SButtonExtensions
+    public static class SButtonExtensions
     {
         /*********
         ** Accessors
diff --git a/src/StardewModdingAPI/Utilities/SDate.cs b/src/StardewModdingAPI/Utilities/SDate.cs
index 5073259d..326d7fc7 100644
--- a/src/StardewModdingAPI/Utilities/SDate.cs
+++ b/src/StardewModdingAPI/Utilities/SDate.cs
@@ -32,10 +32,8 @@ namespace StardewModdingAPI.Utilities
         /// <summary>The year.</summary>
         public int Year { get; }
 
-#if !SMAPI_1_x
         /// <summary>The day of week.</summary>
         public DayOfWeek DayOfWeek { get; }
-#endif
 
 
         /*********
@@ -69,9 +67,7 @@ namespace StardewModdingAPI.Utilities
             this.Day = day;
             this.Season = season;
             this.Year = year;
-#if !SMAPI_1_x
             this.DayOfWeek = this.GetDayOfWeek();
-#endif
         }
 
         /// <summary>Get the current in-game date.</summary>
-- 
cgit