update for 1.1|1.0 release

.gitattributes

@@ -2,4 +2,6 @@
 .vs* export-ignore
 Source/ export-ignore
 
-Textures/Things/Items/Unfinished/Blueprint.psd export-ignore
+Textures/Things/Items/Unfinished/Blueprint.psd export-ignore
+v1.1/Assemblies/0Harmony.dll export-ignore
+Unity/ export-ignore

.gitignore

@@ -305,3 +305,4 @@ __pycache__/
 # should be stored in the .pubxml.user file.
 
 # End of https://www.gitignore.io/api/visualstudio,visualstudiocode
+v1.1/Assemblies/0Harmony.dll

About/About.xml

@@ -3,11 +3,26 @@
     <name>Omni Core Drill</name>
     <author>DoctorVanGogh, TheUbie &amp; pointcache</author>
     <url>https://github.com/DoctorVanGogh/MiningShaft</url>
-    <targetVersion>1.0.0</targetVersion>
+    <packageId>DoctorVanGogh.MiningShaft</packageId>
     <description><![CDATA[ A deep core driller capable of pulling out any material you want, given enough power and work by your pawns.
 
 Supports any and all mod-added mineable materials out of the box.
 
 Art by: pointcache
 Original Version by: TheUbie]]></description>
+  <supportedVersions>
+    <li>1.0</li>
+    <li>1.1</li>
+  </supportedVersions>
+  <modDependencies>
+    <li>
+      <packageId>brrainz.harmony</packageId>
+      <displayName>Harmony</displayName>
+      <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
+      <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
+    </li>
+  </modDependencies>
+  <loadAfter>
+    <li>brrainz.harmony</li>
+  </loadAfter>
 </ModMetaData>

LoadFolders.xml

@@ -0,0 +1,6 @@
+<loadFolders>
+  <v1.1>
+    <li>/</li>
+    <li>v1.1</li>
+  </v1.1>
+</loadFolders>

Readme.md

@@ -1,6 +1,7 @@
 # Omni Core Drill
 
 [![RimWorld 1.0](https://img.shields.io/badge/RimWorld-1.0-green.svg?style=popout-square)](http://rimworldgame.com/) 
+[![RimWorld 1.1](https://img.shields.io/badge/RimWorld-1.0-green.svg?style=popout-square)](http://rimworldgame.com/) 
 [![License: CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg?style=popout-square)](https://creativecommons.org/licenses/by-nc-sa/4.0/) ![Github Total Downloads](https://img.shields.io/github/downloads-pre/doctorvangogh/MiningShaft/total.svg?style=popout-square)  [![GitHub Latest Release Version](https://img.shields.io/github/release/doctorvangogh/MiningShaft.svg?style=popout-square)](../../releases/latest) [![GitHub Latest Pre-Release Version](https://img.shields.io/github/release/doctorvangogh/MiningShaft/all.svg?style=popout-square)](../../releases)
 
 

Source/OmniCoreDrill/OmniCoreDrill.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using DoctorVanGogh.OmniCoreDrill.Patches;
-using Harmony;
+using HarmonyLib;
 
 using RimWorld;
 using UnityEngine;
@@ -29,7 +29,7 @@ class OmniCoreDrillMod : Mod {
         public OmniCoreDrillMod(ModContentPack content) : base(content) {
             _settings = GetSettings<Settings>();
 
-            var harmonyInstance = HarmonyInstance.Create("DoctorVanGogh.OmniCoreDrill");
+            var harmonyInstance = new Harmony("DoctorVanGogh.OmniCoreDrill");
             harmonyInstance.PatchAll(Assembly.GetExecutingAssembly());
 
             Log.Message("Initialized OmniCoreDrill patches");

Source/OmniCoreDrill/OmniCoreDrill.csproj

@@ -10,44 +10,50 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DoctorVanGogh.OmniCoreDrill</RootNamespace>
     <AssemblyName>OmniCoreDrill</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Assemblies\</OutputPath>
+    <OutputPath>..\..\v1.1\Assemblies\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Assemblies\</OutputPath>
+    <OutputPath>..\..\v1.1\Assemblies\</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Assemblies\0Harmony.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Assembly-CSharp">
-      <HintPath>$(RimworldManagedDir)\Assembly-CSharp.dll</HintPath>
+      <HintPath>$(RimworldManagedDir11)\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="UnityEngine">
-      <HintPath>$(RimworldManagedDir)\UnityEngine.dll</HintPath>
+      <HintPath>$(RimworldManagedDir11)\UnityEngine.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>$(RimworldManagedDir11)\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.TextRenderingModule">
+      <HintPath>$(RimworldManagedDir11)\UnityEngine.TextRenderingModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.IMGUIModule">
+      <HintPath>$(RimworldManagedDir11)\UnityEngine.IMGUIModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -76,6 +82,7 @@
     <Compile Include="[GUI]\Widgets.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Properties\version.txt" />
     <Content Include="[Generated]\Defs.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Defs.cs</LastGenOutput>
@@ -90,7 +97,16 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Settings.cd" />
-    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Lib.Harmony">
+      <Version>2.0.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="MSBuildTasks">
+      <Version>1.5.0.235</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -107,11 +123,4 @@
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  <Import Project="..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
-  </Target>
 </Project>

Source/OmniCoreDrill/Patches/DefGenerator_PreResolve.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Reflection.Emit;
 using System.Text;
-using Harmony;
+using HarmonyLib;
 using RimWorld;
 using Verse;
 

Source/OmniCoreDrill/Properties/AssemblyInfo.cs

@@ -12,6 +12,6 @@
 [assembly: System.Reflection.AssemblyCopyright("Copyright © DoctorVanGogh 2017")]
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: System.Runtime.InteropServices.Guid("7b307eac-98fb-44c4-a5e1-c4a849842bf9")]
-[assembly: System.Reflection.AssemblyVersion("2.3.0.36")]
+[assembly: System.Reflection.AssemblyVersion("2.4.0.40")]
 
 

Source/OmniCoreDrill/Properties/version.txt

@@ -1 +1 @@
-2.3.0.36
+2.4.0.40