diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 61b12039..790b8bad 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -7,18 +7,22 @@ --> - $(SolutionDir)\.. - $(RootPath)\bin\$(Configuration) - $(CompiledRootPath)\SMAPI - $(CompiledRootPath)\SMAPI.Toolkit\net4.5 - $(CompiledRootPath)\Mods - $(SolutionDir)\..\bin\SMAPI installer - $(SolutionDir)\..\bin\SMAPI installer for developers windows unix + + $(SolutionDir) + $(SolutionDir)\..\bin + + $(BuildRootPath)\SMAPI\bin\$(Configuration) + $(BuildRootPath)\SMAPI.Toolkit\bin\$(Configuration)\net4.5 + $(BuildRootPath)\SMAPI.Mods.ConsoleCommands\bin\$(Configuration) + $(BuildRootPath)\SMAPI.Mods.SaveBackup\bin\$(Configuration) + + $(OutRootPath)\SMAPI installer + $(OutRootPath)\SMAPI installer for developers - + @@ -26,50 +30,50 @@ - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - + + - - + + diff --git a/src/SMAPI.Installer/SMAPI.Installer.csproj b/src/SMAPI.Installer/SMAPI.Installer.csproj index 3f01c8fe..79e19d89 100644 --- a/src/SMAPI.Installer/SMAPI.Installer.csproj +++ b/src/SMAPI.Installer/SMAPI.Installer.csproj @@ -8,7 +8,6 @@ latest Exe x86 - $(SolutionDir)\..\bin\$(Configuration)\Installer false @@ -17,19 +16,7 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + PreserveNewest diff --git a/src/SMAPI.Installer/README.txt b/src/SMAPI.Installer/assets/README.txt similarity index 100% rename from src/SMAPI.Installer/README.txt rename to src/SMAPI.Installer/assets/README.txt diff --git a/build/lib/System.Numerics.dll b/src/SMAPI.Installer/assets/System.Numerics.dll similarity index 100% rename from build/lib/System.Numerics.dll rename to src/SMAPI.Installer/assets/System.Numerics.dll diff --git a/build/lib/System.Runtime.Caching.dll b/src/SMAPI.Installer/assets/System.Runtime.Caching.dll similarity index 100% rename from build/lib/System.Runtime.Caching.dll rename to src/SMAPI.Installer/assets/System.Runtime.Caching.dll diff --git a/src/SMAPI.Installer/unix-install.sh b/src/SMAPI.Installer/assets/unix-install.sh similarity index 100% rename from src/SMAPI.Installer/unix-install.sh rename to src/SMAPI.Installer/assets/unix-install.sh diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/assets/unix-launcher.sh similarity index 100% rename from src/SMAPI.Installer/unix-launcher.sh rename to src/SMAPI.Installer/assets/unix-launcher.sh diff --git a/src/SMAPI.Installer/windows-exe-config.xml b/src/SMAPI.Installer/assets/windows-exe-config.xml similarity index 100% rename from src/SMAPI.Installer/windows-exe-config.xml rename to src/SMAPI.Installer/assets/windows-exe-config.xml diff --git a/src/SMAPI.Installer/windows-install.bat b/src/SMAPI.Installer/assets/windows-install.bat similarity index 100% rename from src/SMAPI.Installer/windows-install.bat rename to src/SMAPI.Installer/assets/windows-install.bat diff --git a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj index ce35bf73..526d406b 100644 --- a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj +++ b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj @@ -5,7 +5,6 @@ StardewModdingAPI.Mods.ConsoleCommands net45 latest - $(SolutionDir)\..\bin\$(Configuration)\Mods\ConsoleCommands false x86 diff --git a/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj b/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj index 2d031408..970ccea8 100644 --- a/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj +++ b/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj @@ -5,7 +5,6 @@ StardewModdingAPI.Mods.SaveBackup net45 latest - $(SolutionDir)\..\bin\$(Configuration)\Mods\SaveBackup false x86 diff --git a/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj b/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj index 1b9c04ff..accc9175 100644 --- a/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj +++ b/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj @@ -5,9 +5,8 @@ StardewModdingAPI Provides toolkit interfaces which are available to SMAPI mods. net4.5;netstandard2.0 - ..\..\bin\$(Configuration)\SMAPI.Toolkit.CoreInterfaces - ..\..\bin\$(Configuration)\SMAPI.Toolkit.CoreInterfaces\$(TargetFramework)\SMAPI.Toolkit.CoreInterfaces.xml latest + bin\$(Configuration)\$(TargetFramework)\SMAPI.Toolkit.CoreInterfaces.xml x86 diff --git a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj index 3bb7e313..eaf8510b 100644 --- a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj +++ b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj @@ -5,9 +5,8 @@ StardewModdingAPI.Toolkit A library which encapsulates mod-handling logic for mod managers and tools. Not intended for use by mods. net4.5;netstandard2.0 - ..\..\bin\$(Configuration)\SMAPI.Toolkit - ..\..\bin\$(Configuration)\SMAPI.Toolkit\$(TargetFramework)\SMAPI.Toolkit.xml latest + bin\$(Configuration)\$(TargetFramework)\SMAPI.Toolkit.xml x86 StardewModdingAPI.Toolkit diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj index 3bb73295..1376c8a2 100644 --- a/src/SMAPI/SMAPI.csproj +++ b/src/SMAPI/SMAPI.csproj @@ -8,8 +8,7 @@ latest x86 Exe - $(SolutionDir)\..\bin\$(Configuration)\SMAPI - $(SolutionDir)\..\bin\$(Configuration)\SMAPI\StardewModdingAPI.xml + bin\$(Configuration)\StardewModdingAPI.xml false true icon.ico