Browse Source

Bumped version

Removed version-postfixed libraries
pull/44/head
Anairkoen Schno 4 years ago
parent
commit
b7ca4c759f
9 changed files with 30 additions and 28 deletions
  1. +16
    -16
      BSIPA-ModList/PostBuild.msbuild
  2. +1
    -1
      IPA.Injector/PostBuild.msbuild
  3. +1
    -1
      IPA.Loader/Config/SelfConfig.cs
  4. +9
    -7
      IPA.Loader/Loader/LibLoader.cs
  5. +1
    -1
      IPA.Loader/Loader/manifest.json
  6. +1
    -1
      IPA/Program.cs
  7. BIN
      Refs/MainAssembly.dll
  8. BIN
      Refs/UnityEngine.CoreModule.Net4.dll
  9. +1
    -1
      appveyor.yml

+ 16
- 16
BSIPA-ModList/PostBuild.msbuild View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="PostBuild" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<OPath></OPath>
<SolDir></SolDir>
</PropertyGroup>
<UsingTask TaskName="AssemblyRename" AssemblyFile="$(SolDir)BuildTools\AssemblyRenameStep\bin\$(Configuration)\AssemblyRenameStep.dll" />
<Target Name="PostBuild">
<Message Text="Relocating" Importance="normal" />
<ItemGroup>
<ToRename Include="$(OPath)Libs\**\*.dll" />
</ItemGroup>
<AssemblyRename Assemblies="@(ToRename)" />
</Target>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="PostBuild" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<OPath></OPath>
<SolDir></SolDir>
</PropertyGroup>
<UsingTask TaskName="AssemblyRename" AssemblyFile="$(SolDir)BuildTools\AssemblyRenameStep\bin\$(Configuration)\AssemblyRenameStep.dll" />
<Target Name="PostBuild">
<Message Text="Relocating" Importance="normal" />
<ItemGroup>
<ToRename Include="$(OPath)Libs\**\*.dll" />
</ItemGroup>
<!--<AssemblyRename Assemblies="@(ToRename)" />-->
</Target>
</Project>

+ 1
- 1
IPA.Injector/PostBuild.msbuild View File

@ -34,6 +34,6 @@
<ItemGroup>
<ToRename Include="$(OPath)Libs\**\*.dll" />
</ItemGroup>
<AssemblyRename Assemblies="@(ToRename)" />
<!--<AssemblyRename Assemblies="@(ToRename)" />-->
</Target>
</Project>

+ 1
- 1
IPA.Loader/Config/SelfConfig.cs View File

@ -67,7 +67,7 @@ namespace IPA.Config
}
internal const string IPAName = "Beat Saber IPA";
internal const string IPAVersion = "3.99.99.4";
internal const string IPAVersion = "3.99.99.5";
// uses Updates.AutoUpdate, Updates.AutoCheckUpdates, YeetMods, Debug.ShowCallSource, Debug.ShowDebug,
// Debug.CondenseModLogs


+ 9
- 7
IPA.Loader/Loader/LibLoader.cs View File

@ -30,17 +30,18 @@ namespace IPA.Loader
if (name.Name == CurrentAssemblyName)
return AssemblyDefinition.ReadAssembly(CurrentAssemblyPath, parameters);
if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.{name.Version}.dll", out var path))
if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.dll", out var path))
{
if (File.Exists(path))
return AssemblyDefinition.ReadAssembly(path, parameters);
}
else if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.dll", out path))
else if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.{name.Version}.dll", out path))
{
if (File.Exists(path))
return AssemblyDefinition.ReadAssembly(path, parameters);
}
return base.Resolve(name, parameters);
}
}
@ -120,9 +121,9 @@ namespace IPA.Loader
SetupAssemblyFilenames();
var testFile = $"{asmName.Name}.{asmName.Version}.dll";
Log(Logger.Level.Debug, $"Looking for file {testFile}");
if (FilenameLocations.TryGetValue(testFile, out var path))
Log(Logger.Level.Debug, $"Looking for file {asmName.Name}.dll");
if (FilenameLocations.TryGetValue(testFile = $"{asmName.Name}.dll", out var path))
{
Log(Logger.Level.Debug, $"Found file {testFile} as {path}");
if (File.Exists(path))
@ -130,9 +131,10 @@ namespace IPA.Loader
Log(Logger.Level.Critical, $"but {path} no longer exists!");
}
else if (FilenameLocations.TryGetValue(testFile = $"{asmName.Name}.dll", out path))
else if (FilenameLocations.TryGetValue(testFile, out path))
{
Log(Logger.Level.Debug, $"Found file {testFile} as {path}");
Log(Logger.Level.Warning, $"File {testFile} should be renamed to just {asmName.Name}.dll");
if (File.Exists(path))
return Assembly.LoadFrom(path);


+ 1
- 1
IPA.Loader/Loader/manifest.json View File

@ -8,7 +8,7 @@
"gameVersion": "1.6.2",
"id": "BSIPA",
"name": "Beat Saber IPA",
"version": "4.0.0-beta.4",
"version": "4.0.0-beta.5",
"icon": "IPA.icon_white.png",
"features": [
"define-feature(print, IPA.Loader.Features.PrintFeature)",


+ 1
- 1
IPA/Program.cs View File

@ -23,7 +23,7 @@ namespace IPA
Unknown
}
public const string FileVersion = "3.99.99.4";
public const string FileVersion = "3.99.99.5";
public static Version Version => Assembly.GetEntryAssembly().GetName().Version;


BIN
Refs/MainAssembly.dll View File


BIN
Refs/UnityEngine.CoreModule.Net4.dll View File


+ 1
- 1
appveyor.yml View File

@ -1,7 +1,7 @@
version: 'BSIPA-{branch}-{build}'
environment:
bsipa_version: '4.0.0-beta.4'
bsipa_version: '4.0.0-beta.5'
gh_token:
secure: E42gl/yepETuoLSwbJZ1GmEIPK6cCJu6zkd59NA21XiICtEV6COOLW7aehi1tcVU


Loading…
Cancel
Save