Browse Source

Fixed a load of me fucking up

pull/32/head
Anairkoen Schno 5 years ago
parent
commit
b2dbf925b9
7 changed files with 17 additions and 10 deletions
  1. +5
    -1
      BSIPA-Meta/BSIPA-Meta.csproj
  2. +3
    -3
      BSIPA-ModList/manifest.json
  3. +4
    -1
      IPA.Injector/GameVersionEarly.cs
  4. +2
    -2
      IPA.Loader/Config/SelfConfig.cs
  5. +1
    -1
      IPA.Loader/Loader/manifest.json
  6. +1
    -1
      IPA/Program.cs
  7. +1
    -1
      appveyor.yml

+ 5
- 1
BSIPA-Meta/BSIPA-Meta.csproj View File

@ -33,6 +33,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoVerboseConfig>Debug</NoVerboseConfig>
<OtherConfig>Debug</OtherConfig> <OtherConfig>Debug</OtherConfig>
<ProxyConfig>Release</ProxyConfig> <ProxyConfig>Release</ProxyConfig>
</PropertyGroup> </PropertyGroup>
@ -43,6 +44,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoVerboseConfig>Release</NoVerboseConfig>
<OtherConfig>Release</OtherConfig> <OtherConfig>Release</OtherConfig>
<ProxyConfig>Release</ProxyConfig> <ProxyConfig>Release</ProxyConfig>
</PropertyGroup> </PropertyGroup>
@ -54,6 +56,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoVerboseConfig>Debug</NoVerboseConfig>
<OtherConfig>Verbose</OtherConfig> <OtherConfig>Verbose</OtherConfig>
<ProxyConfig>Verbose_Release</ProxyConfig> <ProxyConfig>Verbose_Release</ProxyConfig>
</PropertyGroup> </PropertyGroup>
@ -64,6 +67,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoVerboseConfig>Release</NoVerboseConfig>
<OtherConfig>Verbose_Release</OtherConfig> <OtherConfig>Verbose_Release</OtherConfig>
<ProxyConfig>Verbose_Release</ProxyConfig> <ProxyConfig>Verbose_Release</ProxyConfig>
</PropertyGroup> </PropertyGroup>
@ -85,7 +89,7 @@
<Message Text="Results will be put in $(OutputPath)" Importance="High" /> <Message Text="Results will be put in $(OutputPath)" Importance="High" />
<ItemGroup> <ItemGroup>
<InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(OtherConfig)\**\*" Exclude="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(OtherConfig)\Libraries\**\*" />
<InputDlls Include="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\**\*" Exclude="$(SolutionDir)IPA.Injector\bin\$(NetPlatform)\$(NoVerboseConfig)\Libraries\**\*" />
<InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.dll" /> <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.dll" />
<InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.pdb" /> <InputDlls Include="$(SolutionDir)Doorstop\Proxy\bin\$(ProxyPlatform)\$(ProxyConfig)\**\*.pdb" />
<InputIPAFiles Include="$(SolutionDir)IPA\bin\$(OtherConfig)\**\*" /> <InputIPAFiles Include="$(SolutionDir)IPA\bin\$(OtherConfig)\**\*" />


+ 3
- 3
BSIPA-ModList/manifest.json View File

@ -8,13 +8,13 @@
"", "",
"## An in-game interface client for BSIPA." "## An in-game interface client for BSIPA."
], ],
"gameVersion": "1.1.0",
"gameVersion": "1.2.0",
"id": "BSIPA Mod List", "id": "BSIPA Mod List",
"name": "BSIPA Mod List", "name": "BSIPA Mod List",
"version": "1.3.0",
"version": "1.3.1",
"icon": "BSIPA_ModList.Icons.self.png", "icon": "BSIPA_ModList.Icons.self.png",
"dependsOn": { "dependsOn": {
"BSIPA": "^3.12.23",
"BSIPA": "^3.13.0",
"CustomUI": "^1.5.4" "CustomUI": "^1.5.4"
}, },
"features": [], "features": [],


+ 4
- 1
IPA.Injector/GameVersionEarly.cs View File

@ -15,7 +15,10 @@ namespace IPA.Injector
internal static class GameVersionEarly internal static class GameVersionEarly
{ {
internal static string ResolveDataPath(string installDir) => internal static string ResolveDataPath(string installDir) =>
Path.Combine(Directory.EnumerateDirectories(installDir, "*_Data").First(), "globalgamemanagers");
Directory.EnumerateDirectories(installDir, "*_Data").First();
internal static string GlobalGameManagers(string installDir) =>
Path.Combine(ResolveDataPath(installDir), "globalgamemanagers");
internal static string GetGameVersion() internal static string GetGameVersion()
{ {


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

@ -64,7 +64,7 @@ namespace IPA.Config
} }
internal const string IPAName = "Beat Saber IPA"; internal const string IPAName = "Beat Saber IPA";
internal const string IPAVersion = "3.12.25";
internal const string IPAVersion = "3.13.0";
// uses Updates.AutoUpdate, Updates.AutoCheckUpdates, YeetMods, Debug.ShowCallSource, Debug.ShowDebug, // uses Updates.AutoUpdate, Updates.AutoCheckUpdates, YeetMods, Debug.ShowCallSource, Debug.ShowDebug,
// Debug.CondenseModLogs // Debug.CondenseModLogs
@ -104,7 +104,7 @@ namespace IPA.Config
// This option only takes effect after a full game restart, unless new logs are created again // This option only takes effect after a full game restart, unless new logs are created again
public bool CondenseModLogs = false; public bool CondenseModLogs = false;
// LINE: ignore 2 // LINE: ignore 2
public static bool CondenseModLogs_ => SelfConfigRef.Value.Debug.CondenseModLogs
public static bool CondenseModLogs_ => SelfConfigRef?.Value.Debug.CondenseModLogs ?? false
|| CommandLineValues.Debug.CondenseModLogs; || CommandLineValues.Debug.CondenseModLogs;
public bool ShowHandledErrorStackTraces = false; public bool ShowHandledErrorStackTraces = false;


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

@ -8,7 +8,7 @@
"gameVersion": "1.3.0", "gameVersion": "1.3.0",
"id": "BSIPA", "id": "BSIPA",
"name": "Beat Saber IPA", "name": "Beat Saber IPA",
"version": "3.12.25",
"version": "3.13.0",
"icon": "IPA.icon.png", "icon": "IPA.icon.png",
"features": [ "features": [
"define-feature(print, IPA.Loader.Features.PrintFeature)", "define-feature(print, IPA.Loader.Features.PrintFeature)",


+ 1
- 1
IPA/Program.cs View File

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


+ 1
- 1
appveyor.yml View File

@ -1,7 +1,7 @@
version: 'BSIPA-{branch}-{build}' version: 'BSIPA-{branch}-{build}'
environment: environment:
bsipa_version: '3.12.25'
bsipa_version: '3.13.0'
gh_token: gh_token:
secure: E42gl/yepETuoLSwbJZ1GmEIPK6cCJu6zkd59NA21XiICtEV6COOLW7aehi1tcVU secure: E42gl/yepETuoLSwbJZ1GmEIPK6cCJu6zkd59NA21XiICtEV6COOLW7aehi1tcVU


Loading…
Cancel
Save