Corrected packaging issues

richardspence · Apr 10, 2024 · a896aad · a896aad
1 parent 89112bf
commit a896aad
Showing 1 changed file with 29 additions and 33 deletions.
diff --git a/AutomationPlus/AutomationPlus.csproj b/AutomationPlus/AutomationPlus.csproj
@@ -46,6 +46,7 @@
   <ItemGroup>
     <Reference Include="0Harmony">
       <HintPath>..\lib\0Harmony.dll</HintPath>
+      <Private>False</Private>
     </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>
@@ -71,12 +72,15 @@
     <Reference Include="System.Xml" />
     <Reference Include="Unity.TextMeshPro">
       <HintPath>..\lib\Unity.TextMeshPro.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\lib\UnityEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
       <HintPath>..\lib\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.ImageConversionModule">
       <HintPath>..\lib\UnityEngine.ImageConversionModule.dll</HintPath>
@@ -86,9 +90,11 @@
     </Reference>
     <Reference Include="UnityEngine.TextRenderingModule">
       <HintPath>..\lib\UnityEngine.TextRenderingModule.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UI">
       <HintPath>..\lib\UnityEngine.UI.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UIModule">
       <HintPath>..\lib\UnityEngine.UIModule.dll</HintPath>
@@ -157,7 +163,6 @@
     <Content Include="anim\assets\logic_generator_random\logic_generator_random_build.bytes">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="ILMerge.props" />
     <None Include="mod.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -198,14 +203,9 @@
       <Compile Include="$(IntermediateOutputPath)Version.cs" />
     </ItemGroup>
   </Target>
-  <ItemGroup>
-    <MergeAsm Include="$(OutputPath)$(TargetFileName)" />
-    <MergeAsm Include="$(OutputPath)PLib.dll" />
-  </ItemGroup>
-  <!-- <ILMerge InputAssemblies="@(MergeAsm)" OutputFile="$(TargetFileName)" TargetKind="SameAsPrimaryAssembly" /> -->
   <PropertyGroup>
     <PostBuildEvent>
-</PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -215,30 +215,26 @@
     <Error Condition="!Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.29\build\ILRepack.Lib.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.Lib.MSBuild.Task.2.0.29\build\ILRepack.Lib.MSBuild.Task.targets'))" />
   </Target>
   <!-- <Import Project="..\packages\ILRepack.Lib.MSBuild.Task.2.0.29\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.29\build\ILRepack.Lib.MSBuild.Task.targets')" /> -->
- <UsingTask AssemblyFile="..\packages\ILRepack.Lib.MSBuild.Task.2.0.29\build\ILRepack.Lib.MSBuild.Task.dll" TaskName="ILRepack" />
-	<Target Name="ILRepack" AfterTargets="Build" Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)')">
-		<ItemGroup>
-			<InputAssemblies Include="$(OutputPath)$(TargetName)$(TargetExt)" />
-			<InputAssemblies Include="$(OutputPath)Plib.dll" />
-			<ILRepack Parallel="true" DebugInfo="true" AllowDuplicateResources="false" InputAssemblies="@(InputAssemblies)" TargetKind="SameAsPrimaryAssembly" KeyFile="$(KeyFile)" OutputFile="$(OutputPath)$(TargetName)$(TargetExt)" />
-		</ItemGroup>
-
-	</Target>
-  	<Target AfterTargets="ILRepack" Name="CleanReferenceCopyLocalPaths" Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)') and '$(ClearOutputDirectory)' != 'False'">
-			<Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
-			<ItemGroup>
-				<Directories Include="$([System.IO.Directory]::GetDirectories('$(OutDir)%(DestinationSubDirectory)', '*', System.IO.SearchOption.AllDirectories))" />
-				<Directories>
-					<Files>
-						$([System.IO.Directory]::GetFiles("%(Directories.Identity)", "*", System.IO.SearchOption.AllDirectories).get_Length())
-					</Files>
-				</Directories>
-			</ItemGroup>
-			<RemoveDir Directories="@(Directories)" Condition="%(Files)=='0'" />
-		</Target>
-      <Target Name="CopyToLocal" AfterTargets="ILRepack">
-        <!-- set security on binaries-->
-            <Exec Command="xcopy /Y /s $(TargetDir) $(USERPROFILE)\OneDrive\Documents\Klei\OxygenNotIncluded\mods\Local\$(ProjectName)" Condition="Exists('$(USERPROFILE)\OneDrive\Documents\Klei\OxygenNotIncluded')" />
-            <Exec Command="xcopy /Y /s $(TargetDir) $(USERPROFILE)\Documents\Klei\OxygenNotIncluded\mods\Local\$(ProjectName)" Condition="Exists('$(USERPROFILE)\Documents\Klei\OxygenNotIncluded')" />
-    </Target>
+  <UsingTask AssemblyFile="..\packages\ILRepack.Lib.MSBuild.Task.2.0.29\build\ILRepack.Lib.MSBuild.Task.dll" TaskName="ILRepack" />
+  <Target Name="ILRepack" AfterTargets="Build" Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)')">
+    <ItemGroup>
+      <InputAssemblies Include="$(OutputPath)$(TargetName)$(TargetExt)" />
+      <InputAssemblies Include="$(OutputPath)Plib.dll" />
+      <ILRepack Parallel="true" DebugInfo="true" AllowDuplicateResources="false" InputAssemblies="@(InputAssemblies)" TargetKind="SameAsPrimaryAssembly" KeyFile="$(KeyFile)" OutputFile="$(OutputPath)$(TargetName)$(TargetExt)" />
+    </ItemGroup>
+  </Target>
+  <Target AfterTargets="ILRepack" Name="CleanReferenceCopyLocalPaths" Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)') and '$(ClearOutputDirectory)' != 'False'">
+    <!-- <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" /> -->
+    <ItemGroup>
+      <!-- <FilesToDelete Include="$(OutputPath)Plib.dll" /> -->
+      <FilesToDelete Include="$(OutputPath)Assembly-CSharp.dll" />
+      <FilesToDelete Include="$(OutputPath)Assembly-CSharp-firstpass.dll" />
+    </ItemGroup>
+    <Delete Files="@(FilesToDelete->'$(OutputPath)%(Filename)%(Extension)')" />
+  </Target>
+  <Target Name="CopyToLocal" AfterTargets="ILRepack">
+    <!-- set security on binaries-->
+    <Exec Command="xcopy /Y /s $(TargetDir) $(USERPROFILE)\OneDrive\Documents\Klei\OxygenNotIncluded\mods\Local\$(ProjectName)" Condition="Exists('$(USERPROFILE)\OneDrive\Documents\Klei\OxygenNotIncluded')" />
+    <Exec Command="xcopy /Y /s $(TargetDir) $(USERPROFILE)\Documents\Klei\OxygenNotIncluded\mods\Local\$(ProjectName)" Condition="Exists('$(USERPROFILE)\Documents\Klei\OxygenNotIncluded')" />
+  </Target>
 </Project>