Browse Source

Finished migration to new locations

pull/46/head
Anairkoen Schno 6 years ago
parent
commit
9144d926de
8 changed files with 14 additions and 42 deletions
  1. +5
    -7
      IPA.Loader/IPA.Loader.csproj
  2. +5
    -2
      IPA.Loader/Loader/PluginManager.cs
  3. +1
    -1
      IPA.Loader/Updating/ModsaberML/ApiEndpoint.cs
  4. +1
    -1
      IPA.Loader/Updating/ModsaberML/Updater.cs
  5. +1
    -1
      IPA.Loader/Updating/SelfPlugin.cs
  6. +0
    -1
      IPA.Tests/IPA.Tests.csproj
  7. +0
    -27
      IPA.Tests/updater_test.json
  8. +1
    -2
      IPA/Patcher/BackupUnit.cs

+ 5
- 7
IPA.Loader/IPA.Loader.csproj View File

@ -73,10 +73,10 @@
<Compile Include="Loader\PluginComponent.cs" /> <Compile Include="Loader\PluginComponent.cs" />
<Compile Include="Loader\PluginManager.cs" /> <Compile Include="Loader\PluginManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="IllusionInjector\Updating\Backup\BackupUnit.cs" />
<Compile Include="IllusionInjector\Updating\ModsaberML\ApiEndpoint.cs" />
<Compile Include="IllusionInjector\Updating\ModsaberML\Updater.cs" />
<Compile Include="IllusionInjector\Updating\SelfPlugin.cs" />
<Compile Include="Updating\Backup\BackupUnit.cs" />
<Compile Include="Updating\ModsaberML\ApiEndpoint.cs" />
<Compile Include="Updating\ModsaberML\Updater.cs" />
<Compile Include="Updating\SelfPlugin.cs" />
<Compile Include="Utilities\Extensions.cs" /> <Compile Include="Utilities\Extensions.cs" />
<Compile Include="Utilities\LoneFunctions.cs" /> <Compile Include="Utilities\LoneFunctions.cs" />
<Compile Include="Utilities\SteamCheck.cs" /> <Compile Include="Utilities\SteamCheck.cs" />
@ -92,8 +92,6 @@
<Version>11.0.2</Version> <Version>11.0.2</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="IllusionInjector\Logging\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

+ 5
- 2
IPA.Loader/Loader/PluginManager.cs View File

@ -1,7 +1,7 @@
using IllusionInjector.Updating;
using IPA;
using IPA;
using IPA.Logging; using IPA.Logging;
using IPA.Old; using IPA.Old;
using IPA.Updating;
using IPA.Utilities; using IPA.Utilities;
using Mono.Cecil; using Mono.Cecil;
using System; using System;
@ -209,8 +209,11 @@ namespace IPA.Loader
if (@ref.FullName == "IllusionInjector.CompositeIPAPlugin") @ref.Namespace = "IPA.Loader.Composite"; //@ref.Name = ""; if (@ref.FullName == "IllusionInjector.CompositeIPAPlugin") @ref.Namespace = "IPA.Loader.Composite"; //@ref.Name = "";
if (@ref.FullName == "IllusionInjector.Logging.UnityLogInterceptor") @ref.Namespace = "IPA.Logging"; //@ref.Name = ""; if (@ref.FullName == "IllusionInjector.Logging.UnityLogInterceptor") @ref.Namespace = "IPA.Logging"; //@ref.Name = "";
if (@ref.FullName == "IllusionInjector.Logging.StandardLogger") @ref.Namespace = "IPA.Logging"; //@ref.Name = ""; if (@ref.FullName == "IllusionInjector.Logging.StandardLogger") @ref.Namespace = "IPA.Logging"; //@ref.Name = "";
if (@ref.FullName == "IllusionInjector.Updating.SelfPlugin") @ref.Namespace = "IPA.Updating"; //@ref.Name = "";
if (@ref.FullName == "IllusionInjector.Updating.Backup.BackupUnit") @ref.Namespace = "IPA.Updating.Backup"; //@ref.Name = "";
if (@ref.Namespace == "IllusionInjector.Utilities") @ref.Namespace = "IPA.Utilities"; //@ref.Name = ""; if (@ref.Namespace == "IllusionInjector.Utilities") @ref.Namespace = "IPA.Utilities"; //@ref.Name = "";
if (@ref.Namespace == "IllusionInjector.Logging.Printers") @ref.Namespace = "IPA.Logging.Printers"; //@ref.Name = ""; if (@ref.Namespace == "IllusionInjector.Logging.Printers") @ref.Namespace = "IPA.Logging.Printers"; //@ref.Name = "";
if (@ref.Namespace == "IllusionInjector.Updating.ModsaberML") @ref.Namespace = "IPA.Updating.ModsaberML"; //@ref.Name = "";
} }
module.Write(file); module.Write(file);
} }


IPA.Loader/IllusionInjector/Updating/ModsaberML/ApiEndpoint.cs → IPA.Loader/Updating/ModsaberML/ApiEndpoint.cs View File

@ -9,7 +9,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace IllusionInjector.Updating.ModsaberML
namespace IPA.Updating.ModsaberML
{ {
class ApiEndpoint class ApiEndpoint
{ {

IPA.Loader/IllusionInjector/Updating/ModsaberML/Updater.cs → IPA.Loader/Updating/ModsaberML/Updater.cs View File

@ -18,7 +18,7 @@ using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
using Logger = IPA.Logging.Logger; using Logger = IPA.Logging.Logger;
namespace IllusionInjector.Updating.ModsaberML
namespace IPA.Updating.ModsaberML
{ {
class Updater : MonoBehaviour class Updater : MonoBehaviour
{ {

IPA.Loader/IllusionInjector/Updating/SelfPlugin.cs → IPA.Loader/Updating/SelfPlugin.cs View File

@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
namespace IllusionInjector.Updating
namespace IPA.Updating
{ {
internal class SelfPlugin : IBeatSaberPlugin internal class SelfPlugin : IBeatSaberPlugin
{ {

+ 0
- 1
IPA.Tests/IPA.Tests.csproj View File

@ -67,7 +67,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="updater_test.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\IPA\IPA.csproj"> <ProjectReference Include="..\IPA\IPA.csproj">


+ 0
- 27
IPA.Tests/updater_test.json View File

@ -1,27 +0,0 @@
{
"name": "bsipa-test-plugin",
"version": "0.0.1",
"approved": true,
"title": "BSIPA Test Plugin",
"description": "",
"type": "mod",
"published": "2018-08-02T03:12:18.805Z",
"gameVersion": "0.11.2",
"gameVersionID": "5b626bb15d243a0008b8886e",
"oldVersions": [],
"dependsOn": [],
"conflictsWith": [],
"files": {
"steam": {
"hash": "a94e7eea2f656b2830a86000ee222b6cb06f8da5",
"files": {
"Plugins/": "da39a3ee5e6b4b0d3255bfef95601890afd80709",
"Plugins/RandomSong.dll": "64ee1ecfeda73c550004bdb5123c7ac47a45e428"
},
"url": "https://www.modsaber.ml/cdn/randomsong/1.0.0-default.zip"
}
},
"weight": 7,
"author": "danike",
"authorID": "5b62723f288b110008291cb9"
}

+ 1
- 2
IPA/Patcher/BackupUnit.cs View File

@ -19,8 +19,7 @@ namespace IPA.Patcher
private List<string> _Files = new List<string>(); private List<string> _Files = new List<string>();
private FileInfo _ManifestFile; private FileInfo _ManifestFile;
private static string _ManifestFileName = "$manifest$.txt"; private static string _ManifestFileName = "$manifest$.txt";
public BackupUnit(PatchContext context) : this(context, DateTime.Now.ToString("yyyy-MM-dd_h-mm-ss")) public BackupUnit(PatchContext context) : this(context, DateTime.Now.ToString("yyyy-MM-dd_h-mm-ss"))
{ {
} }


Loading…
Cancel
Save