Fixed the settings issue (wokhan#113)

* Fixed the settings issue (now also offering a portable mode), using .Net Core embedded conf management feature + WPF designer (best of both worlds). Options descriptions will be improved in a later change (along with UI improvements). * Small fix for NPE on defaultInstance when no settings.json file exists. * Looks like it was too early to call previous commit a fix. That one is actually fixing the issue. Thanks baby girl for the awful night :-D * Small fix for settings.json does not open Co-authored-by: harrwiss <[email protected]>
mgiay · May 18, 2020 · bef813a · bef813a
1 parent 4fea380
commit bef813a
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 480 deletions.
diff --git a/Common.Tests/Helpers/CustomSettingsProviderTest.cs b/Common.Tests/Helpers/CustomSettingsProviderTest.cs
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -16,10 +16,13 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Management" Version="4.7.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0" />
@@ -28,7 +31,7 @@
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
@@ -48,7 +51,6 @@
     </Resource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <Compile Update="Config\Settings.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <AutoGen>True</AutoGen>
@@ -63,11 +65,6 @@
     </None>
   </ItemGroup>
   <PropertyGroup>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <PostBuildEvent>
-      del WFN.config
-      ren "Wokhan.WindowsFirewallNotifier.Common.dll.config" WFN.config
-    </PostBuildEvent>
     <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Common/Config/CustomSettingsProvider.cs b/Common/Config/CustomSettingsProvider.cs