diff --git a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2
index ca6feb7..1bb54cb 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 2f6f33e..71fcf9e 100644
Binary files a/src/.vs/DesktopMagic/v16/.suo and b/src/.vs/DesktopMagic/v16/.suo differ
diff --git a/src/DesktopMagic.Installer/DesktopMagic.exe b/src/DesktopMagic.Installer/DesktopMagic.exe
index 7f24175..c82eb63 100644
Binary files a/src/DesktopMagic.Installer/DesktopMagic.exe and b/src/DesktopMagic.Installer/DesktopMagic.exe differ
diff --git a/src/DesktopMagic.Installer/Installer.iss b/src/DesktopMagic.Installer/Installer.iss
index 7b36095..8f843af 100644
--- a/src/DesktopMagic.Installer/Installer.iss
+++ b/src/DesktopMagic.Installer/Installer.iss
@@ -37,7 +37,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
[Files]
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\DesktopMagic\bin\Release\net5.0-windows\AlwaysUpToDate.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\DesktopMagic\bin\Release\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.deps.json"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion
@@ -64,7 +64,6 @@ Source: "..\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinMM.dll"; DestDir:
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Drawing.Common.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Management.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Text.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll"; DestDir: "{app}"; Flags: ignoreversion
diff --git a/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss b/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss
index 7b36095..8f843af 100644
--- a/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss
+++ b/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss
@@ -37,7 +37,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
[Files]
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\DesktopMagic\bin\Release\net5.0-windows\AlwaysUpToDate.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\DesktopMagic\bin\Release\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.deps.json"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion
@@ -64,7 +64,6 @@ Source: "..\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinMM.dll"; DestDir:
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Drawing.Common.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Management.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Text.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll"; DestDir: "{app}"; Flags: ignoreversion
diff --git a/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss b/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss
index 7b36095..8f843af 100644
--- a/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss
+++ b/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss
@@ -37,7 +37,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
[Files]
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\DesktopMagic\bin\Release\net5.0-windows\AlwaysUpToDate.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\DesktopMagic\bin\Release\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.deps.json"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion
@@ -64,7 +64,6 @@ Source: "..\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinMM.dll"; DestDir:
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Drawing.Common.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Management.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Text.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll"; DestDir: "{app}"; Flags: ignoreversion
diff --git a/src/DesktopMagic/DesktopMagic.csproj b/src/DesktopMagic/DesktopMagic.csproj
index 400c497..71ed275 100644
--- a/src/DesktopMagic/DesktopMagic.csproj
+++ b/src/DesktopMagic/DesktopMagic.csproj
@@ -15,12 +15,12 @@
-
+
diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index 6c0384d..ae321ff 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -9,6 +9,7 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Text.Json;
+using Stone_Red_Utilities.Logging;
namespace DesktopMagic
{
@@ -45,6 +46,8 @@ namespace DesktopMagic
public const string AppName = "Desktop Magic";
+ public static Logger Logger { get; private set; }
+
public static List Windows { get; protected set; } = new List();
public static List WindowNames { get; protected set; } = new List();
private readonly RegistryKey key;
@@ -59,6 +62,7 @@ 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);
Stream iconStream = Application.GetResourceStream(new Uri("pack://application:,,,/DesktopMagic;component/icon.ico")).Stream;
@@ -77,21 +81,20 @@ namespace DesktopMagic
private void Window_Loaded(object sender, RoutedEventArgs e)
{
+ Logger.ClearLogFile();
+ Logger.Log("Create ApplicationData Folder", "Main");
if (!Directory.Exists(applicationDataPath))
{
_ = Directory.CreateDirectory(applicationDataPath);
}
- File.Create(logFilePath).Close();
- File.WriteAllText(logFilePath, "");
- File.AppendAllText(logFilePath, "\nCreate ApplicationData Folder");
-
- File.AppendAllText(logFilePath, "\nCreate Plugins Folder");
+ Logger.Log("Create Plugins Folder", "Main");
if (!Directory.Exists(applicationDataPath + "\\Plugins"))
{
_ = Directory.CreateDirectory(applicationDataPath + "\\Plugins");
}
- File.AppendAllText(logFilePath, "\nCreate layouts.save");
+
+ Logger.Log("Create layouts.save file", "Main");
if (!File.Exists(applicationDataPath + "\\layouts.save"))
{
File.WriteAllText(applicationDataPath + "\\layouts.save", ";" + (string)FindResource("default"));
@@ -100,14 +103,16 @@ namespace DesktopMagic
_ = optionsComboBox.Items.Add(new Tuple((string)FindResource("musicVisualizer"), 0));
//Write To Log File and Load Elements
- File.AppendAllText(logFilePath, "\nLoading Plugin names");
+
+ Logger.Log("Loading Plugin names", "Main");
LoadPlugins();
- File.AppendAllText(logFilePath, "\nLoading Layout names");
+ Logger.Log("Loading Layout names", "Main");
LoadLayoutNames();
- File.AppendAllText(logFilePath, "\nLoading Layout");
+ Logger.Log("Loading Layout", "Main");
LoadLayout();
- File.AppendAllText(logFilePath, "\nWindow Loaded");
+
loaded = true;
+ Logger.Log("Window Loaded", "Main");
}
private void LoadPlugins()
@@ -227,6 +232,11 @@ namespace DesktopMagic
pluginWindow.PluginLoaded -= onPluginLoaded;
});
};
+ pluginWindow.OnExit += () =>
+ {
+ checkBox.IsChecked = false;
+ CheckBox_Click(checkBox, null);
+ };
pluginWindow.PluginLoaded += onPluginLoaded;
}
else if (window is MusicVisualizerWindow musicVisualizerWindow)
@@ -245,6 +255,7 @@ namespace DesktopMagic
else
{
int index = WindowNames.IndexOf(window.Title);
+
Windows[index].Close();
Windows.RemoveAt(index);
WindowNames.RemoveAt(index);
@@ -833,14 +844,14 @@ namespace DesktopMagic
}
catch (Exception ex)
{
- File.AppendAllText(logFilePath, "\n" + ex);
+ Logger.Log(ex.ToString(), "Main");
MessageBox.Show(ex.ToString());
}
}
}
catch (Exception ex)
{
- File.AppendAllText(logFilePath, "\n" + ex);
+ Logger.Log(ex.ToString(), "Main");
_ = MessageBox.Show(ex.ToString());
}
diff --git a/src/DesktopMagic/Plugin/PluginWindow.xaml.cs b/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
index 78ea236..5c4820a 100644
--- a/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
+++ b/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
@@ -34,6 +34,8 @@ namespace DesktopMagic
public event Action PluginLoaded;
+ public event Action OnExit;
+
public PluginWindow(string pluginName)
{
InitializeComponent();
@@ -95,7 +97,7 @@ namespace DesktopMagic
{
panel.Visibility = Visibility.Visible;
new WindowPos().SetIsLocked(this, false);
- tileBar.CaptionHeight = this.ActualHeight - 10;
+ tileBar.CaptionHeight = tileBar.CaptionHeight = this.ActualHeight - 10 < 0 ? 0 : this.ActualHeight - 10;
this.ResizeMode = ResizeMode.CanResize;
}
else
@@ -126,6 +128,7 @@ namespace DesktopMagic
else
{
MessageBox.Show("File does not exist!", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Exit();
return;
}
@@ -133,9 +136,11 @@ namespace DesktopMagic
{
sourceText = File.ReadAllText(PluginPath);
}
- catch (Exception e)
+ catch (Exception ex)
{
- MessageBox.Show("File could not be read:\n" + e.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ MainWindow.Logger.Log(ex.ToString(), "Plugin");
+ MessageBox.Show("File could not be read:\n" + ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Exit();
return;
}
@@ -143,9 +148,11 @@ namespace DesktopMagic
{
ExecuteSource(sourceText);
}
- catch (Exception e)
+ catch (Exception ex)
{
- MessageBox.Show("File execution error:\n" + e, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ MainWindow.Logger.Log(ex.ToString(), "Plugin");
+ MessageBox.Show("File execution error:\n" + ex, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Exit();
return;
}
PluginLoaded?.Invoke();
@@ -160,6 +167,7 @@ namespace DesktopMagic
if (instanceType is null)
{
MessageBox.Show($"The \"PluginScript\" class could not be found!", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Exit();
return;
}
@@ -172,12 +180,14 @@ namespace DesktopMagic
else
{
MessageBox.Show($"The \"PluginScript\" class has to inherit from \"{nameof(DesktopMagicPluginAPI)}.{nameof(Plugin)}\"", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Exit();
return;
}
if (instanceType.Namespace == nameof(DesktopMagic))
{
MessageBox.Show("NO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Exit();
return;
}
@@ -266,6 +276,14 @@ namespace DesktopMagic
return bitmapSource;
}
+ private void Exit()
+ {
+ Dispatcher.Invoke(() =>
+ {
+ OnExit?.Invoke();
+ });
+ }
+
#region Window Events
private void Window_LocationChanged(object sender, EventArgs e)
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/AlwaysUpToDate.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/AlwaysUpToDate.dll
deleted file mode 100644
index be7e92b..0000000
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/AlwaysUpToDate.dll and /dev/null differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.deps.json b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.deps.json
index b8f0a6a..d239f46 100644
--- a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.deps.json
+++ b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.deps.json
@@ -8,30 +8,19 @@
".NETCoreApp,Version=v5.0": {
"DesktopMagic/1.0.0": {
"dependencies": {
- "AlwaysUpToDate": "1.0.0.2",
"DesktopMagicPluginAPI": "0.0.0.1",
"Extended.Wpf.Toolkit": "4.1.0",
"Google.Apis.Calendar.v3": "1.51.0.2312",
"Hardcodet.NotifyIcon.Wpf": "1.1.0",
"MaterialDesignThemes": "4.0.0",
"NAudio": "2.0.0",
+ "Stone_Red-C-Sharp-Utilities": "1.0.2.1",
"System.Management": "5.0.0"
},
"runtime": {
"DesktopMagic.dll": {}
}
},
- "AlwaysUpToDate/1.0.0.2": {
- "dependencies": {
- "System.Text.Json": "5.0.2"
- },
- "runtime": {
- "lib/netstandard2.1/AlwaysUpToDate.dll": {
- "assemblyVersion": "1.0.0.2",
- "fileVersion": "1.0.0.2"
- }
- }
- },
"Extended.Wpf.Toolkit/4.1.0": {
"runtime": {
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll": {
@@ -272,6 +261,14 @@
}
}
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "runtime": {
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.dll": {
+ "assemblyVersion": "1.0.2.1",
+ "fileVersion": "1.0.2.1"
+ }
+ }
+ },
"System.CodeDom/5.0.0": {},
"System.Drawing.Common/5.0.2": {
"dependencies": {
@@ -326,14 +323,6 @@
}
},
"System.Security.Principal.Windows/5.0.0": {},
- "System.Text.Json/5.0.2": {
- "runtime": {
- "lib/netcoreapp3.0/System.Text.Json.dll": {
- "assemblyVersion": "5.0.0.0",
- "fileVersion": "5.0.521.16609"
- }
- }
- },
"DesktopMagicPluginAPI/0.0.0.1": {
"dependencies": {
"System.Drawing.Common": "5.0.2"
@@ -350,13 +339,6 @@
"serviceable": false,
"sha512": ""
},
- "AlwaysUpToDate/1.0.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-LUr8adUXFo86T3Ta2+U3YWVcn9bmjOCK/0QAPf2GvWLm0fLAfvsVzmZLZXVS5B01t88HAT0Ew2DH6b6M24UWzA==",
- "path": "alwaysuptodate/1.0.0.2",
- "hashPath": "alwaysuptodate.1.0.0.2.nupkg.sha512"
- },
"Extended.Wpf.Toolkit/4.1.0": {
"type": "package",
"serviceable": true,
@@ -490,6 +472,13 @@
"path": "newtonsoft.json/12.0.3",
"hashPath": "newtonsoft.json.12.0.3.nupkg.sha512"
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-QzwH0QvsDiBvCJTFroZBhN/pMEIiz0C8TNkQci+pxCbnjfTtVkxAYsgmlshCl5oHFJh7VYDLcGAULcMBARSb+w==",
+ "path": "stone_red-c-sharp-utilities/1.0.2.1",
+ "hashPath": "stone_red-c-sharp-utilities.1.0.2.1.nupkg.sha512"
+ },
"System.CodeDom/5.0.0": {
"type": "package",
"serviceable": true,
@@ -525,13 +514,6 @@
"path": "system.security.principal.windows/5.0.0",
"hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512"
},
- "System.Text.Json/5.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
- "path": "system.text.json/5.0.2",
- "hashPath": "system.text.json.5.0.2.nupkg.sha512"
- },
"DesktopMagicPluginAPI/0.0.0.1": {
"type": "project",
"serviceable": false,
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll
index 42738d4..a962ab1 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb
index b82cd41..3438da9 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll
index bad0bb0..a76490f 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb
index c0c68d2..aa2145f 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/System.Text.Json.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/System.Text.Json.dll
deleted file mode 100644
index e52b914..0000000
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/System.Text.Json.dll and /dev/null differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll
index 2275bd9..a8808e2 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/AlwaysUpToDate.dll b/src/DesktopMagic/bin/Release/net5.0-windows/AlwaysUpToDate.dll
deleted file mode 100644
index be7e92b..0000000
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/AlwaysUpToDate.dll and /dev/null differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json
index b8f0a6a..d239f46 100644
--- a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json
+++ b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.deps.json
@@ -8,30 +8,19 @@
".NETCoreApp,Version=v5.0": {
"DesktopMagic/1.0.0": {
"dependencies": {
- "AlwaysUpToDate": "1.0.0.2",
"DesktopMagicPluginAPI": "0.0.0.1",
"Extended.Wpf.Toolkit": "4.1.0",
"Google.Apis.Calendar.v3": "1.51.0.2312",
"Hardcodet.NotifyIcon.Wpf": "1.1.0",
"MaterialDesignThemes": "4.0.0",
"NAudio": "2.0.0",
+ "Stone_Red-C-Sharp-Utilities": "1.0.2.1",
"System.Management": "5.0.0"
},
"runtime": {
"DesktopMagic.dll": {}
}
},
- "AlwaysUpToDate/1.0.0.2": {
- "dependencies": {
- "System.Text.Json": "5.0.2"
- },
- "runtime": {
- "lib/netstandard2.1/AlwaysUpToDate.dll": {
- "assemblyVersion": "1.0.0.2",
- "fileVersion": "1.0.0.2"
- }
- }
- },
"Extended.Wpf.Toolkit/4.1.0": {
"runtime": {
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll": {
@@ -272,6 +261,14 @@
}
}
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "runtime": {
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.dll": {
+ "assemblyVersion": "1.0.2.1",
+ "fileVersion": "1.0.2.1"
+ }
+ }
+ },
"System.CodeDom/5.0.0": {},
"System.Drawing.Common/5.0.2": {
"dependencies": {
@@ -326,14 +323,6 @@
}
},
"System.Security.Principal.Windows/5.0.0": {},
- "System.Text.Json/5.0.2": {
- "runtime": {
- "lib/netcoreapp3.0/System.Text.Json.dll": {
- "assemblyVersion": "5.0.0.0",
- "fileVersion": "5.0.521.16609"
- }
- }
- },
"DesktopMagicPluginAPI/0.0.0.1": {
"dependencies": {
"System.Drawing.Common": "5.0.2"
@@ -350,13 +339,6 @@
"serviceable": false,
"sha512": ""
},
- "AlwaysUpToDate/1.0.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-LUr8adUXFo86T3Ta2+U3YWVcn9bmjOCK/0QAPf2GvWLm0fLAfvsVzmZLZXVS5B01t88HAT0Ew2DH6b6M24UWzA==",
- "path": "alwaysuptodate/1.0.0.2",
- "hashPath": "alwaysuptodate.1.0.0.2.nupkg.sha512"
- },
"Extended.Wpf.Toolkit/4.1.0": {
"type": "package",
"serviceable": true,
@@ -490,6 +472,13 @@
"path": "newtonsoft.json/12.0.3",
"hashPath": "newtonsoft.json.12.0.3.nupkg.sha512"
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-QzwH0QvsDiBvCJTFroZBhN/pMEIiz0C8TNkQci+pxCbnjfTtVkxAYsgmlshCl5oHFJh7VYDLcGAULcMBARSb+w==",
+ "path": "stone_red-c-sharp-utilities/1.0.2.1",
+ "hashPath": "stone_red-c-sharp-utilities.1.0.2.1.nupkg.sha512"
+ },
"System.CodeDom/5.0.0": {
"type": "package",
"serviceable": true,
@@ -525,13 +514,6 @@
"path": "system.security.principal.windows/5.0.0",
"hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512"
},
- "System.Text.Json/5.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
- "path": "system.text.json/5.0.2",
- "hashPath": "system.text.json.5.0.2.nupkg.sha512"
- },
"DesktopMagicPluginAPI/0.0.0.1": {
"type": "project",
"serviceable": false,
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll
index 816018e..3e90cbf 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 b2b3d9f..eda93d8 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/bin/Release/net5.0-windows/System.Text.Json.dll b/src/DesktopMagic/bin/Release/net5.0-windows/System.Text.Json.dll
deleted file mode 100644
index e52b914..0000000
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/System.Text.Json.dll and /dev/null differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll
index 3c00d9c..ac766fc 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.assets.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.assets.cache
index 262c8cd..13dc197 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.assets.cache and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.assets.cache differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache
index 0319740..1b96f43 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8eedf8c25f9a39bf97651ddfe548d68907cae4c8
+82202d5e43edd6abdb9836ebc428b7da1496c4ef
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt
index be6e997..1feff79 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt
@@ -169,7 +169,6 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-wind
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagic.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\ref\DesktopMagic.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagic.pdb
-C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\AlwaysUpToDate.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
@@ -193,7 +192,6 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-wind
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Newtonsoft.Json.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\System.Drawing.Common.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\System.Management.dll
-C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\System.Text.Json.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\cs-CZ\Xceed.Wpf.AvalonDock.resources.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\de\Xceed.Wpf.AvalonDock.resources.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\es\Xceed.Wpf.AvalonDock.resources.dll
@@ -244,3 +242,4 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-wind
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\ref\DesktopMagic.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.pdb
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.genruntimeconfig.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.deps.json b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.deps.json
index ee2890c..c0e1537 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.deps.json
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.deps.json
@@ -6,17 +6,6 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v5.0": {
- "AlwaysUpToDate/1.0.0.2": {
- "dependencies": {
- "System.Text.Json": "5.0.2"
- },
- "runtime": {
- "lib/netstandard2.1/AlwaysUpToDate.dll": {
- "assemblyVersion": "1.0.0.2",
- "fileVersion": "1.0.0.2"
- }
- }
- },
"Extended.Wpf.Toolkit/4.1.0": {
"runtime": {
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll": {
@@ -285,6 +274,14 @@
}
}
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "runtime": {
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.dll": {
+ "assemblyVersion": "1.0.2.1",
+ "fileVersion": "1.0.2.1"
+ }
+ }
+ },
"System.CodeDom/5.0.0": {
"runtime": {
"lib/netstandard2.0/System.CodeDom.dll": {
@@ -380,25 +377,10 @@
"fileVersion": "5.0.20.51904"
}
}
- },
- "System.Text.Json/5.0.2": {
- "runtime": {
- "lib/netcoreapp3.0/System.Text.Json.dll": {
- "assemblyVersion": "5.0.0.0",
- "fileVersion": "5.0.521.16609"
- }
- }
}
}
},
"libraries": {
- "AlwaysUpToDate/1.0.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-LUr8adUXFo86T3Ta2+U3YWVcn9bmjOCK/0QAPf2GvWLm0fLAfvsVzmZLZXVS5B01t88HAT0Ew2DH6b6M24UWzA==",
- "path": "alwaysuptodate/1.0.0.2",
- "hashPath": "alwaysuptodate.1.0.0.2.nupkg.sha512"
- },
"Extended.Wpf.Toolkit/4.1.0": {
"type": "package",
"serviceable": true,
@@ -532,6 +514,13 @@
"path": "newtonsoft.json/12.0.3",
"hashPath": "newtonsoft.json.12.0.3.nupkg.sha512"
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-QzwH0QvsDiBvCJTFroZBhN/pMEIiz0C8TNkQci+pxCbnjfTtVkxAYsgmlshCl5oHFJh7VYDLcGAULcMBARSb+w==",
+ "path": "stone_red-c-sharp-utilities/1.0.2.1",
+ "hashPath": "stone_red-c-sharp-utilities.1.0.2.1.nupkg.sha512"
+ },
"System.CodeDom/5.0.0": {
"type": "package",
"serviceable": true,
@@ -566,13 +555,6 @@
"sha512": "sha512-t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==",
"path": "system.security.principal.windows/5.0.0",
"hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512"
- },
- "System.Text.Json/5.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
- "path": "system.text.json/5.0.2",
- "hashPath": "system.text.json.5.0.2.nupkg.sha512"
}
}
}
\ No newline at end of file
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll
index 42738d4..a962ab1 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources
index 6f533db..a6f57f6 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb
index b82cd41..3438da9 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
index 9d7c4e9..213f0e6 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
@@ -13,8 +13,8 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
10-291818503
17-911440499
-2261183705467
+226605658444
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/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
index a92993a..55632ed 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
@@ -13,8 +13,8 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
10-291818503
19-52940400
-2261183705467
+226605658444
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/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.cs
index 5fc60ec..59e385b 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "69003CAB3985612DB9AB987164994394DEC44BA3"
+#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E92EE63B86C66ACB37E5EDABBB5EC243DBD1F651"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -43,37 +43,37 @@ namespace DesktopMagic {
public partial class InputDialog : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 11 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button okButton;
-
- #line default
- #line hidden
-
-
#line 12 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button cancelButton;
-
- #line default
- #line hidden
-
-
- #line 13 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label label;
#line default
#line hidden
- #line 14 "..\..\..\InputDialog.xaml"
+ #line 13 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox textBox;
#line default
#line hidden
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button okButton;
+
+ #line default
+ #line hidden
+
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button cancelButton;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
///
@@ -105,29 +105,29 @@ namespace DesktopMagic {
switch (connectionId)
{
case 1:
- this.okButton = ((System.Windows.Controls.Button)(target));
-
- #line 11 "..\..\..\InputDialog.xaml"
- this.okButton.Click += new System.Windows.RoutedEventHandler(this.okButton_Click);
-
- #line default
- #line hidden
- return;
- case 2:
- this.cancelButton = ((System.Windows.Controls.Button)(target));
-
- #line 12 "..\..\..\InputDialog.xaml"
- this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.cancelButton_Click);
-
- #line default
- #line hidden
- return;
- case 3:
this.label = ((System.Windows.Controls.Label)(target));
return;
- case 4:
+ case 2:
this.textBox = ((System.Windows.Controls.TextBox)(target));
return;
+ case 3:
+ this.okButton = ((System.Windows.Controls.Button)(target));
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ this.okButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 4:
+ this.cancelButton = ((System.Windows.Controls.Button)(target));
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
+
+ #line default
+ #line hidden
+ return;
}
this._contentLoaded = true;
}
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs
index 5fc60ec..59e385b 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "69003CAB3985612DB9AB987164994394DEC44BA3"
+#pragma checksum "..\..\..\InputDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E92EE63B86C66ACB37E5EDABBB5EC243DBD1F651"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -43,37 +43,37 @@ namespace DesktopMagic {
public partial class InputDialog : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 11 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button okButton;
-
- #line default
- #line hidden
-
-
#line 12 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button cancelButton;
-
- #line default
- #line hidden
-
-
- #line 13 "..\..\..\InputDialog.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label label;
#line default
#line hidden
- #line 14 "..\..\..\InputDialog.xaml"
+ #line 13 "..\..\..\InputDialog.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox textBox;
#line default
#line hidden
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button okButton;
+
+ #line default
+ #line hidden
+
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.Button cancelButton;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
///
@@ -105,29 +105,29 @@ namespace DesktopMagic {
switch (connectionId)
{
case 1:
- this.okButton = ((System.Windows.Controls.Button)(target));
-
- #line 11 "..\..\..\InputDialog.xaml"
- this.okButton.Click += new System.Windows.RoutedEventHandler(this.okButton_Click);
-
- #line default
- #line hidden
- return;
- case 2:
- this.cancelButton = ((System.Windows.Controls.Button)(target));
-
- #line 12 "..\..\..\InputDialog.xaml"
- this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.cancelButton_Click);
-
- #line default
- #line hidden
- return;
- case 3:
this.label = ((System.Windows.Controls.Label)(target));
return;
- case 4:
+ case 2:
this.textBox = ((System.Windows.Controls.TextBox)(target));
return;
+ case 3:
+ this.okButton = ((System.Windows.Controls.Button)(target));
+
+ #line 15 "..\..\..\InputDialog.xaml"
+ this.okButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
+
+ #line default
+ #line hidden
+ return;
+ case 4:
+ this.cancelButton = ((System.Windows.Controls.Button)(target));
+
+ #line 16 "..\..\..\InputDialog.xaml"
+ this.cancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
+
+ #line default
+ #line hidden
+ return;
}
this._contentLoaded = true;
}
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml
index 71b1354..a3ad2b5 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml and b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
index 86ab47e..b080a69 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F5EB8084736888948EF9EB2517B77A7CB9FE6BDF"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -45,7 +45,7 @@ namespace DesktopMagic {
public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 18 "..\..\..\MainWindow.xaml"
+ #line 19 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid grid;
@@ -320,13 +320,13 @@ namespace DesktopMagic {
#line default
#line hidden
- #line 15 "..\..\..\MainWindow.xaml"
+ #line 16 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).StateChanged += new System.EventHandler(this.Window_StateChanged);
#line default
#line hidden
- #line 16 "..\..\..\MainWindow.xaml"
+ #line 17 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
#line default
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs
index 649bf7d..134ea47 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "56A04FC33DFC60D7E526BF21765D414E7492102A"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
@@ -45,7 +45,7 @@ namespace DesktopMagic {
public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
- #line 18 "..\..\..\MainWindow.xaml"
+ #line 19 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid grid;
@@ -320,13 +320,13 @@ namespace DesktopMagic {
#line default
#line hidden
- #line 15 "..\..\..\MainWindow.xaml"
+ #line 16 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).StateChanged += new System.EventHandler(this.Window_StateChanged);
#line default
#line hidden
- #line 16 "..\..\..\MainWindow.xaml"
+ #line 17 "..\..\..\MainWindow.xaml"
((DesktopMagic.MainWindow)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
#line default
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.de.baml b/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.de.baml
index e940814..db458f9 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.de.baml and b/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.de.baml differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.en.baml b/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.en.baml
index 27f200b..b055c32 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.en.baml and b/src/DesktopMagic/obj/Debug/net5.0-windows/Resources/StringResources.en.baml differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll
index 2275bd9..a8808e2 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json b/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json
index caf918a..7cac550 100644
--- a/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json
+++ b/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json
@@ -114,10 +114,6 @@
"net5.0-windows7.0": {
"targetAlias": "net5.0-windows",
"dependencies": {
- "AlwaysUpToDate": {
- "target": "Package",
- "version": "[1.0.0.2, )"
- },
"Extended.Wpf.Toolkit": {
"target": "Package",
"version": "[4.1.0, )"
@@ -138,6 +134,10 @@
"target": "Package",
"version": "[2.0.0, )"
},
+ "Stone_Red-C-Sharp-Utilities": {
+ "target": "Package",
+ "version": "[1.0.2.1, )"
+ },
"System.Management": {
"target": "Package",
"version": "[5.0.0, )"
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs
index fd5b878..8ede292 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/App.g.i.cs
@@ -62,7 +62,7 @@ namespace DesktopMagic {
#line default
#line hidden
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/app.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs
index 310883d..0ca7078 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/CalendarWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/calendarwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/calendarwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\CalendarWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs
index 7c8b9c0..9c3f7a3 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/CpuUsageWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/cpuusagewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/cpuusagewindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\CpuUsageWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs
index 61a4a44..e3b4015 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DateWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/datewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/datewindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\DateWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.assets.cache b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.assets.cache
index c931556..5d9d656 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.assets.cache and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.assets.cache differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache
index 0dad2e2..90c5d7f 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-dbe8cd736ddd3847699768ddcd597bd713e26b29
+0f31da3217b0c77181b3efa0401e122243672ba5
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt
index 1a6b930..b39b2bd 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.csproj.FileListAbsolute.txt
@@ -162,7 +162,6 @@ C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Rele
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\ref\DesktopMagic.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.pdb
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.genruntimeconfig.cache
-C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\AlwaysUpToDate.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
@@ -186,7 +185,6 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-wi
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Newtonsoft.Json.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\System.Drawing.Common.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\System.Management.dll
-C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\System.Text.Json.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\cs-CZ\Xceed.Wpf.AvalonDock.resources.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\de\Xceed.Wpf.AvalonDock.resources.dll
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\es\Xceed.Wpf.AvalonDock.resources.dll
@@ -244,3 +242,4 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-wi
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.pdb
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.csproj.CopyComplete
C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.genruntimeconfig.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.deps.json b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.deps.json
index ee2890c..c0e1537 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.deps.json
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.deps.json
@@ -6,17 +6,6 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v5.0": {
- "AlwaysUpToDate/1.0.0.2": {
- "dependencies": {
- "System.Text.Json": "5.0.2"
- },
- "runtime": {
- "lib/netstandard2.1/AlwaysUpToDate.dll": {
- "assemblyVersion": "1.0.0.2",
- "fileVersion": "1.0.0.2"
- }
- }
- },
"Extended.Wpf.Toolkit/4.1.0": {
"runtime": {
"lib/net40/Xceed.Wpf.AvalonDock.Themes.Aero.dll": {
@@ -285,6 +274,14 @@
}
}
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "runtime": {
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.dll": {
+ "assemblyVersion": "1.0.2.1",
+ "fileVersion": "1.0.2.1"
+ }
+ }
+ },
"System.CodeDom/5.0.0": {
"runtime": {
"lib/netstandard2.0/System.CodeDom.dll": {
@@ -380,25 +377,10 @@
"fileVersion": "5.0.20.51904"
}
}
- },
- "System.Text.Json/5.0.2": {
- "runtime": {
- "lib/netcoreapp3.0/System.Text.Json.dll": {
- "assemblyVersion": "5.0.0.0",
- "fileVersion": "5.0.521.16609"
- }
- }
}
}
},
"libraries": {
- "AlwaysUpToDate/1.0.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-LUr8adUXFo86T3Ta2+U3YWVcn9bmjOCK/0QAPf2GvWLm0fLAfvsVzmZLZXVS5B01t88HAT0Ew2DH6b6M24UWzA==",
- "path": "alwaysuptodate/1.0.0.2",
- "hashPath": "alwaysuptodate.1.0.0.2.nupkg.sha512"
- },
"Extended.Wpf.Toolkit/4.1.0": {
"type": "package",
"serviceable": true,
@@ -532,6 +514,13 @@
"path": "newtonsoft.json/12.0.3",
"hashPath": "newtonsoft.json.12.0.3.nupkg.sha512"
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-QzwH0QvsDiBvCJTFroZBhN/pMEIiz0C8TNkQci+pxCbnjfTtVkxAYsgmlshCl5oHFJh7VYDLcGAULcMBARSb+w==",
+ "path": "stone_red-c-sharp-utilities/1.0.2.1",
+ "hashPath": "stone_red-c-sharp-utilities.1.0.2.1.nupkg.sha512"
+ },
"System.CodeDom/5.0.0": {
"type": "package",
"serviceable": true,
@@ -566,13 +555,6 @@
"sha512": "sha512-t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==",
"path": "system.security.principal.windows/5.0.0",
"hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512"
- },
- "System.Text.Json/5.0.2": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
- "path": "system.text.json/5.0.2",
- "hashPath": "system.text.json.5.0.2.nupkg.sha512"
}
}
}
\ No newline at end of file
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll
index 816018e..3e90cbf 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 b2b3d9f..eda93d8 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.cache b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.cache
index e4a1fff..fbf9f6c 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.cache
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.cache
@@ -13,7 +13,7 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
10-291818503
17-911440499
-226-1364174901
+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;
False
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 7a37683..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
@@ -13,8 +13,8 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
10-291818503
19-940449018
-226-1364174901
+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/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs
index 0bd4e8e..e1680aa 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/MusicVisualizerWindow.g.i.cs
@@ -93,7 +93,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/musicvisualizerwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/musicvisualizerwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\MusicVisualizerWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs
index 28ffa14..6abe00b 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/TimeWindow.g.i.cs
@@ -85,7 +85,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/timewindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/timewindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\TimeWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll
index 3c00d9c..ac766fc 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/project.assets.json b/src/DesktopMagic/obj/project.assets.json
index 1914bff..04d66cb 100644
--- a/src/DesktopMagic/obj/project.assets.json
+++ b/src/DesktopMagic/obj/project.assets.json
@@ -2,18 +2,6 @@
"version": 3,
"targets": {
"net5.0-windows7.0": {
- "AlwaysUpToDate/1.0.0.2": {
- "type": "package",
- "dependencies": {
- "System.Text.Json": "5.0.2"
- },
- "compile": {
- "lib/netstandard2.1/AlwaysUpToDate.dll": {}
- },
- "runtime": {
- "lib/netstandard2.1/AlwaysUpToDate.dll": {}
- }
- },
"Extended.Wpf.Toolkit/4.1.0": {
"type": "package",
"compile": {
@@ -303,6 +291,15 @@
"lib/netstandard2.0/Newtonsoft.Json.dll": {}
}
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "type": "package",
+ "compile": {
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.dll": {}
+ },
+ "runtime": {
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.dll": {}
+ }
+ },
"System.CodeDom/5.0.0": {
"type": "package",
"compile": {
@@ -392,15 +389,6 @@
}
}
},
- "System.Text.Json/5.0.2": {
- "type": "package",
- "compile": {
- "lib/netcoreapp3.0/System.Text.Json.dll": {}
- },
- "runtime": {
- "lib/netcoreapp3.0/System.Text.Json.dll": {}
- }
- },
"DesktopMagicPluginAPI/0.0.0.1": {
"type": "project",
"framework": ".NETCoreApp,Version=v5.0",
@@ -417,19 +405,6 @@
}
},
"libraries": {
- "AlwaysUpToDate/1.0.0.2": {
- "sha512": "LUr8adUXFo86T3Ta2+U3YWVcn9bmjOCK/0QAPf2GvWLm0fLAfvsVzmZLZXVS5B01t88HAT0Ew2DH6b6M24UWzA==",
- "type": "package",
- "path": "alwaysuptodate/1.0.0.2",
- "files": [
- ".nupkg.metadata",
- ".signature.p7s",
- "LICENSE",
- "alwaysuptodate.1.0.0.2.nupkg.sha512",
- "alwaysuptodate.nuspec",
- "lib/netstandard2.1/AlwaysUpToDate.dll"
- ]
- },
"Extended.Wpf.Toolkit/4.1.0": {
"sha512": "wXyuHE2ut8OIDUgi1dfyX1qVDQClc4ARmM9yfB0MAshudfaWhtXedWR34zSCIN2gu7CPzE3+u9iLvBv5uBxROg==",
"type": "package",
@@ -855,6 +830,20 @@
"packageIcon.png"
]
},
+ "Stone_Red-C-Sharp-Utilities/1.0.2.1": {
+ "sha512": "QzwH0QvsDiBvCJTFroZBhN/pMEIiz0C8TNkQci+pxCbnjfTtVkxAYsgmlshCl5oHFJh7VYDLcGAULcMBARSb+w==",
+ "type": "package",
+ "path": "stone_red-c-sharp-utilities/1.0.2.1",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "LICENSE",
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.dll",
+ "lib/netstandard2.1/Stone_Red-C-Sharp-Utilities.xml",
+ "stone_red-c-sharp-utilities.1.0.2.1.nupkg.sha512",
+ "stone_red-c-sharp-utilities.nuspec"
+ ]
+ },
"System.CodeDom/5.0.0": {
"sha512": "JPJArwA1kdj8qDAkY2XGjSWoYnqiM7q/3yRNkt6n28Mnn95MuEGkZXUbPBf7qc3IjwrGY5ttQon7yqHZyQJmOQ==",
"type": "package",
@@ -1048,28 +1037,6 @@
"version.txt"
]
},
- "System.Text.Json/5.0.2": {
- "sha512": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
- "type": "package",
- "path": "system.text.json/5.0.2",
- "files": [
- ".nupkg.metadata",
- ".signature.p7s",
- "Icon.png",
- "LICENSE.TXT",
- "THIRD-PARTY-NOTICES.TXT",
- "lib/net461/System.Text.Json.dll",
- "lib/net461/System.Text.Json.xml",
- "lib/netcoreapp3.0/System.Text.Json.dll",
- "lib/netcoreapp3.0/System.Text.Json.xml",
- "lib/netstandard2.0/System.Text.Json.dll",
- "lib/netstandard2.0/System.Text.Json.xml",
- "system.text.json.5.0.2.nupkg.sha512",
- "system.text.json.nuspec",
- "useSharedDesignerContext.txt",
- "version.txt"
- ]
- },
"DesktopMagicPluginAPI/0.0.0.1": {
"type": "project",
"path": "../DesktopMagicPluginAPI/DesktopMagicPluginAPI.csproj",
@@ -1078,13 +1045,13 @@
},
"projectFileDependencyGroups": {
"net5.0-windows7.0": [
- "AlwaysUpToDate >= 1.0.0.2",
"DesktopMagicPluginAPI >= 0.0.0.1",
"Extended.Wpf.Toolkit >= 4.1.0",
"Google.Apis.Calendar.v3 >= 1.51.0.2312",
"Hardcodet.NotifyIcon.Wpf >= 1.1.0",
"MaterialDesignThemes >= 4.0.0",
"NAudio >= 2.0.0",
+ "Stone_Red-C-Sharp-Utilities >= 1.0.2.1",
"System.Management >= 5.0.0"
]
},
@@ -1137,10 +1104,6 @@
"net5.0-windows7.0": {
"targetAlias": "net5.0-windows",
"dependencies": {
- "AlwaysUpToDate": {
- "target": "Package",
- "version": "[1.0.0.2, )"
- },
"Extended.Wpf.Toolkit": {
"target": "Package",
"version": "[4.1.0, )"
@@ -1161,6 +1124,10 @@
"target": "Package",
"version": "[2.0.0, )"
},
+ "Stone_Red-C-Sharp-Utilities": {
+ "target": "Package",
+ "version": "[1.0.2.1, )"
+ },
"System.Management": {
"target": "Package",
"version": "[5.0.0, )"
diff --git a/src/DesktopMagic/obj/project.nuget.cache b/src/DesktopMagic/obj/project.nuget.cache
index a86fd62..8077eb3 100644
--- a/src/DesktopMagic/obj/project.nuget.cache
+++ b/src/DesktopMagic/obj/project.nuget.cache
@@ -1,10 +1,9 @@
{
"version": 2,
- "dgSpecHash": "iO1J8G7zPvBH5piB9vrLjZFUdqKDO2srDSAqkIfbx66tUrR5z+jECTqkPX0cYsO47B833HpbduDM90H+WxtyCw==",
+ "dgSpecHash": "eglOm5hQkLPcbQslPEHPEhcA3sB/Rx127kpEvCEGGE7DQ5ehT+cxxG+3zmA9fZsPrdn/XW0EE5qoXpPs+dxO8A==",
"success": true,
"projectFilePath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
"expectedPackageFiles": [
- "C:\\Users\\David\\.nuget\\packages\\alwaysuptodate\\1.0.0.2\\alwaysuptodate.1.0.0.2.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\extended.wpf.toolkit\\4.1.0\\extended.wpf.toolkit.4.1.0.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\google.apis\\1.51.0\\google.apis.1.51.0.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\google.apis.auth\\1.51.0\\google.apis.auth.1.51.0.nupkg.sha512",
@@ -24,12 +23,12 @@
"C:\\Users\\David\\.nuget\\packages\\naudio.winforms\\2.0.0\\naudio.winforms.2.0.0.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\naudio.winmm\\2.0.0\\naudio.winmm.2.0.0.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512",
+ "C:\\Users\\David\\.nuget\\packages\\stone_red-c-sharp-utilities\\1.0.2.1\\stone_red-c-sharp-utilities.1.0.2.1.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\system.codedom\\5.0.0\\system.codedom.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\\system.management\\5.0.0\\system.management.5.0.0.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512",
- "C:\\Users\\David\\.nuget\\packages\\system.text.json\\5.0.2\\system.text.json.5.0.2.nupkg.sha512",
"C:\\Users\\David\\.nuget\\packages\\desktopmagicpluginapi\\0.0.0.1\\desktopmagicpluginapi.0.0.0.1.nupkg.sha512"
],
"logs": [
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll
index bad0bb0..a76490f 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb
index c0c68d2..aa2145f 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll
index 48d15a8..5fd30e6 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll
index bad0bb0..a76490f 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb
index c0c68d2..aa2145f 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll
index 48d15a8..5fd30e6 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll differ