From 125bcbee56bf40cf82abc7fdb502f8cbc18546cf Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 13 Sep 2019 17:22:45 -0400
Subject: migrate to new project file format

---
 build/common.targets                  |  9 +++++++--
 build/prepare-install-package.targets | 15 ++++++++++-----
 build/prepare-nuget-package.targets   |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'build')

diff --git a/build/common.targets b/build/common.targets
index e08e7066..0781d568 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -39,6 +39,11 @@
   <Choose>
     <When Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI' OR '$(MSBuildProjectName)' == 'StardewModdingAPI.Mods.ConsoleCommands' OR '$(MSBuildProjectName)' == 'StardewModdingAPI.Mods.SaveBackup' OR '$(MSBuildProjectName)' == 'StardewModdingAPI.Tests'">
       <!-- Windows -->
+      <PropertyGroup>
+        <!--recognise XNA Framework DLLs in the GAC-->
+        <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
+      </PropertyGroup>
+
       <ItemGroup Condition="$(OS) == 'Windows_NT'">
         <Reference  Include="Stardew Valley">
           <HintPath>$(GamePath)\Stardew Valley.exe</HintPath>
@@ -93,12 +98,12 @@
   </Choose>
 
   <!-- if game path is invalid, show one user-friendly error instead of a slew of reference errors -->
-  <Target Name="BeforeBuild">
+  <Target Name="ValidateInstallPath" AfterTargets="BeforeBuild">
     <Error Condition="!Exists('$(GamePath)')" Text="Failed to find the game install path automatically; edit the *.csproj file and manually add a &lt;GamePath&gt; setting with the full directory path containing the Stardew Valley executable." />
   </Target>
 
   <!-- copy files into game directory and enable debugging -->
-  <Target Name="AfterBuild">
+  <Target Name="CopySmapiFiles" AfterTargets="AfterBuild">
     <CallTarget Targets="CopySMAPI;CopyDefaultMods" />
   </Target>
   <Target Name="CopySMAPI" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI'">
diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets
index cd758e96..b7b70ed0 100644
--- a/build/prepare-install-package.targets
+++ b/build/prepare-install-package.targets
@@ -5,20 +5,18 @@
   creates the build package in the bin\Packages folder.
   
   -->
-  <Target Name="AfterBuild">
+  <Target Name="PrepareInstaller" AfterTargets="AfterBuild">
     <PropertyGroup>
       <RootPath>$(SolutionDir)\..</RootPath>
       <CompiledRootPath>$(RootPath)\bin\$(Configuration)</CompiledRootPath>
       <CompiledSmapiPath>$(CompiledRootPath)\SMAPI</CompiledSmapiPath>
       <CompiledToolkitPath>$(CompiledRootPath)\SMAPI.Toolkit\net4.5</CompiledToolkitPath>
+      <CompiledModsPath>$(CompiledRootPath)\Mods</CompiledModsPath>
       <PackagePath>$(SolutionDir)\..\bin\SMAPI installer</PackagePath>
       <PackageDevPath>$(SolutionDir)\..\bin\SMAPI installer for developers</PackageDevPath>
       <PlatformName>windows</PlatformName>
       <PlatformName Condition="$(OS) != 'Windows_NT'">unix</PlatformName>
     </PropertyGroup>
-    <ItemGroup>
-      <CompiledMods Include="$(SolutionDir)\..\bin\$(Configuration)\Mods\**\*.*" />
-    </ItemGroup>
 
     <!-- reset package directory -->
     <RemoveDir Directories="$(PackagePath)" />
@@ -48,12 +46,19 @@
     <Copy SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
     <Copy SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.pdb" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
     <Copy SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.xml" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
-    <Copy SourceFiles="@(CompiledMods)" DestinationFolder="$(PackagePath)\bundle\Mods\%(RecursiveDir)" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(TargetDir)\unix-launcher.sh" DestinationFiles="$(PackagePath)\bundle\StardewModdingAPI" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(TargetDir)\windows-exe-config.xml" DestinationFiles="$(PackagePath)\bundle\StardewModdingAPI.exe.config" />
 
+    <!--copy bundled mods-->
+    <Copy SourceFiles="$(CompiledModsPath)\ConsoleCommands\ConsoleCommands.dll" DestinationFolder="$(PackagePath)\bundle\Mods\ConsoleCommands" />
+    <Copy SourceFiles="$(CompiledModsPath)\ConsoleCommands\ConsoleCommands.pdb" DestinationFolder="$(PackagePath)\bundle\Mods\ConsoleCommands" />
+    <Copy SourceFiles="$(CompiledModsPath)\ConsoleCommands\manifest.json" DestinationFolder="$(PackagePath)\bundle\Mods\ConsoleCommands" />
+    <Copy SourceFiles="$(CompiledModsPath)\SaveBackup\SaveBackup.dll" DestinationFolder="$(PackagePath)\bundle\Mods\SaveBackup" />
+    <Copy SourceFiles="$(CompiledModsPath)\SaveBackup\SaveBackup.pdb" DestinationFolder="$(PackagePath)\bundle\Mods\SaveBackup" />
+    <Copy SourceFiles="$(CompiledModsPath)\SaveBackup\manifest.json" DestinationFolder="$(PackagePath)\bundle\Mods\SaveBackup" />
+
     <!-- fix errors on Linux/Mac (sample: https://log.smapi.io/mMdFUpgB) -->
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
diff --git a/build/prepare-nuget-package.targets b/build/prepare-nuget-package.targets
index 0b4320a7..172bfdcc 100644
--- a/build/prepare-nuget-package.targets
+++ b/build/prepare-nuget-package.targets
@@ -5,7 +5,7 @@
   package files to the bin\Pathoschild.Stardew.ModBuildConfig folder.
   
   -->
-  <Target Name="AfterBuild">
+  <Target Name="PreparePackage" AfterTargets="AfterBuild">
     <PropertyGroup>
       <PackagePath>$(SolutionDir)\..\bin\Pathoschild.Stardew.ModBuildConfig</PackagePath>
     </PropertyGroup>
-- 
cgit 


From b7b8b001c5c2dc5d2c9fc1347532ca29368c2325 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 13 Sep 2019 18:20:27 -0400
Subject: update for release

---
 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 ced7af52..a3ca3051 100644
--- a/build/GlobalAssemblyInfo.cs
+++ b/build/GlobalAssemblyInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("SMAPI")]
-[assembly: AssemblyVersion("2.11.2")]
-[assembly: AssemblyFileVersion("2.11.2")]
+[assembly: AssemblyVersion("2.11.3")]
+[assembly: AssemblyFileVersion("2.11.3")]
-- 
cgit