From 826dd53ab550e5b92796c510569118beee6bd044 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 19 Aug 2018 18:28:16 -0400 Subject: move most SMAPI files into subfolder (#582) --- build/common.targets | 22 ++++++++------ build/prepare-install-package.targets | 57 ++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 37 deletions(-) (limited to 'build') diff --git a/build/common.targets b/build/common.targets index 5b6511f8..90c477b6 100644 --- a/build/common.targets +++ b/build/common.targets @@ -99,14 +99,14 @@ - - - - - - + + + + + + @@ -114,12 +114,14 @@ - - + + + - - + + + diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 79185896..35ff78a5 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -23,47 +23,50 @@ - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + -- cgit From adf858fde9d3f47223376901fd2ecb2cfd63771d Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 19 Aug 2018 22:35:55 -0400 Subject: fix mod build package not parsing some valid manifests (#584) --- build/prepare-nuget-package.targets | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'build') diff --git a/build/prepare-nuget-package.targets b/build/prepare-nuget-package.targets index 11d1845e..0b4320a7 100644 --- a/build/prepare-nuget-package.targets +++ b/build/prepare-nuget-package.targets @@ -12,11 +12,12 @@ - - - - - - + + + + + + + -- cgit From 58122c539325ee4471e1baf936622da0f45c9c82 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 23 Aug 2018 23:01:54 -0400 Subject: bump versions for beta --- build/GlobalAssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs index 2e4f9373..3498263c 100644 --- a/build/GlobalAssemblyInfo.cs +++ b/build/GlobalAssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; [assembly: AssemblyProduct("SMAPI")] -[assembly: AssemblyVersion("2.7.0")] -[assembly: AssemblyFileVersion("2.7.0")] +[assembly: AssemblyVersion("2.8.0")] +[assembly: AssemblyFileVersion("2.8.0")] -- cgit From b5adfd8bce12afb885d6bb6a347d25e33be602af Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 26 Aug 2018 20:42:31 -0400 Subject: add more default game install paths --- build/common.targets | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'build') diff --git a/build/common.targets b/build/common.targets index 90c477b6..b5cbbe67 100644 --- a/build/common.targets +++ b/build/common.targets @@ -9,13 +9,20 @@ $(HOME)/GOG Games/Stardew Valley/game $(HOME)/.local/share/Steam/steamapps/common/Stardew Valley $(HOME)/.steam/steam/steamapps/common/Stardew Valley + /Applications/Stardew Valley.app/Contents/MacOS $(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS + + C:\Program Files\GalaxyClient\Games\Stardew Valley + C:\Program Files\GOG Galaxy\Games\Stardew Valley + C:\Program Files\Steam\steamapps\common\Stardew Valley + C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley C:\Program Files (x86)\GOG Galaxy\Games\Stardew Valley C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley + $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32)) $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32)) -- cgit From 4af0786ecb6b16826b2a23b1448c3ab8f5ccd569 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 30 Aug 2018 18:14:40 -0400 Subject: fix assembly load security exceptions by restructuring installer and adding *.exe.config files (#582, #588) --- build/prepare-install-package.targets | 77 +++++++++++++++-------------------- 1 file changed, 32 insertions(+), 45 deletions(-) (limited to 'build') diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 35ff78a5..37ca2e69 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -11,62 +11,49 @@ $(CompiledRootPath)\SMAPI $(CompiledRootPath)\SMAPI.Toolkit\net4.5 $(SolutionDir)\..\bin\Packaged - $(PackagePath)\internal + $(PackagePath)\internal\Windows + $(PackagePath)\internal\Mono + - + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + -- cgit From 48e34dd6035af4e5c1f69932b0baf436d1620429 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Fri, 31 Aug 2018 17:54:20 -0400 Subject: fix readme filename capitalisation --- build/prepare-install-package.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 37ca2e69..09114aee 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -24,7 +24,7 @@ - + -- cgit From e5e4ce411cc5a5e5066552978517904b21900066 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Wed, 31 Oct 2018 17:29:32 -0400 Subject: sync SMAPI context between players in multiplayer (#480) --- build/common.targets | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'build') diff --git a/build/common.targets b/build/common.targets index b5cbbe67..e646e62c 100644 --- a/build/common.targets +++ b/build/common.targets @@ -56,6 +56,14 @@ + + $(GamePath)\GalaxyCSharp.dll + False + + + $(GamePath)\Lidgren.Network.dll + False + $(GamePath)\Netcode.dll False -- cgit From 6bf3734e4ac3efd4a7c32601c81878e38cfbeac0 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Mon, 5 Nov 2018 00:34:16 -0500 Subject: fix build on Linux/Mac --- build/common.targets | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build/common.targets b/build/common.targets index e646e62c..f631633d 100644 --- a/build/common.targets +++ b/build/common.targets @@ -54,7 +54,7 @@ False - + $(GamePath)\GalaxyCSharp.dll @@ -87,8 +87,12 @@ False False - + + + $(GamePath)\Lidgren.Network.dll + False + $(GamePath)\StardewValley.exe False -- cgit From fb0d101ab822145fb70dbfbdc261f6596b160a4f Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Wed, 14 Nov 2018 18:46:40 -0500 Subject: fix build error on Linux/Mac (#480) --- build/common.targets | 113 ++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 64 deletions(-) (limited to 'build') diff --git a/build/common.targets b/build/common.targets index f631633d..320b3e00 100644 --- a/build/common.targets +++ b/build/common.targets @@ -38,72 +38,57 @@ - - - - - - False - - - False - - - False - - - False - + + + + $(GamePath)\Stardew Valley.exe + False + + + $(GamePath)\Netcode.dll + False + + + False + + + False + + + False + + + False + + - - - $(GamePath)\GalaxyCSharp.dll - False - - - $(GamePath)\Lidgren.Network.dll - False - - - $(GamePath)\Netcode.dll - False - - - $(GamePath)\Stardew Valley.exe - False - - - $(GamePath)\xTile.dll - False - False - - - - - - - - $(GamePath)\MonoGame.Framework.dll - False - False - + + + + $(GamePath)\StardewValley.exe + False + + + $(GamePath)\MonoGame.Framework.dll + False + + - - - $(GamePath)\Lidgren.Network.dll - False - - - $(GamePath)\StardewValley.exe - False - - - $(GamePath)\xTile.dll - False - - - - + + + + $(GamePath)\GalaxyCSharp.dll + False + + + $(GamePath)\Lidgren.Network.dll + False + + + $(GamePath)\xTile.dll + False + + -- cgit From e5bc00e7a25a98338dd6b3795d6d229a662ab004 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 18 Nov 2018 00:47:35 -0500 Subject: hide installer's bundled files to avoid confusion (#602) --- build/prepare-install-package.targets | 85 ++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 30 deletions(-) (limited to 'build') diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 09114aee..127a8dd5 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -11,8 +11,8 @@ $(CompiledRootPath)\SMAPI $(CompiledRootPath)\SMAPI.Toolkit\net4.5 $(SolutionDir)\..\bin\Packaged - $(PackagePath)\internal\Windows - $(PackagePath)\internal\Mono + bundle.windows.zipped + bundle.mono.zipped @@ -22,38 +22,63 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + -- cgit From 48b9acb074967b03bdacff1fc357d4c8801ec1d6 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 18 Nov 2018 00:51:30 -0500 Subject: add build logic from the custom scripts (#602) --- build/prepare-install-package.targets | 51 ++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 6 deletions(-) (limited to 'build') diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 127a8dd5..0b575d6f 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -10,9 +10,10 @@ $(SolutionDir)\..\bin\$(Configuration) $(CompiledRootPath)\SMAPI $(CompiledRootPath)\SMAPI.Toolkit\net4.5 - $(SolutionDir)\..\bin\Packaged - bundle.windows.zipped - bundle.mono.zipped + $(SolutionDir)\..\bin\SMAPI installer + $(SolutionDir)\..\bin\SMAPI installer for developers + windows + mono @@ -20,6 +21,7 @@ + @@ -27,7 +29,7 @@ - + @@ -52,11 +54,25 @@ - - + + + + + + + + + + + + + + + + @@ -81,4 +97,27 @@ + + + + + + + + + + + + + + + + + + -- cgit From e8fe550b753ced742c5084dbf851fc606ff90fb0 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 18 Nov 2018 01:00:11 -0500 Subject: remove 0Harmony.pdb from build scripts (#602) The file isn't included in the new Harmony NuGet package. --- build/common.targets | 1 - build/prepare-install-package.targets | 1 - 2 files changed, 2 deletions(-) (limited to 'build') diff --git a/build/common.targets b/build/common.targets index 320b3e00..d9ad89f4 100644 --- a/build/common.targets +++ b/build/common.targets @@ -108,7 +108,6 @@ - diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 0b575d6f..5ba6ed37 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -38,7 +38,6 @@ - -- cgit From ebbbf6fd58f3baf2918eca4c44b0e0b177c9c366 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 18 Nov 2018 01:45:36 -0500 Subject: shorten bundle file names (#602) --- build/prepare-install-package.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 5ba6ed37..dd15fb52 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -62,12 +62,12 @@ - + - + -- cgit From ad612da1a26e2933193f7c6a1e9b161ca9b7327b Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Mon, 19 Nov 2018 13:37:46 -0500 Subject: fix installer errors on Windows (#602) --- build/prepare-install-package.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'build') diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index dd15fb52..aeed101d 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -12,8 +12,8 @@ $(CompiledRootPath)\SMAPI.Toolkit\net4.5 $(SolutionDir)\..\bin\SMAPI installer $(SolutionDir)\..\bin\SMAPI installer for developers - windows - mono + windows + unix @@ -28,8 +28,8 @@ - - +