diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-09-13 18:24:54 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-09-13 18:24:54 -0400 |
| commit | 6521df7b131924835eb797251c1e956fae0d6e13 (patch) | |
| tree | b704dc64b6b6fef72615bac8950d5eff3c80ea89 /build/common.targets | |
| parent | e22a54212182d0adc443ac95bc791e83c90f7e10 (diff) | |
| parent | b7b8b001c5c2dc5d2c9fc1347532ca29368c2325 (diff) | |
| download | SMAPI-6521df7b131924835eb797251c1e956fae0d6e13.tar.gz SMAPI-6521df7b131924835eb797251c1e956fae0d6e13.tar.bz2 SMAPI-6521df7b131924835eb797251c1e956fae0d6e13.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'build/common.targets')
| -rw-r--r-- | build/common.targets | 9 |
1 files changed, 7 insertions, 2 deletions
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 <GamePath> 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'"> |