From 21300c6879ebfd7ec133028de4e25ade45d7b2f3 Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Fri, 17 Aug 2018 22:47:25 -0500 Subject: [PATCH] Moved non-Mono libraries to Libs/ folder --- BSIPA.sln | 6 ++ IPA/IPA.csproj | 2 +- IPA/PatchContext.cs | 4 + IPA/Program.cs | 4 + IPA/Properties/AssemblyInfo.cs | 4 +- IllusionInjector/IllusionInjector.csproj | 8 ++ IllusionInjector/Injector.cs | 24 ++++++ IllusionInjector/PluginManager.cs | 15 +++- IllusionInjector/PostBuild.msbuild | 35 ++++++++ IllusionInjector/Updating/SelfPlugin.cs | 2 +- ...ionInjector.csproj.CoreCompileInputs.cache | 2 +- ...usionPlugin.csproj.CoreCompileInputs.cache | 2 +- MSBuildTasks/AssemblyRenameTask.cs | 69 +++++++++++++++ MSBuildTasks/MSBuildTasks.csproj | 84 +++++++++++++++++++ MSBuildTasks/Properties/AssemblyInfo.cs | 36 ++++++++ MSBuildTasks/packages.config | 9 ++ 16 files changed, 297 insertions(+), 9 deletions(-) create mode 100644 IllusionInjector/PostBuild.msbuild create mode 100644 MSBuildTasks/AssemblyRenameTask.cs create mode 100644 MSBuildTasks/MSBuildTasks.csproj create mode 100644 MSBuildTasks/Properties/AssemblyInfo.cs create mode 100644 MSBuildTasks/packages.config diff --git a/BSIPA.sln b/BSIPA.sln index 6323b2d4..548da4f3 100644 --- a/BSIPA.sln +++ b/BSIPA.sln @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IllusionInjector", "Illusio EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IPA.Tests", "IPA.Tests\IPA.Tests.csproj", "{C66092B0-5C1E-44E9-B524-E0E8E1425379}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSBuildTasks", "MSBuildTasks\MSBuildTasks.csproj", "{F08C3C7A-3221-432E-BAB8-32BCE58408C8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,6 +39,10 @@ Global {C66092B0-5C1E-44E9-B524-E0E8E1425379}.Debug|Any CPU.Build.0 = Debug|Any CPU {C66092B0-5C1E-44E9-B524-E0E8E1425379}.Release|Any CPU.ActiveCfg = Release|Any CPU {C66092B0-5C1E-44E9-B524-E0E8E1425379}.Release|Any CPU.Build.0 = Release|Any CPU + {F08C3C7A-3221-432E-BAB8-32BCE58408C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F08C3C7A-3221-432E-BAB8-32BCE58408C8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F08C3C7A-3221-432E-BAB8-32BCE58408C8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F08C3C7A-3221-432E-BAB8-32BCE58408C8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/IPA/IPA.csproj b/IPA/IPA.csproj index 953e54dc..c16ab006 100644 --- a/IPA/IPA.csproj +++ b/IPA/IPA.csproj @@ -97,7 +97,7 @@ - + diff --git a/IPA/PatchContext.cs b/IPA/PatchContext.cs index d720e3c8..580e5f0e 100644 --- a/IPA/PatchContext.cs +++ b/IPA/PatchContext.cs @@ -15,9 +15,11 @@ namespace IPA public string Executable { get; private set; } public string DataPathSrc { get; private set; } + public string LibsPathSrc { get; private set; } public string PluginsFolder { get; private set; } public string ProjectName { get; private set; } public string DataPathDst { get; private set; } + public string LibsPathDst { get; private set; } public string ManagedPath { get; private set; } public string EngineFile { get; private set; } public string EngineWebRequestFile { get; private set; } @@ -40,9 +42,11 @@ namespace IPA context.IPARoot = Path.Combine(context.ProjectRoot, "IPA"); context.IPA = Assembly.GetExecutingAssembly().Location ?? Path.Combine(context.ProjectRoot, "IPA.exe"); context.DataPathSrc = Path.Combine(context.IPARoot, "Data"); + context.LibsPathSrc = Path.Combine(context.IPARoot, "Libs"); context.PluginsFolder = Path.Combine(context.ProjectRoot, "Plugins"); context.ProjectName = Path.GetFileNameWithoutExtension(context.Executable); context.DataPathDst = Path.Combine(context.ProjectRoot, context.ProjectName + "_Data"); + context.LibsPathDst = Path.Combine(context.ProjectRoot, "Libs"); context.ManagedPath = Path.Combine(context.DataPathDst, "Managed"); context.EngineFile = Path.Combine(context.ManagedPath, "UnityEngine.CoreModule.dll"); context.AssemblyFile = Path.Combine(context.ManagedPath, "Assembly-CSharp.dll"); diff --git a/IPA/Program.cs b/IPA/Program.cs index f8997253..bd9893a8 100644 --- a/IPA/Program.cs +++ b/IPA/Program.cs @@ -117,6 +117,10 @@ namespace IPA { backup, (from, to) => NativePluginInterceptor(from, to, new DirectoryInfo(nativePluginFolder), isFlat, architecture)); + CopyAll(new DirectoryInfo(context.LibsPathSrc), new DirectoryInfo(context.LibsPathDst), force, + backup, + (from, to) => NativePluginInterceptor(from, to, new DirectoryInfo(nativePluginFolder), isFlat, + architecture)); Console.WriteLine("Successfully updated files!"); diff --git a/IPA/Properties/AssemblyInfo.cs b/IPA/Properties/AssemblyInfo.cs index 4921ab5f..8f1f5f30 100644 --- a/IPA/Properties/AssemblyInfo.cs +++ b/IPA/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.8.7.*")] -[assembly: AssemblyFileVersion("3.8.7")] +[assembly: AssemblyVersion("3.8.8.*")] +[assembly: AssemblyFileVersion("3.8.8")] diff --git a/IllusionInjector/IllusionInjector.csproj b/IllusionInjector/IllusionInjector.csproj index e3b08a3f..cb8d83c6 100644 --- a/IllusionInjector/IllusionInjector.csproj +++ b/IllusionInjector/IllusionInjector.csproj @@ -94,6 +94,11 @@ {e2848bfb-5432-42f4-8ae0-d2ec0cdf2f71} IllusionPlugin + + {f08c3c7a-3221-432e-bab8-32bce58408c8} + MSBuildTasks + False + @@ -113,6 +118,9 @@ + + +