Skip to content

Commit 67b50d7

Browse files
ManlyMarcoManlyMarco
authored
Update packages; Fix obsolete HarmonyWrapper call (#6)
1 parent 77cd395 commit 67b50d7

20 files changed

+138
-59
lines changed

‎CombinedMeshDemosaic/CombinedMeshDemosaic.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Linq;
22
using BepInEx;
3-
using BepInEx.Logging;
43
using DemosaicCommon;
54
using UnityEngine;
65

‎CombinedMeshDemosaic/CombinedMeshDemosaic.csproj‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +23,7 @@
2123
<DefineConstants>DEBUG;TRACE</DefineConstants>
2224
<ErrorReport>prompt</ErrorReport>
2325
<WarningLevel>4</WarningLevel>
26+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2427
</PropertyGroup>
2528
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2629
<DebugType>embedded</DebugType>
@@ -30,16 +33,21 @@
3033
<ErrorReport>prompt</ErrorReport>
3134
<WarningLevel>4</WarningLevel>
3235
<DebugSymbols>true</DebugSymbols>
36+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3337
</PropertyGroup>
3438
<ItemGroup>
35-
<Reference Include="BepInEx, Version=5.0.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\IllusionLibs.BepInEx.5.0.1.1\lib\net35\BepInEx.dll</HintPath>
39+
<Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\lib\net35\0Harmony.dll</HintPath>
41+
<Private>False</Private>
42+
</Reference>
43+
<Reference Include="BepInEx, Version=5.4.22.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\IllusionLibs.BepInEx.5.4.22\lib\net35\BepInEx.dll</HintPath>
3745
<Private>False</Private>
3846
</Reference>
3947
<Reference Include="System" />
4048
<Reference Include="System.Core" />
4149
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5\lib\net35\UnityEngine.dll</HintPath>
50+
<HintPath>..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\lib\net35\UnityEngine.dll</HintPath>
4351
<Private>False</Private>
4452
</Reference>
4553
</ItemGroup>
@@ -52,4 +60,13 @@
5260
</ItemGroup>
5361
<Import Project="..\DemozaicCommon\DemozaicCommon.projitems" Label="Shared" />
5462
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63+
<Import Project="..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets" Condition="Exists('..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" />
64+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
65+
<PropertyGroup>
66+
<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>
67+
</PropertyGroup>
68+
<Error Condition="!Exists('..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets'))" />
69+
<Error Condition="!Exists('..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets'))" />
70+
</Target>
71+
<Import Project="..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets" Condition="Exists('..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets')" />
5572
</Project>

‎CombinedMeshDemosaic/packages.config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="IllusionLibs.BepInEx" version="5.0.1.1" targetFramework="net35" developmentDependency="true" />
4-
<package id="IllusionLibs.PlayHome.UnityEngine" version="5.5.5" targetFramework="net35" developmentDependency="true" />
3+
<package id="IllusionLibs.BepInEx" version="5.4.22" targetFramework="net35" developmentDependency="true" />
4+
<package id="IllusionLibs.BepInEx.Harmony" version="2.9.0" targetFramework="net35" />
5+
<package id="IllusionLibs.PlayHome.UnityEngine" version="5.5.5.4" targetFramework="net35" developmentDependency="true" />
56
</packages>

‎CubismRendererDisableDemosaic/CubismModelDemosaic.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using BepInEx;
2-
using BepInEx.Harmony;
3-
using BepInEx.Logging;
42
using DemosaicCommon;
53
using HarmonyLib;
64
using Live2D.Cubism.Core;
@@ -21,7 +19,7 @@ private void Awake()
2119
_instance = this;
2220
// Test if type is accessible
2321
var _ = typeof(CubismModel);
24-
HarmonyWrapper.PatchAll(typeof(CubismModelDemosaic));
22+
Harmony.CreateAndPatchAll(typeof(CubismModelDemosaic));
2523
}
2624

2725
[HarmonyPostfix]

‎CubismRendererDisableDemosaic/CubismRendererDisableDemosaic.csproj‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
1515
<TargetFrameworkProfile />
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1618
</PropertyGroup>
1719
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1820
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +25,7 @@
2325
<ErrorReport>prompt</ErrorReport>
2426
<WarningLevel>4</WarningLevel>
2527
<Prefer32Bit>false</Prefer32Bit>
28+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2629
</PropertyGroup>
2730
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2831
<DebugType>embedded</DebugType>
@@ -33,18 +36,15 @@
3336
<WarningLevel>4</WarningLevel>
3437
<DebugSymbols>true</DebugSymbols>
3538
<Prefer32Bit>false</Prefer32Bit>
39+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3640
</PropertyGroup>
3741
<ItemGroup>
38-
<Reference Include="0Harmony, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\IllusionLibs.BepInEx.Harmony.2.0.3.1\lib\net35\0Harmony.dll</HintPath>
42+
<Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\lib\net35\0Harmony.dll</HintPath>
4044
<Private>False</Private>
4145
</Reference>
42-
<Reference Include="BepInEx, Version=5.0.1.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\IllusionLibs.BepInEx.5.0.1.1\lib\net35\BepInEx.dll</HintPath>
44-
<Private>False</Private>
45-
</Reference>
46-
<Reference Include="BepInEx.Harmony, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\IllusionLibs.BepInEx.Harmony.2.0.3.1\lib\net35\BepInEx.Harmony.dll</HintPath>
46+
<Reference Include="BepInEx, Version=5.4.22.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\IllusionLibs.BepInEx.5.4.22\lib\net35\BepInEx.dll</HintPath>
4848
<Private>False</Private>
4949
</Reference>
5050
<Reference Include="CubicModel-Assembly-CSharp">
@@ -53,11 +53,11 @@
5353
</Reference>
5454
<Reference Include="System.Core" />
5555
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.1\lib\net46\UnityEngine.dll</HintPath>
56+
<HintPath>..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.4\lib\net46\UnityEngine.dll</HintPath>
5757
<Private>False</Private>
5858
</Reference>
5959
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.1\lib\net46\UnityEngine.CoreModule.dll</HintPath>
60+
<HintPath>..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.4\lib\net46\UnityEngine.CoreModule.dll</HintPath>
6161
<Private>False</Private>
6262
</Reference>
6363
</ItemGroup>
@@ -70,4 +70,13 @@
7070
</ItemGroup>
7171
<Import Project="..\DemozaicCommon\DemozaicCommon.projitems" Label="Shared" />
7272
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
73+
<Import Project="..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets" Condition="Exists('..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" />
74+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
75+
<PropertyGroup>
76+
<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>
77+
</PropertyGroup>
78+
<Error Condition="!Exists('..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets'))" />
79+
<Error Condition="!Exists('..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.4\build\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.4\build\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.targets'))" />
80+
</Target>
81+
<Import Project="..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.4\build\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.targets" Condition="Exists('..\packages\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.2017.4.24.4\build\IllusionLibs.EmotionCreators.UnityEngine.CoreModule.targets')" />
7382
</Project>

‎CubismRendererDisableDemosaic/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="IllusionLibs.BepInEx" version="5.0.1.1" targetFramework="net40" developmentDependency="true" />
4-
<package id="IllusionLibs.BepInEx.Harmony" version="2.0.3.1" targetFramework="net46" developmentDependency="true" />
5-
<package id="IllusionLibs.EmotionCreators.UnityEngine.CoreModule" version="2017.4.24.1" targetFramework="net46" developmentDependency="true" />
3+
<package id="IllusionLibs.BepInEx" version="5.4.22" targetFramework="net46" developmentDependency="true" />
4+
<package id="IllusionLibs.BepInEx.Harmony" version="2.9.0" targetFramework="net46" developmentDependency="true" />
5+
<package id="IllusionLibs.EmotionCreators.UnityEngine.CoreModule" version="2017.4.24.4" targetFramework="net46" developmentDependency="true" />
66
</packages>

‎DumbRendererDemosaic/DumbRendererDemosaic.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Linq;
22
using BepInEx;
3-
using BepInEx.Logging;
43
using DemosaicCommon;
54
using UnityEngine;
65

‎DumbRendererDemosaic/DumbRendererDemosaic.csproj‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<Deterministic>true</Deterministic>
14+
<NuGetPackageImportStamp>
15+
</NuGetPackageImportStamp>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1618
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +23,7 @@
2123
<DefineConstants>DEBUG;TRACE</DefineConstants>
2224
<ErrorReport>prompt</ErrorReport>
2325
<WarningLevel>4</WarningLevel>
26+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2427
</PropertyGroup>
2528
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2629
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,18 +34,23 @@
3134
<ErrorReport>prompt</ErrorReport>
3235
<WarningLevel>4</WarningLevel>
3336
<DebugSymbols>true</DebugSymbols>
37+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3438
</PropertyGroup>
3539
<PropertyGroup>
3640
<StartupObject />
3741
</PropertyGroup>
3842
<ItemGroup>
39-
<Reference Include="BepInEx, Version=5.0.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\IllusionLibs.BepInEx.5.0.1.1\lib\net35\BepInEx.dll</HintPath>
43+
<Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\lib\net35\0Harmony.dll</HintPath>
45+
<Private>False</Private>
46+
</Reference>
47+
<Reference Include="BepInEx, Version=5.4.22.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\IllusionLibs.BepInEx.5.4.22\lib\net35\BepInEx.dll</HintPath>
4149
<Private>False</Private>
4250
</Reference>
4351
<Reference Include="System.Core" />
4452
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5\lib\net35\UnityEngine.dll</HintPath>
53+
<HintPath>..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\lib\net35\UnityEngine.dll</HintPath>
4654
<Private>False</Private>
4755
</Reference>
4856
</ItemGroup>
@@ -55,4 +63,13 @@
5563
</ItemGroup>
5664
<Import Project="..\DemozaicCommon\DemozaicCommon.projitems" Label="Shared" />
5765
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
66+
<Import Project="..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets" Condition="Exists('..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" />
67+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
68+
<PropertyGroup>
69+
<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>
70+
</PropertyGroup>
71+
<Error Condition="!Exists('..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets'))" />
72+
<Error Condition="!Exists('..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets'))" />
73+
</Target>
74+
<Import Project="..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets" Condition="Exists('..\packages\IllusionLibs.PlayHome.UnityEngine.5.5.5.4\build\IllusionLibs.PlayHome.UnityEngine.targets')" />
5875
</Project>

‎DumbRendererDemosaic/packages.config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="IllusionLibs.BepInEx" version="5.0.1.1" targetFramework="net35" developmentDependency="true" />
4-
<package id="IllusionLibs.PlayHome.UnityEngine" version="5.5.5" targetFramework="net35" developmentDependency="true" />
3+
<package id="IllusionLibs.BepInEx" version="5.4.22" targetFramework="net35" developmentDependency="true" />
4+
<package id="IllusionLibs.BepInEx.Harmony" version="2.9.0" targetFramework="net35" />
5+
<package id="IllusionLibs.PlayHome.UnityEngine" version="5.5.5.4" targetFramework="net35" developmentDependency="true" />
56
</packages>

‎DumbRendererDemosaicIl2Cpp/DumbRendererDemosaicIl2Cpp.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Linq;
2-
using System.Reflection;
32
using BepInEx;
43
using BepInEx.IL2CPP;
54
using BepInEx.Logging;

0 commit comments

Comments
 (0)