Merge branch 'mod' into hou-plus-mod

07th-mod · Sep 8, 2024 · 0e608a1 · 0e608a1
2 parents 7b650eb + 999eefb
commit 0e608a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/build_dll.yml b/.github/workflows/build_dll.yml
@@ -17,5 +17,8 @@ jobs:
         uses: actions/checkout@v3
 
       # Note: This uses the mono bundled with Ubuntu to build the project
-      - name: Compile project
+      - name: Compile Mod DLL
         run: msbuild /p:Configuration=Release
+
+      - name: Compile standalone Higurashi Script Compiler
+        run: msbuild /p:Configuration=ScriptCompiler
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -486,9 +486,18 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'ScriptCompiler'">
+
+  <!-- On Windows, I get a strong name validation error when trying to use the DLL that's meant to be used with Unity, so instead use the system's XML -->
+  <ItemGroup Condition="'$(Configuration)' == 'ScriptCompiler' And '$(OS)' == 'Windows_NT'">
     <Reference Include="System.Xml"/>
   </ItemGroup>
+
+  <!-- On Mono, I get an error because what I want to use is not supported on this platform. However Unix/Mono doesn't check strong name validation, so we can use the normal XML dll -->
+  <ItemGroup Condition="'$(Configuration)' == 'ScriptCompiler' And '$(OS)' != 'Windows_NT'">
+    <Reference Include="System.Xml">
+      <HintPath>DLLs\System.Xml.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <!-- End standalone script compiler items -->
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />