diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-03-21 16:38:23 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-03-21 16:38:23 -0400 |
| commit | 75f3600ab1eae06463ae8f386c5ab71f3815142f (patch) | |
| tree | 5bff95c0446b9e70a06c1525fa7387b21ff148cc /src/SMAPI.Toolkit | |
| parent | fc5fc54ab1c375e20b3e4f947bb11f08b4983bd1 (diff) | |
| parent | 74215e844ae2af0075e5df3ab6a5f58efff4f981 (diff) | |
| download | SMAPI-75f3600ab1eae06463ae8f386c5ab71f3815142f.tar.gz SMAPI-75f3600ab1eae06463ae8f386c5ab71f3815142f.tar.bz2 SMAPI-75f3600ab1eae06463ae8f386c5ab71f3815142f.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI.Toolkit')
| -rw-r--r-- | src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs | 7 | ||||
| -rw-r--r-- | src/SMAPI.Toolkit/SMAPI.Toolkit.csproj | 3 | ||||
| -rw-r--r-- | src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs | 7 |
3 files changed, 2 insertions, 15 deletions
diff --git a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs index b01d8b21..e635725c 100644 --- a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs +++ b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs @@ -89,13 +89,6 @@ namespace StardewModdingAPI.Toolkit.Framework : "StardewValley.exe"; } - /// <summary>Get whether the platform uses Mono.</summary> - /// <param name="platform">The current platform.</param> - public static bool IsMono(string platform) - { - return platform == nameof(Platform.Linux) || platform == nameof(Platform.Mac); - } - /********* ** Private methods diff --git a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj index 3fc9de58..d8e32acf 100644 --- a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj +++ b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj @@ -4,9 +4,10 @@ <Description>A library which encapsulates mod-handling logic for mod managers and tools. Not intended for use by mods.</Description> <TargetFrameworks>net4.5;netstandard2.0</TargetFrameworks> <GenerateDocumentationFile>true</GenerateDocumentationFile> - <PlatformTarget Condition="'$(TargetFramework)' == 'net4.5'">x86</PlatformTarget> </PropertyGroup> + <Import Project="..\..\build\common.targets" /> + <ItemGroup> <PackageReference Include="HtmlAgilityPack" Version="1.11.28" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> diff --git a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs index 4ef578f7..62bd13cd 100644 --- a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs +++ b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs @@ -46,12 +46,5 @@ namespace StardewModdingAPI.Toolkit.Utilities { return LowLevelEnvironmentUtility.GetExecutableName(platform.ToString()); } - - /// <summary>Get whether the platform uses Mono.</summary> - /// <param name="platform">The current platform.</param> - public static bool IsMono(this Platform platform) - { - return LowLevelEnvironmentUtility.IsMono(platform.ToString()); - } } } |