Merge pull request #151 from Valheim-Modding/feat/Algorithman/envprop…

…sfix fix: dont force use of Environment.props, add a warning if it seems to be missing.
Valheim-Modding · Apr 22, 2021 · ef98f7c · ef98f7c
2 parents a2b435c + 7e5da56
commit ef98f7c
Show file tree

Hide file tree

Showing 6 changed files with 453 additions and 503 deletions.
diff --git a/JotunnLib/BuildProps/JotunnBuildTask.props b/JotunnLib/BuildProps/JotunnBuildTask.props
@@ -2,10 +2,13 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="DoPrebuild.props" />
   <UsingTask TaskName="GenerateMMHook" AssemblyFile="$(SolutionDir)JotunnBuildTask\bin\$(ConfigurationName)\JotunnBuildTask.dll"/>
-  <Target Name="JotunnBuildTask" AfterTargets="BeforeBuild" Condition="'$(ExecutePrebuild)' == 'true'" >
+  <Target Name="JotunnBuildTask" AfterTargets="BeforeBuild" Condition="'$(ExecutePrebuild)' == 'true' And Exists('$(SolutionDir)Environment.props')" >
     <Message Importance="High" Text="Executing Jotunn Prebuild Task creating MMHOOK dlls"/> 
     <GenerateMMHook ValheimPath="$(VALHEIM_INSTALL)" />
   </Target>
+  <Target Name="NoJotunnEnvProps" AfterTargets="BeforeBuild" Condition="!Exists('$(SolutionDir)Environment.props')">
+    <Message Importance="High" Text="Cannot execute Jotunn prebuild task because Environment.props is missing." />
+  </Target>
   <Target Name="NoJotunnBuildTask" AfterTargets="BeforeBuild" Condition="'$(ExecutePrebuild)' == 'false'" >
     <Message Importance="High" Text="Skipping MMHOOK dll generation"/>
   </Target>