Merge pull request #3 from richardspence/richard/fix-build

Fix build issues
richardspence · Apr 10, 2024 · 65366f6 · 65366f6
2 parents a687750 + 7178610
commit 65366f6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,6 @@
 name: build
 
 on:
-  push:
   pull_request:
     branches: [ main ]
     tags-ginore:

diff --git a/.github/workflows/contributor.yml b/.github/workflows/contributor.yml
@@ -2,8 +2,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
 
 
 jobs:

diff --git a/AutomationPlus/AutomationPlus.csproj b/AutomationPlus/AutomationPlus.csproj
@@ -49,11 +49,11 @@
     </Reference>
     <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\OniStubs.2.0.0\lib\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\OniStubs.2.0.0\lib\Assembly-CSharp-firstpass.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -205,7 +205,12 @@ IF EXIST %25USERPROFILE%25\OneDrive\Documents\Klei\OxygenNotIncluded\ (
     xcopy /Y /s $(TargetDir) %25USERPROFILE%25\OneDrive\Documents\Klei\OxygenNotIncluded\mods\Local\$(ProjectName)
 ) else (
     IF EXIST %25USERPROFILE%25\Documents\Klei\OxygenNotIncluded\  xcopy /Y /s $(TargetDir) %25USERPROFILE%25\Documents\Klei\OxygenNotIncluded\mods\Local\$(ProjectName)
-)</PostBuildEvent>
+)
+
+del $(TargetDir)Assembly-CSharp.dll
+del $(TargetDir)Assembly-CSharp-firstpass.dll 
+
+</PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/AutomationPlus/mod_info.yaml b/AutomationPlus/mod_info.yaml
@@ -1,4 +1,4 @@
 supportedContent: VANILLA_ID, EXPANSION1_ID
 minimumSupportedBuild: 469369
-version: 1.0.2
+version: 1.1.0
 APIVersion: 2