From ff1c5694ca52c3769152560800c37e9793a7107a Mon Sep 17 00:00:00 2001
From: Ben Olden-Cooligan <ben.cyanfish@gmail.com>
Date: Sun, 23 Apr 2023 14:30:39 -0700
Subject: [PATCH] Add StringExtensions to NAPS2.Internals

---
 NAPS2.Internals/NAPS2.Internals.csproj   | 2 +-
 NAPS2.Internals/Util/StringExtensions.cs | 9 +++++++++
 NAPS2.sln.DotSettings                    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 NAPS2.Internals/Util/StringExtensions.cs

diff --git a/NAPS2.Internals/NAPS2.Internals.csproj b/NAPS2.Internals/NAPS2.Internals.csproj
index 3ea3bbc04..669471da8 100644
--- a/NAPS2.Internals/NAPS2.Internals.csproj
+++ b/NAPS2.Internals/NAPS2.Internals.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFrameworks>net6;net462;netstandard2.0</TargetFrameworks>
         <Nullable>enable</Nullable>
-        <RootNamespace>NAPS2.Internals</RootNamespace>
+        <RootNamespace>NAPS2</RootNamespace>
 
         <Title>NAPS2.Internals</Title>
     </PropertyGroup>
diff --git a/NAPS2.Internals/Util/StringExtensions.cs b/NAPS2.Internals/Util/StringExtensions.cs
new file mode 100644
index 000000000..f94989cc5
--- /dev/null
+++ b/NAPS2.Internals/Util/StringExtensions.cs
@@ -0,0 +1,9 @@
+namespace NAPS2.Util;
+
+public static class StringExtensions
+{
+    public static bool ContainsInvariantIgnoreCase(this string source, string value)
+    {
+        return source.IndexOf(value, StringComparison.InvariantCultureIgnoreCase) != -1;
+    }
+}
\ No newline at end of file
diff --git a/NAPS2.sln.DotSettings b/NAPS2.sln.DotSettings
index c9a10fa5f..b7fc3b722 100644
--- a/NAPS2.sln.DotSettings
+++ b/NAPS2.sln.DotSettings
@@ -6,7 +6,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>