diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-04 12:33:38 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-04 12:33:38 +0300 |
| commit | 583c1a2cf5cb065e3f17c1bfe0f4464b82e0ee4e (patch) | |
| tree | f4250ca17ef9810923644bfdd7f7f07062f8f2f2 /Software/Visual_Studio/MachineStudio | |
| parent | eeba1f2f7571dc5bfc299444d99cf643677698c5 (diff) | |
| download | Tango-583c1a2cf5cb065e3f17c1bfe0f4464b82e0ee4e.tar.gz Tango-583c1a2cf5cb065e3f17c1bfe0f4464b82e0ee4e.zip | |
Fixed some issues with Machine Studio.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config | 16 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs | 8 |
2 files changed, 18 insertions, 6 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config index d51ecc2bb..004400788 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config @@ -15,6 +15,15 @@ <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" /> </providers> </entityFramework> + + <system.data> + <DbProviderFactories> + <remove invariant="System.Data.SQLite.EF6" /> + <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" /> + <remove invariant="System.Data.SQLite" /> + <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /> + </DbProviderFactories> + </system.data> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> @@ -72,9 +81,4 @@ </dependentAssembly> </assemblyBinding> </runtime> -<system.data> - <DbProviderFactories> - <remove invariant="System.Data.SQLite.EF6" /> - <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" /> - <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories> - </system.data></configuration>
\ No newline at end of file +</configuration>
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index 568529534..2cc23f9e6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -21,6 +21,7 @@ using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.UI.ViewModels; using Tango.MachineStudio.UI.Views; using Tango.MachineStudio.Common; +using Tango.Core; namespace Tango.MachineStudio.UI { @@ -34,6 +35,13 @@ namespace Tango.MachineStudio.UI protected override void OnStartup(StartupEventArgs e) { + +#if DEBUG + CoreSettings.DefaultDataBaseSource = "localhost\\SQLEXPRESS"; +#else + CoreSettings.DefaultDataBaseSource = "twine01\\SQLTWINE"; +#endif + LogManager.RegisterLogger(new VSOutputLogger()); LogManager.RegisterLogger(new FileLogger()); |