Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix system path checks #190

Merged
merged 4 commits into from
Sep 16, 2020
Merged

Fix system path checks #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
554ad34
Fixes an issue experienced by a user who had Subnautica installed in …
toebeann Sep 16, 2020
38373c4
Replace `ToLower()` with `ToLowerInvariant()`
toebeann Sep 16, 2020
e7185b1
Change version to 4.0.2.4
toebeann Sep 16, 2020
b4789c9
Removed Windows\system32 checks
toebeann Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Data/latest-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2.3
4.0.2.4
4 changes: 2 additions & 2 deletions Executable/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("4.0.2.3")]
[assembly: AssemblyFileVersion("4.0.2.3")]
[assembly: AssemblyVersion("4.0.2.4")]
[assembly: AssemblyFileVersion("4.0.2.4")]
4 changes: 2 additions & 2 deletions Installer/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

[assembly: Guid("8c6c9a0b-80c4-43d2-89f2-749e6f09fdda")]

[assembly: AssemblyVersion("4.0.2.3")]
[assembly: AssemblyFileVersion("4.0.2.3")]
[assembly: AssemblyVersion("4.0.2.4")]
[assembly: AssemblyFileVersion("4.0.2.4")]
2 changes: 1 addition & 1 deletion Installer/QModsInstallerScript.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#endif

#define Name "QModManager" ; The name of the game will be added after it
#define Version "4.0.2.3"
#define Version "4.0.2.4"
#define Author "QModManager"
#define URL "https://github.com/QModManager/QModManager"
#define SupportURL "https://discord.gg/UpWuWwq"
Expand Down
4 changes: 2 additions & 2 deletions QMMHarmonyShimmer/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
// 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("4.0.2.3")]
[assembly: AssemblyFileVersion("4.0.2.3")]
[assembly: AssemblyVersion("4.0.2.4")]
[assembly: AssemblyFileVersion("4.0.2.4")]
[assembly: NeutralResourcesLanguage("en")]
4 changes: 2 additions & 2 deletions QMMLoader/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
// 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("4.0.2.3")]
[assembly: AssemblyFileVersion("4.0.2.3")]
[assembly: AssemblyVersion("4.0.2.4")]
[assembly: AssemblyFileVersion("4.0.2.4")]
[assembly: NeutralResourcesLanguage("en")]
11 changes: 1 addition & 10 deletions QModManager/Patching/Patcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,7 @@ internal static class Patcher
{
internal const string IDRegex = "[^0-9a-zA-Z_]";

internal static string QModBaseDir
{
get
{
if (Environment.CurrentDirectory.Contains("system32") && Environment.CurrentDirectory.Contains("Windows"))
return null;
else
return Path.Combine(Environment.CurrentDirectory, "QMods");
}
}
internal static string QModBaseDir => Path.Combine(Environment.CurrentDirectory, "QMods");

private static bool Patched = false;
internal static QModGame CurrentlyRunningGame { get; private set; } = QModGame.None;
Expand Down
4 changes: 2 additions & 2 deletions QModManager/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("4.0.2.3")]
[assembly: AssemblyFileVersion("4.0.2.3")]
[assembly: AssemblyVersion("4.0.2.4")]
[assembly: AssemblyFileVersion("4.0.2.4")]

[assembly: InternalsVisibleTo("QMMTests")]
[assembly: InternalsVisibleTo("QModManager")]
Expand Down
4 changes: 2 additions & 2 deletions QModPluginEmulator/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
// 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("4.0.2.3")]
[assembly: AssemblyFileVersion("4.0.2.3")]
[assembly: AssemblyVersion("4.0.2.4")]
[assembly: AssemblyFileVersion("4.0.2.4")]
[assembly: NeutralResourcesLanguage("en")]

[assembly: InternalsVisibleTo("QModManager.QMMLoader")]
5 changes: 0 additions & 5 deletions QModPluginEmulator/QModPluginGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,6 @@ private static void SaveQMMAssemblyCache()

private static void ClearBepInExCache()
{
if (BepInExCachePath.Contains("system32") || BepInExCachePath.Contains("Windows"))
{
throw new InvalidOperationException($"BepInEx Cache Path invalid! ({BepInExCachePath})");
}

if (!Directory.Exists(BepInExCachePath))
return;

Expand Down
4 changes: 2 additions & 2 deletions UnityAudioFixer/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// 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("4.0.2.3")]
[assembly: AssemblyFileVersion("4.0.2.3")]
[assembly: AssemblyVersion("4.0.2.4")]
[assembly: AssemblyFileVersion("4.0.2.4")]