diff --git a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 index c47dff0..13feed0 100644 Binary files a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 and b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/.vs/DesktopMagic/v16/.suo b/src/.vs/DesktopMagic/v16/.suo index 8b6793e..16ebed2 100644 Binary files a/src/.vs/DesktopMagic/v16/.suo and b/src/.vs/DesktopMagic/v16/.suo differ diff --git a/src/DesktopMagic.Installer/DesktopMagic-Installer.exe b/src/DesktopMagic.Installer/DesktopMagic-Installer.exe index 8bbac61..8fc185d 100644 Binary files a/src/DesktopMagic.Installer/DesktopMagic-Installer.exe and b/src/DesktopMagic.Installer/DesktopMagic-Installer.exe differ diff --git a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt index d63cc69..1fdfde9 100644 --- a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt +++ b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt @@ -10,3 +10,4 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.dll C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\ref\DesktopMagic.Installer.dll C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.pdb +C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.csproj.AssemblyReference.cache diff --git a/src/DesktopMagic/DesktopMagic.csproj.user b/src/DesktopMagic/DesktopMagic.csproj.user index 71d6b64..3ec366d 100644 --- a/src/DesktopMagic/DesktopMagic.csproj.user +++ b/src/DesktopMagic/DesktopMagic.csproj.user @@ -1,6 +1,8 @@  - + + <_LastSelectedProfileId>C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\Properties\PublishProfiles\FolderProfile.pubxml + Designer diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs index 7822632..9b22cbc 100644 --- a/src/DesktopMagic/MainWindow.xaml.cs +++ b/src/DesktopMagic/MainWindow.xaml.cs @@ -61,58 +61,73 @@ namespace DesktopMagic public MainWindow() { - logFilePath = applicationDataPath + "\\Log.txt"; - Logger = new Logger(LogTarget.File, logFilePath, "{:HH:mm:ss} | {,-7} | {,-15} | {,-4} | {,10} | {}"); - key = Registry.CurrentUser.CreateSubKey(@"Software\" + AppName); + try + { + logFilePath = applicationDataPath + "\\Log.txt"; + Logger = new Logger(LogTarget.File, logFilePath, "{:HH:mm:ss} | {,-7} | {,-15} | {,-4} | {,10} | {}"); + key = Registry.CurrentUser.CreateSubKey(@"Software\" + AppName); - Stream iconStream = Application.GetResourceStream(new Uri("pack://application:,,,/DesktopMagic;component/icon.ico")).Stream; - notifyIcon.Click += TaskbarIcon_TrayLeftClick; - notifyIcon.Visible = true; - notifyIcon.Text = AppName; - notifyIcon.Icon = new System.Drawing.Icon(iconStream); + Stream iconStream = Application.GetResourceStream(new Uri("pack://application:,,,/DesktopMagic;component/icon.ico")).Stream; + notifyIcon.Click += TaskbarIcon_TrayLeftClick; + notifyIcon.Visible = true; + notifyIcon.Text = AppName; + notifyIcon.Icon = new System.Drawing.Icon(iconStream); - InitializeComponent(); + InitializeComponent(); - SetLanguageDictionary(); - this.Title = AppName; + SetLanguageDictionary(); + this.Title = AppName; + } + catch (Exception ex) + { + MessageBox.Show(ex.ToString()); + } } #region load private void Window_Loaded(object sender, RoutedEventArgs e) { - Logger.ClearLogFile(); - Logger.Log("Create ApplicationData Folder", "Main"); - if (!Directory.Exists(applicationDataPath)) + try { - _ = Directory.CreateDirectory(applicationDataPath); - } + Logger.ClearLogFile(); - Logger.Log("Create Plugins Folder", "Main"); - if (!Directory.Exists(applicationDataPath + "\\Plugins")) + if (!Directory.Exists(applicationDataPath)) + { + _ = Directory.CreateDirectory(applicationDataPath); + } + Logger.Log("Created ApplicationData Folder", "Main"); + + if (!Directory.Exists(applicationDataPath + "\\Plugins")) + { + _ = Directory.CreateDirectory(applicationDataPath + "\\Plugins"); + } + Logger.Log("Created Plugins Folder", "Main"); + + if (!File.Exists(applicationDataPath + "\\layouts.save")) + { + File.WriteAllText(applicationDataPath + "\\layouts.save", ";" + (string)FindResource("default")); + } + Logger.Log("Created layouts.save file", "Main"); + + _ = optionsComboBox.Items.Add(new Tuple((string)FindResource("musicVisualizer"), 0)); + + //Write To Log File and Load Elements + + Logger.Log("Loading Plugin names", "Main"); + LoadPlugins(); + Logger.Log("Loading Layout names", "Main"); + LoadLayoutNames(); + Logger.Log("Loading Layout", "Main"); + LoadLayout(); + + loaded = true; + Logger.Log("Window Loaded", "Main"); + } + catch (Exception ex) { - _ = Directory.CreateDirectory(applicationDataPath + "\\Plugins"); + MessageBox.Show(ex.ToString()); } - - Logger.Log("Create layouts.save file", "Main"); - if (!File.Exists(applicationDataPath + "\\layouts.save")) - { - File.WriteAllText(applicationDataPath + "\\layouts.save", ";" + (string)FindResource("default")); - } - - _ = optionsComboBox.Items.Add(new Tuple((string)FindResource("musicVisualizer"), 0)); - - //Write To Log File and Load Elements - - Logger.Log("Loading Plugin names", "Main"); - LoadPlugins(); - Logger.Log("Loading Layout names", "Main"); - LoadLayoutNames(); - Logger.Log("Loading Layout", "Main"); - LoadLayout(); - - loaded = true; - Logger.Log("Window Loaded", "Main"); } private void LoadPlugins() diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll index d294bf3..6eaa8e5 100644 Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll differ diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb index 0fcb5cf..ab34ede 100644 Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb differ diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll index d294bf3..6eaa8e5 100644 Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll differ diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb index 0fcb5cf..ab34ede 100644 Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb differ diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache index 441fc7c..024e5fd 100644 --- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache +++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.i.cache @@ -16,5 +16,5 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml 226-1942221924 CalendarWindow.xaml;CpuUsageWindow.xaml;DateWindow.xaml;InputDialog.xaml;MainWindow.xaml;MusicVisualizerWindow.xaml;Plugin\PluginWindow.xaml;Resources\StringResources.de.xaml;Resources\StringResources.en.xaml;TimeWindow.xaml; -True +False diff --git a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json index fcba4d2..d4ce958 100644 --- a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json +++ b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json @@ -66,6 +66,20 @@ ], "assetTargetFallback": true, "warn": true, + "downloadDependencies": [ + { + "name": "Microsoft.AspNetCore.App.Runtime.win-x86", + "version": "[5.0.9, 5.0.9]" + }, + { + "name": "Microsoft.NETCore.App.Runtime.win-x86", + "version": "[5.0.9, 5.0.9]" + }, + { + "name": "Microsoft.WindowsDesktop.App.Runtime.win-x86", + "version": "[5.0.9, 5.0.9]" + } + ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" @@ -73,6 +87,11 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.400\\RuntimeIdentifierGraph.json" } + }, + "runtimes": { + "win-x86": { + "#import": [] + } } } } diff --git a/src/DesktopMagicPluginAPI/obj/project.assets.json b/src/DesktopMagicPluginAPI/obj/project.assets.json index 7358d31..6b53fc2 100644 --- a/src/DesktopMagicPluginAPI/obj/project.assets.json +++ b/src/DesktopMagicPluginAPI/obj/project.assets.json @@ -57,6 +57,47 @@ "build/Vsxmd.targets": {} } } + }, + "net5.0/win-x86": { + "Microsoft.NETCore.Platforms/5.0.0": { + "type": "package", + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} + } + }, + "Microsoft.Win32.SystemEvents/5.0.0": { + "type": "package", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0" + }, + "compile": { + "ref/netstandard2.0/_._": {} + }, + "runtime": { + "runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll": {} + } + }, + "System.Drawing.Common/5.0.2": { + "type": "package", + "dependencies": { + "Microsoft.Win32.SystemEvents": "5.0.0" + }, + "compile": { + "ref/netcoreapp3.0/System.Drawing.Common.dll": {} + }, + "runtime": { + "runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll": {} + } + }, + "Vsxmd/1.4.5": { + "type": "package", + "build": { + "build/Vsxmd.targets": {} + } + } } }, "libraries": { @@ -240,6 +281,20 @@ ], "assetTargetFallback": true, "warn": true, + "downloadDependencies": [ + { + "name": "Microsoft.AspNetCore.App.Runtime.win-x86", + "version": "[5.0.9, 5.0.9]" + }, + { + "name": "Microsoft.NETCore.App.Runtime.win-x86", + "version": "[5.0.9, 5.0.9]" + }, + { + "name": "Microsoft.WindowsDesktop.App.Runtime.win-x86", + "version": "[5.0.9, 5.0.9]" + } + ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" @@ -247,6 +302,11 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.400\\RuntimeIdentifierGraph.json" } + }, + "runtimes": { + "win-x86": { + "#import": [] + } } } } \ No newline at end of file diff --git a/src/DesktopMagicPluginAPI/obj/project.nuget.cache b/src/DesktopMagicPluginAPI/obj/project.nuget.cache index 35e5720..a5ab2a5 100644 --- a/src/DesktopMagicPluginAPI/obj/project.nuget.cache +++ b/src/DesktopMagicPluginAPI/obj/project.nuget.cache @@ -1,13 +1,16 @@ { "version": 2, - "dgSpecHash": "DePY+NmPPolbFZEQfF/BclhlaHW5e9A0c0KFBniYdpUMi2mrXUjkQw5rGqYNJTenSasOdPdRGhzycT+XwTkE9w==", + "dgSpecHash": "fOE+bI0gEfedmn7JaJivSPCHQ/HXI0iR7p6Pd4Ka/IfTuazMk4M0Vi0X5UnM0R4UXVcHDy8FnjtX6Ha/hR2qrg==", "success": true, "projectFilePath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj", "expectedPackageFiles": [ "C:\\Users\\David\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", "C:\\Users\\David\\.nuget\\packages\\microsoft.win32.systemevents\\5.0.0\\microsoft.win32.systemevents.5.0.0.nupkg.sha512", "C:\\Users\\David\\.nuget\\packages\\system.drawing.common\\5.0.2\\system.drawing.common.5.0.2.nupkg.sha512", - "C:\\Users\\David\\.nuget\\packages\\vsxmd\\1.4.5\\vsxmd.1.4.5.nupkg.sha512" + "C:\\Users\\David\\.nuget\\packages\\vsxmd\\1.4.5\\vsxmd.1.4.5.nupkg.sha512", + "C:\\Users\\David\\.nuget\\packages\\microsoft.netcore.app.runtime.win-x86\\5.0.9\\microsoft.netcore.app.runtime.win-x86.5.0.9.nupkg.sha512", + "C:\\Users\\David\\.nuget\\packages\\microsoft.windowsdesktop.app.runtime.win-x86\\5.0.9\\microsoft.windowsdesktop.app.runtime.win-x86.5.0.9.nupkg.sha512", + "C:\\Users\\David\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.win-x86\\5.0.9\\microsoft.aspnetcore.app.runtime.win-x86.5.0.9.nupkg.sha512" ], "logs": [] } \ No newline at end of file