Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fe066e2

Browse files
Merge pull request #29 from Kibnet/master
refactor: Took out the Configurator in Nuget
2 parents 7683078 + 9c6d626 commit fe066e2

File tree

6 files changed

+5
-159
lines changed

6 files changed

+5
-159
lines changed

‎SimpleStateMachineNodeEditor/App.xaml.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Reflection;
22
using Microsoft.Extensions.Configuration;
33
using ReactiveUI;
4-
using SimpleStateMachineNodeEditor.Helpers.Configuration;
54
using Splat;
65
using SimpleStateMachineNodeEditor.Helpers.Converters;
6+
using WritableJsonConfiguration;
77
using Application = System.Windows.Application;
88

99
namespace SimpleStateMachineNodeEditor
@@ -18,16 +18,8 @@ public App()
1818
Locator.CurrentMutable.RegisterViewsForViewModels(Assembly.GetCallingAssembly());
1919
Locator.CurrentMutable.RegisterConstant(new ConverterBoolAndVisibility(), typeof(IBindingTypeConverter));
2020

21-
IConfigurationBuilder configurationBuilder = new ConfigurationBuilder();
22-
IConfigurationRoot configuration = configurationBuilder.Add<WritableJsonConfigurationSource>(s =>
23-
{
24-
s.FileProvider = null;
25-
s.Path = "Settings.json";
26-
s.Optional = true;
27-
s.ReloadOnChange = true;
28-
s.ResolveFileProvider();
29-
}).Build();
30-
21+
IConfigurationRoot configuration;
22+
configuration = WritableJsonConfigurationFabric.Create("Settings.json");
3123
Locator.CurrentMutable.RegisterConstant(configuration, typeof(IConfiguration));
3224
}
3325
}

‎SimpleStateMachineNodeEditor/Helpers/Configuration/WritableJsonConfigurationProvider.cs

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎SimpleStateMachineNodeEditor/Helpers/Configuration/WritableJsonConfigurationProviderExtensions.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎SimpleStateMachineNodeEditor/Helpers/Configuration/WritableJsonConfigurationSource.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ New format for xml file with schemes</PackageReleaseNotes>
7272
<PackageReference Include="ReactiveUI.WPF" Version="11.4.17" />
7373
<PackageReference Include="Splat" Version="9.4.5" />
7474
<PackageReference Include="Splat.Drawing" Version="9.4.5" />
75+
<PackageReference Include="WritableJsonConfiguration" Version="3.1.5" />
7576
</ItemGroup>
7677

7778
<ItemGroup>

‎SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/NodesCanvasCommandsViewModel.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using DynamicData;
1+
using DynamicData;
22
using ReactiveUI;
33
using SimpleStateMachineNodeEditor.Helpers;
44
using SimpleStateMachineNodeEditor.Helpers.Commands;
@@ -13,7 +13,6 @@
1313
using System.Windows.Input;
1414
using System.Xml.Linq;
1515
using Microsoft.Extensions.Configuration;
16-
using SimpleStateMachineNodeEditor.Helpers.Configuration;
1716
using Splat;
1817
using System.Drawing.Drawing2D;
1918
using System.Windows.Media;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /