Fixes to git merges

DCC-EX · Jun 15, 2020 · 848522c · 848522c
1 parent a11f5da
commit 848522c
Show file tree

Hide file tree

Showing 37 changed files with 246 additions and 3,104 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,7 +33,6 @@ bld/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
-.vscode/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
@@ -351,4 +350,5 @@ healthchecksdb
 MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
-.ionide/
+.ionide/
+.vscode/
diff --git a/App.config b/App.config
diff --git a/App.xaml b/App.xaml
diff --git a/App.xaml.cs b/App.xaml.cs
diff --git a/BaseStationInstaller.csproj b/BaseStationInstaller.csproj
diff --git a/BaseStationInstaller.sln b/BaseStationInstaller.sln
@@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseStationInstaller", "BaseStationInstaller.csproj", "{F9CF1A9E-E365-4FE4-A565-8CAE37355083}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseStationInstaller", "BaseStationInstaller\BaseStationInstaller.csproj", "{33BFE4A0-2FEC-44C4-8261-A03F0A82F7A9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F9CF1A9E-E365-4FE4-A565-8CAE37355083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9CF1A9E-E365-4FE4-A565-8CAE37355083}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9CF1A9E-E365-4FE4-A565-8CAE37355083}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9CF1A9E-E365-4FE4-A565-8CAE37355083}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33BFE4A0-2FEC-44C4-8261-A03F0A82F7A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33BFE4A0-2FEC-44C4-8261-A03F0A82F7A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33BFE4A0-2FEC-44C4-8261-A03F0A82F7A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33BFE4A0-2FEC-44C4-8261-A03F0A82F7A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/BaseStationInstaller/App.xaml b/BaseStationInstaller/App.xaml
@@ -0,0 +1,13 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:BaseStationInstaller"
+             x:Class="BaseStationInstaller.App">
+    <Application.DataTemplates>
+        <local:ViewLocator/>
+    </Application.DataTemplates>
+
+    <Application.Styles>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"/>
+    </Application.Styles>
+</Application>
diff --git a/BaseStationInstaller/App.xaml.cs b/BaseStationInstaller/App.xaml.cs
@@ -0,0 +1,30 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using BaseStationInstaller.ViewModels;
+using BaseStationInstaller.Views;
+
+
+namespace BaseStationInstaller
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                desktop.MainWindow = new MainWindow
+                {
+                    DataContext = new MainWindowViewModel(),
+                };
+            }
+
+            base.OnFrameworkInitializationCompleted();
+        }
+    }
+}
diff --git a/BaseStationInstaller/Assets/avalonia-logo.ico b/BaseStationInstaller/Assets/avalonia-logo.ico