diff --git a/build/common.targets b/build/common.targets index 41bea8af..ddfbd71a 100644 --- a/build/common.targets +++ b/build/common.targets @@ -7,6 +7,7 @@ 3.5.0 SMAPI + latest $(AssemblySearchPaths);{GAC} $(DefineConstants);SMAPI_FOR_WINDOWS diff --git a/src/SMAPI.Installer/SMAPI.Installer.csproj b/src/SMAPI.Installer/SMAPI.Installer.csproj index 79e19d89..44ed3bd1 100644 --- a/src/SMAPI.Installer/SMAPI.Installer.csproj +++ b/src/SMAPI.Installer/SMAPI.Installer.csproj @@ -1,11 +1,8 @@  - - SMAPI.Installer StardewModdingAPI.Installer The SMAPI installer for players. net45 - latest Exe x86 false @@ -16,13 +13,10 @@ - - PreserveNewest - + - diff --git a/src/SMAPI.ModBuildConfig.Analyzer/SMAPI.ModBuildConfig.Analyzer.csproj b/src/SMAPI.ModBuildConfig.Analyzer/SMAPI.ModBuildConfig.Analyzer.csproj index 3659e25a..0d109b83 100644 --- a/src/SMAPI.ModBuildConfig.Analyzer/SMAPI.ModBuildConfig.Analyzer.csproj +++ b/src/SMAPI.ModBuildConfig.Analyzer/SMAPI.ModBuildConfig.Analyzer.csproj @@ -1,11 +1,8 @@  - - SMAPI.ModBuildConfig.Analyzer StardewModdingAPI.ModBuildConfig.Analyzer 3.0.0 netstandard2.0 - latest false bin latest @@ -19,5 +16,4 @@ - diff --git a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj index ccbd9a85..5061b01b 100644 --- a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj +++ b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj @@ -1,24 +1,12 @@  - - SMAPI.ModBuildConfig StardewModdingAPI.ModBuildConfig - 3.0.0 + 3.1.0 net45 - latest x86 false - - - - - - - - - @@ -28,19 +16,16 @@ - - mod-package.md - + - - PreserveNewest - + + + - diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets index 5ca9f032..bfee3b33 100644 --- a/src/SMAPI.ModBuildConfig/build/smapi.targets +++ b/src/SMAPI.ModBuildConfig/build/smapi.targets @@ -38,58 +38,26 @@ **********************************************--> - - $(GamePath)\$(GameExecutableName).exe - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\StardewValley.GameData.dll - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\StardewModdingAPI.exe - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\smapi-internal\SMAPI.Toolkit.CoreInterfaces.dll - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\xTile.dll - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\smapi-internal\0Harmony.dll - $(CopyModReferencesToBuildOutput) - + + + + + + - - $(CopyModReferencesToBuildOutput) - - - $(CopyModReferencesToBuildOutput) - - - $(CopyModReferencesToBuildOutput) - - - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\Netcode.dll - $(CopyModReferencesToBuildOutput) - + + + + + - - $(GamePath)\MonoGame.Framework.dll - $(CopyModReferencesToBuildOutput) - + diff --git a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj index 526d406b..1e3208de 100644 --- a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj +++ b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj @@ -1,72 +1,45 @@  - ConsoleCommands StardewModdingAPI.Mods.ConsoleCommands net45 - latest false x86 - - False - + - - $(GamePath)\$(GameExecutableName).exe - False - - - $(GamePath)\StardewValley.GameData.dll - False - + + - - $(GamePath)\Netcode.dll - False - - - False - - - False - - - False - - - False - + + + + + - - $(GamePath)\MonoGame.Framework.dll - False - + - - PreserveNewest - + - diff --git a/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj b/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj index 970ccea8..98a3f0cc 100644 --- a/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj +++ b/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj @@ -1,34 +1,24 @@  - SaveBackup StardewModdingAPI.Mods.SaveBackup net45 - latest false x86 - - False - + - - $(GamePath)\$(GameExecutableName).exe - False - + - - PreserveNewest - + - diff --git a/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj b/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj index accc9175..2bddc46a 100644 --- a/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj +++ b/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj @@ -1,15 +1,11 @@  - - SMAPI.Toolkit.CoreInterfaces StardewModdingAPI Provides toolkit interfaces which are available to SMAPI mods. net4.5;netstandard2.0 - latest - bin\$(Configuration)\$(TargetFramework)\SMAPI.Toolkit.CoreInterfaces.xml + true x86 - diff --git a/src/SMAPI.Toolkit/ModToolkit.cs b/src/SMAPI.Toolkit/ModToolkit.cs index 80b14659..08fe0fed 100644 --- a/src/SMAPI.Toolkit/ModToolkit.cs +++ b/src/SMAPI.Toolkit/ModToolkit.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Runtime.CompilerServices; using System.Threading.Tasks; using Newtonsoft.Json; using StardewModdingAPI.Toolkit.Framework.Clients.Wiki; @@ -11,8 +10,6 @@ using StardewModdingAPI.Toolkit.Framework.ModData; using StardewModdingAPI.Toolkit.Framework.ModScanning; using StardewModdingAPI.Toolkit.Serialization; -[assembly: InternalsVisibleTo("StardewModdingAPI")] -[assembly: InternalsVisibleTo("SMAPI.Web")] namespace StardewModdingAPI.Toolkit { /// A convenience wrapper for the various tools. diff --git a/src/SMAPI.Toolkit/Properties/AssemblyInfo.cs b/src/SMAPI.Toolkit/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..233e680b --- /dev/null +++ b/src/SMAPI.Toolkit/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("StardewModdingAPI")] +[assembly: InternalsVisibleTo("SMAPI.Web")] diff --git a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj index 4e6918ad..71ea0f12 100644 --- a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj +++ b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj @@ -1,14 +1,10 @@  - - SMAPI.Toolkit StardewModdingAPI.Toolkit A library which encapsulates mod-handling logic for mod managers and tools. Not intended for use by mods. net4.5;netstandard2.0 - latest - bin\$(Configuration)\$(TargetFramework)\SMAPI.Toolkit.xml + true x86 - StardewModdingAPI.Toolkit @@ -24,5 +20,4 @@ - diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj index d36d7b4c..02f1763f 100644 --- a/src/SMAPI/SMAPI.csproj +++ b/src/SMAPI/SMAPI.csproj @@ -1,14 +1,12 @@  - StardewModdingAPI StardewModdingAPI The modding API for Stardew Valley. net45 - latest x86 Exe - bin\$(Configuration)\StardewModdingAPI.xml + true false true icon.ico @@ -23,54 +21,24 @@ - - $(GamePath)\$(GameExecutableName).exe - False - - - $(GamePath)\StardewValley.GameData.dll - False - - - True - - - True - - - $(GamePath)\GalaxyCSharp.dll - False - - - $(GamePath)\Lidgren.Network.dll - False - - - $(GamePath)\xTile.dll - False - + + + + + + + - - $(GamePath)\Netcode.dll - False - - - False - - - False - - - False - - - False - + + + + + @@ -78,10 +46,7 @@ - - $(GamePath)\MonoGame.Framework.dll - False - + @@ -92,22 +57,12 @@ - - PreserveNewest - - - SMAPI.metadata.json - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + + -