diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 0000000..b4d0cde
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,4 @@
+[*.{cs,vb}]
+
+# IDE0003: Qualifizierung entfernen
+dotnet_diagnostic.IDE0003.severity = silent
diff --git a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2
index c894c51..9611e38 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 416d430..5dad535 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 5057f0f..1dd74ce 100644
Binary files a/src/DesktopMagic.Installer/DesktopMagic.exe and b/src/DesktopMagic.Installer/DesktopMagic.exe differ
diff --git a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll
index f7f4eb4..5471822 100644
Binary files a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll and b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll differ
diff --git a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb
index 6dc6939..0aec2df 100644
Binary files a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb and b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.pdb differ
diff --git a/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.dll b/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.dll
index 115cba1..4a3dd7a 100644
Binary files a/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.dll and b/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.dll differ
diff --git a/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.pdb b/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.pdb
index 9c646b4..5384427 100644
Binary files a/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.pdb and b/src/DesktopMagic.Installer/bin/Release/net5.0/DesktopMagic.Installer.pdb differ
diff --git a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.assets.cache b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.assets.cache
index 766454c..02c0c51 100644
Binary files a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.assets.cache and b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.assets.cache differ
diff --git a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt
index 7a734e7..04f8b5c 100644
--- a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt
+++ b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.csproj.FileListAbsolute.txt
@@ -24,3 +24,16 @@ C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installe
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\ref\DesktopMagic.Installer.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Debug\net5.0\Installer.iss
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Debug\net5.0\DesktopMagic.Installer.deps.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Debug\net5.0\DesktopMagic.Installer.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Debug\net5.0\ref\DesktopMagic.Installer.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Debug\net5.0\DesktopMagic.Installer.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.AssemblyInfoInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.AssemblyInfo.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.csproj.CoreCompileInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\ref\DesktopMagic.Installer.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Debug\net5.0\DesktopMagic.Installer.csproj.AssemblyReference.cache
diff --git a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.dll b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.dll
index f7f4eb4..5471822 100644
Binary files a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.dll and b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.dll differ
diff --git a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.pdb b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.pdb
index 6dc6939..0aec2df 100644
Binary files a/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.pdb and b/src/DesktopMagic.Installer/obj/Debug/net5.0/DesktopMagic.Installer.pdb differ
diff --git a/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.dgspec.json b/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.dgspec.json
index 6667cb1..eca518a 100644
--- a/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.dgspec.json
+++ b/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.dgspec.json
@@ -1,33 +1,32 @@
{
"format": 1,
"restore": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj": {}
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj": {}
},
"projects": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj": {
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
"projectName": "DesktopMagic.Installer",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
diff --git a/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.g.props b/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.g.props
index bdd0480..f8a156c 100644
--- a/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.g.props
+++ b/src/DesktopMagic.Installer/obj/DesktopMagic.Installer.csproj.nuget.g.props
@@ -5,14 +5,13 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\
+ C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages
PackageReference
5.10.0
-
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
diff --git a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.assets.cache b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.assets.cache
index fed43ce..09db089 100644
Binary files a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.assets.cache and b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.assets.cache 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 0bce6a4..3939262 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
@@ -24,3 +24,16 @@ C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installe
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\ref\DesktopMagic.Installer.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Release\net5.0\Installer.iss
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Release\net5.0\DesktopMagic.Installer.deps.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Release\net5.0\DesktopMagic.Installer.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Release\net5.0\ref\DesktopMagic.Installer.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\bin\Release\net5.0\DesktopMagic.Installer.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.csproj.AssemblyReference.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.AssemblyInfoInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.AssemblyInfo.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic.Installer\obj\Release\net5.0\DesktopMagic.Installer.csproj.CoreCompileInputs.cache
+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
diff --git a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.dll b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.dll
index 115cba1..4a3dd7a 100644
Binary files a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.dll and b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.dll differ
diff --git a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.pdb b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.pdb
index 9c646b4..5384427 100644
Binary files a/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.pdb and b/src/DesktopMagic.Installer/obj/Release/net5.0/DesktopMagic.Installer.pdb differ
diff --git a/src/DesktopMagic.Installer/obj/project.assets.json b/src/DesktopMagic.Installer/obj/project.assets.json
index 3db7475..91234bb 100644
--- a/src/DesktopMagic.Installer/obj/project.assets.json
+++ b/src/DesktopMagic.Installer/obj/project.assets.json
@@ -9,33 +9,31 @@
},
"packageFolders": {
"C:\\Users\\David\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
"projectName": "DesktopMagic.Installer",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
diff --git a/src/DesktopMagic.Installer/obj/project.nuget.cache b/src/DesktopMagic.Installer/obj/project.nuget.cache
index 284c2ed..9d86fcf 100644
--- a/src/DesktopMagic.Installer/obj/project.nuget.cache
+++ b/src/DesktopMagic.Installer/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "pq9ZmC4v22stlOrLeCGD9k9SoeiqIKfWL0vNGvB5dYSSrBhHDIPf6AArwdR7smvy7uMKrzSIgV0lLpJAFSgKxQ==",
+ "dgSpecHash": "gac8ytMdiziRj0n03oKHBjI2i+esY4gRNcse9GMWAWZFp/kt+79afhl6kQLf3O25+MS7+3vzHpsEr9daSlmiQg==",
"success": true,
- "projectFilePath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
+ "projectFilePath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic.Installer\\DesktopMagic.Installer.csproj",
"expectedPackageFiles": [],
"logs": []
}
\ No newline at end of file
diff --git a/src/DesktopMagic.sln b/src/DesktopMagic.sln
index 47538c7..99227ac 100644
--- a/src/DesktopMagic.sln
+++ b/src/DesktopMagic.sln
@@ -12,7 +12,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopMagicPluginAPI", "De
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopMagicPlugin.Test", "DesktopMagicPlugin.Test\DesktopMagicPlugin.Test.csproj", "{EF8407AB-28AE-4B5E-AC2E-D4C4A575FBC7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopMagic.Installer", "DesktopMagic.Installer\DesktopMagic.Installer.csproj", "{A06BD685-7F92-4799-846B-3EC38345108E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopMagic.Installer", "DesktopMagic.Installer\DesktopMagic.Installer.csproj", "{A06BD685-7F92-4799-846B-3EC38345108E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{10A138D6-41F0-4DBB-BC39-D93467B4D982}"
+ ProjectSection(SolutionItems) = preProject
+ .editorconfig = .editorconfig
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/DesktopMagic/CalendarManagment.cs b/src/DesktopMagic/CalendarManagment.cs
index 5b3bafe..368cedd 100644
--- a/src/DesktopMagic/CalendarManagment.cs
+++ b/src/DesktopMagic/CalendarManagment.cs
@@ -24,6 +24,9 @@ namespace DesktopMagic
List upcomingEventTimes = new List();
UserCredential credential;
Console.WriteLine("1");
+
+ if (!File.Exists("credentials.json"))
+ return (new(), new());
using (var stream =
new FileStream("credentials.json", FileMode.Open, FileAccess.Read))
{
diff --git a/src/DesktopMagic/DesktopMagic.csproj.user b/src/DesktopMagic/DesktopMagic.csproj.user
index 73557f4..71d6b64 100644
--- a/src/DesktopMagic/DesktopMagic.csproj.user
+++ b/src/DesktopMagic/DesktopMagic.csproj.user
@@ -22,7 +22,7 @@
Designer
-
+
Designer
diff --git a/src/DesktopMagic/GlobalSuppressions.cs b/src/DesktopMagic/GlobalSuppressions.cs
new file mode 100644
index 0000000..7ef5263
--- /dev/null
+++ b/src/DesktopMagic/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Performance", "CA1822:Member als statisch markieren", Justification = "", Scope = "member", Target = "~M:DesktopMagic.PluginWindow.LoadOptions(System.Object)")]
diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index 129a577..e0677ca 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
+using System.Text.Json;
namespace DesktopMagic
{
@@ -38,7 +39,7 @@ namespace DesktopMagic
#region Plugins settings
- public static List> OptionsList { get; set; } = new List>();
+ internal static Dictionary> PluginsSettings { get; set; } = new Dictionary>();
#endregion Plugins settings
@@ -82,7 +83,7 @@ namespace DesktopMagic
{
if (!Directory.Exists(applicationDataPath))
{
- Directory.CreateDirectory(applicationDataPath);
+ _ = Directory.CreateDirectory(applicationDataPath);
}
File.Create(logFilePath).Close();
@@ -92,7 +93,7 @@ namespace DesktopMagic
File.AppendAllText(logFilePath, "\nCreate Plugins Folder");
if (!Directory.Exists(applicationDataPath + "\\Plugins"))
{
- Directory.CreateDirectory(applicationDataPath + "\\Plugins");
+ _ = Directory.CreateDirectory(applicationDataPath + "\\Plugins");
}
File.AppendAllText(logFilePath, "\nCreate layouts.save");
if (!File.Exists(applicationDataPath + "\\layouts.save"))
@@ -100,7 +101,7 @@ namespace DesktopMagic
File.WriteAllText(applicationDataPath + "\\layouts.save", ";" + (string)FindResource("default"));
}
- optionsComboBox.Items.Add(new Tuple((string)FindResource("musicVisualizer"), 0));
+ _ = optionsComboBox.Items.Add(new Tuple((string)FindResource("musicVisualizer"), 0));
//Write To Log File and Load Elements
File.AppendAllText(logFilePath, "\nLoading Plugin names");
@@ -119,10 +120,10 @@ namespace DesktopMagic
foreach (string fileName in Directory.GetFiles(PluginsPath, "*.cs"))
{
- string PluginName = fileName[(fileName.LastIndexOf("\\") + 1)..].Replace(fileName[fileName.LastIndexOf(".")..], "");
+ string PluginName = fileName[(fileName.LastIndexOf("\\", StringComparison.InvariantCulture) + 1)..].Replace(fileName[fileName.LastIndexOf(".", StringComparison.InvariantCulture)..], "");
try
{
- Directory.CreateDirectory(PluginsPath + "\\" + PluginName);
+ _ = Directory.CreateDirectory(PluginsPath + "\\" + PluginName);
File.Move(fileName, $"{PluginsPath}\\{PluginName}\\{PluginName}.cs");
}
catch (Exception ex) { Console.WriteLine(ex); }
@@ -130,10 +131,10 @@ namespace DesktopMagic
foreach (string fileName in Directory.GetFiles(PluginsPath, "*.dll"))
{
- string PluginName = fileName[(fileName.LastIndexOf("\\") + 1)..].Replace(fileName[fileName.LastIndexOf(".")..], "");
+ string PluginName = fileName[(fileName.LastIndexOf("\\", StringComparison.InvariantCulture) + 1)..].Replace(fileName[fileName.LastIndexOf(".", StringComparison.InvariantCulture)..], "");
try
{
- Directory.CreateDirectory(PluginsPath + "\\" + PluginName);
+ _ = Directory.CreateDirectory(PluginsPath + "\\" + PluginName);
File.Move(fileName, $"{PluginsPath}\\{PluginName}\\{PluginName}.dll");
}
catch { }
@@ -141,13 +142,13 @@ namespace DesktopMagic
foreach (string directory in Directory.GetDirectories(PluginsPath))
{
- foreach (string fileName in Directory.GetFiles(directory).Where(s => s.EndsWith(".dll") || s.EndsWith(".cs")))
+ foreach (string fileName in Directory.GetFiles(directory).Where(s => s.EndsWith(".dll", StringComparison.InvariantCulture) || s.EndsWith(".cs", StringComparison.InvariantCulture)))
{
string badChars = ",#-<>?!=()*,. ";
- string PluginName = fileName[(fileName.LastIndexOf("\\") + 1)..].Replace(fileName[fileName.LastIndexOf(".")..], "");
+ string PluginName = fileName[(fileName.LastIndexOf("\\", StringComparison.InvariantCulture) + 1)..].Replace(fileName[fileName.LastIndexOf(".", StringComparison.InvariantCulture)..], "");
string clearPluginName = PluginName;
- if (PluginName == directory[(directory.LastIndexOf("\\") + 1)..])
+ if (PluginName == directory[(directory.LastIndexOf("\\", StringComparison.InvariantCulture) + 1)..])
{
foreach (char c in badChars)
{
@@ -174,8 +175,7 @@ namespace DesktopMagic
if (!exsists)
{
- stackPanel.Children.Add(checkBox);
- OptionsList.Add(new Tuple(PluginName, new string[1, 5] { { (string)FindResource("noOptions"), "hed", "", "", "" } }));
+ _ = stackPanel.Children.Add(checkBox);
}
}
}
@@ -222,10 +222,11 @@ namespace DesktopMagic
if (!WindowNames.Contains(window.Title))
{
- Task.Run(() =>
+ _ = Task.Run(() =>
{
Dispatcher.Invoke(() =>
{
+ /*
for (int i = 0; i < OptionsList.Count; i++)
{
if (OptionsList[i].Item1 == checkBox.Content.ToString())
@@ -234,6 +235,12 @@ namespace DesktopMagic
optionsComboBox.Items.Add(new Tuple(checkBox.Content.ToString(), i));
}
}
+ */
+
+ if (!optionsComboBox.Items.Contains(checkBox.Content.ToString()))
+ {
+ _ = optionsComboBox.Items.Add(new Tuple(checkBox.Content.ToString(), 0));
+ }
window.ShowInTaskbar = false;
window.Show();
@@ -264,14 +271,7 @@ namespace DesktopMagic
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
MessageBoxResult msbRes = MessageBox.Show((string)FindResource("wantToCloseProgram"), AppName, MessageBoxButton.YesNo);
- if (msbRes == MessageBoxResult.Yes)
- {
- e.Cancel = false;
- }
- else
- {
- e.Cancel = true;
- }
+ e.Cancel = msbRes != MessageBoxResult.Yes;
}
private void Window_Closed(object sender, EventArgs e)
@@ -325,7 +325,7 @@ namespace DesktopMagic
private void MusicVisualizerColorTextBox_TextChanged(object sender, TextChangedEventArgs e)
{
- if (!String.IsNullOrWhiteSpace(musicVisualizerColorTextBox.Text) && musicVisualizerColorTextBox.Text != "Default")
+ if (!string.IsNullOrWhiteSpace(musicVisualizerColorTextBox.Text) && musicVisualizerColorTextBox.Text != "Default")
{
try
{
@@ -409,152 +409,140 @@ namespace DesktopMagic
{
musicVisualizerOptionsPanel.Visibility = Visibility.Collapsed;
optionsPanel.Visibility = Visibility.Visible;
+ optionsPanel.Children.Clear();
optionsPanel.UpdateLayout();
- string[,] options = OptionsList[((Tuple)optionsComboBox.SelectedItem).Item2].Item2;
+ bool succ = PluginsSettings.TryGetValue(((Tuple)optionsComboBox.SelectedItem).Item1.ToString(), out List settingElements);
+ if (!succ || settingElements?.Count == 0)
+ {
+ _ = optionsPanel.Children.Add(new TextBlock() { Text = (string)FindResource("noOptions") });
+ return;
+ }
- optionsPanel.Children.Clear();
-
- //options array index:
- // 0 1 2 3 4
- //"Value", "Type", "Name", "min", "max"
-
- for (int i = 0; i < options.GetLength(0); i++)
+ foreach (SettingElement settingElement in settingElements)
{
StackPanel stackPanel = new()
{
Orientation = Orientation.Horizontal
};
- optionsPanel.Children.Add(stackPanel);
+ _ = optionsPanel.Children.Add(stackPanel);
TextBlock label = new()
{
- Text = options[i, 2],
+ Text = settingElement.Name,
Padding = new Thickness(0, 0, 3, 0)
};
- stackPanel.Children.Add(label);
+ _ = stackPanel.Children.Add(label);
stackPanel.UpdateLayout();
label.UpdateLayout();
- if (options[i, 1] == "hed")
+ if (settingElement.Element is DesktopMagicPluginAPI.Inputs.Heading eHeading)
{
- label.Text = options[i, 0];
+ label.Text = eHeading.Value;
label.Margin = new Thickness(0, 5, 3, 0);
label.FontWeight = FontWeights.Bold;
label.Width = optionsPanel.ActualWidth;
label.TextWrapping = TextWrapping.WrapWithOverflow;
}
- else if (options[i, 1] == "bol")
+ else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.CheckBox eCheckBox)
{
CheckBox checkBox = new();
- _ = bool.TryParse(options[i, 0], out bool isChecked);
- checkBox.IsChecked = isChecked;
-
+ checkBox.IsChecked = eCheckBox.Value;
checkBox.Width = optionsPanel.ActualWidth - label.ActualWidth;
- checkBox.Click += Option_ValueChanged;
- checkBox.Name = "bol_" + i.ToString();
- stackPanel.Children.Add(checkBox);
+ checkBox.Click += (_s, _e) =>
+ {
+ eCheckBox.Value = checkBox.IsChecked.GetValueOrDefault();
+ };
+ eCheckBox.OnValueChanged += () =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ checkBox.IsChecked = eCheckBox.Value;
+ Option_ValueChanged();
+ });
+ };
+
+ _ = stackPanel.Children.Add(checkBox);
}
- else if (options[i, 1] == "txt")
+ else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.TextBox eTextBox)
{
TextBox textBox = new()
{
- Text = options[i, 0],
+ Text = eTextBox.Value,
TextWrapping = TextWrapping.Wrap,
Width = optionsPanel.ActualWidth - label.ActualWidth
};
- textBox.TextChanged += Option_ValueChanged;
- textBox.Name = "txt_" + i.ToString();
- stackPanel.Children.Add(textBox);
+ textBox.TextChanged += (_s, _e) =>
+ {
+ eTextBox.Value = textBox.Text;
+ };
+ eTextBox.OnValueChanged += () =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ textBox.Text = eTextBox.Value;
+ Option_ValueChanged();
+ });
+ };
+ _ = stackPanel.Children.Add(textBox);
}
- else if (options[i, 1] == "num")
+ else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.IntegerUpDown eIntegerUpDown)
{
Xceed.Wpf.Toolkit.IntegerUpDown integerUpDown = new();
- _ = int.TryParse(options[i, 0], out int value);
- _ = int.TryParse(options[i, 3], out int min);
- _ = int.TryParse(options[i, 4], out int max);
-
- integerUpDown.Value = value;
- integerUpDown.Minimum = min;
- integerUpDown.Maximum = max;
+ integerUpDown.Value = eIntegerUpDown.Value;
+ integerUpDown.Minimum = eIntegerUpDown.Minimum;
+ integerUpDown.Maximum = eIntegerUpDown.Maximum;
integerUpDown.Width = optionsPanel.ActualWidth - label.ActualWidth;
- integerUpDown.ValueChanged += Option_ValueChanged;
- integerUpDown.Name = "num_" + i.ToString();
- stackPanel.Children.Add(integerUpDown);
+ integerUpDown.ValueChanged += (_s, _e) =>
+ {
+ eIntegerUpDown.Value = integerUpDown.Value.GetValueOrDefault();
+ };
+ eIntegerUpDown.OnValueChanged += () =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ integerUpDown.Value = eIntegerUpDown.Value;
+ Option_ValueChanged();
+ });
+ };
+ _ = stackPanel.Children.Add(integerUpDown);
}
- else if (options[i, 1] == "sld")
+ else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.Slider eSlider)
{
Slider slider = new();
- _ = int.TryParse(options[i, 0], out int value);
- _ = int.TryParse(options[i, 3], out int min);
- _ = int.TryParse(options[i, 4], out int max);
-
- slider.Value = value;
- slider.Minimum = min;
- slider.Maximum = max;
+ slider.Value = eSlider.Value;
+ slider.Minimum = eSlider.Minimum;
+ slider.Maximum = eSlider.Maximum;
slider.TickFrequency = 1;
slider.IsSnapToTickEnabled = true;
slider.Width = optionsPanel.ActualWidth - label.ActualWidth;
- slider.ValueChanged += Option_ValueChanged;
- slider.Name = "sld_" + i.ToString();
- stackPanel.Children.Add(slider);
+ slider.ValueChanged += (_s, _e) =>
+ {
+ eSlider.Value = slider.Value;
+ };
+ eSlider.OnValueChanged += () =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ slider.Value = eSlider.Value;
+ Option_ValueChanged();
+ });
+ };
+
+ _ = stackPanel.Children.Add(slider);
}
}
}
}
- private void Option_ValueChanged(object sender, object e)
+ private void Option_ValueChanged()
{
- DependencyObject dpobj = (DependencyObject)sender;
- string name = (string)dpobj.GetValue(FrameworkElement.NameProperty);
- string value = "";
- int index = int.Parse(name[(name.LastIndexOf("_") + 1)..]);
- name = name.Replace(name[name.LastIndexOf("_")..], "");
-
- if (name.Contains("txt"))
- {
- value = ((TextBox)sender).Text;
- }
- else if (name.Contains("num"))
- {
- value = ((Xceed.Wpf.Toolkit.IntegerUpDown)sender).Text;
- }
- else if (name.Contains("sld"))
- {
- value = ((Slider)sender).Value.ToString();
- }
- else if (name.Contains("bol"))
- {
- value = ((CheckBox)sender).IsChecked.ToString();
- }
-
- OptionsList[((Tuple)optionsComboBox.SelectedItem).Item2].Item2[index, 0] = value;
-
- string PluginName = OptionsList[((Tuple)optionsComboBox.SelectedItem).Item2].Item1;
- string[,] options = OptionsList[((Tuple)optionsComboBox.SelectedItem).Item2].Item2;
- string optionsText = "";
-
- try
- {
- int ind = WindowNames.FindIndex(x => x.StartsWith(PluginName));
- ((PluginWindow)Windows[ind]).OptionChanged(index);
- }
- catch { }
-
- for (int i = 0; i < options.GetLength(0); i++)
- {
- for (int j = 0; j < options.GetLength(1); j++)
- {
- if (j != 0)
- optionsText += "\t";
- optionsText += options[i, j];
- }
- optionsText += "\n";
- }
- File.WriteAllText($"{applicationDataPath}\\Plugins\\{PluginName}\\{PluginName}.save", optionsText);
+ string pluginName = ((Tuple)optionsComboBox.SelectedItem).Item1.ToString();
+ string jsonSettings = JsonSerializer.Serialize(PluginsSettings[pluginName]);
+ File.WriteAllText($"{applicationDataPath}\\Plugins\\{pluginName}\\{pluginName}.save", jsonSettings);
}
#endregion options
@@ -586,14 +574,14 @@ namespace DesktopMagic
}
charWidth = textBlock.ActualWidth;
}
- if (monospace == true)
+ if (monospace)
{
ComboBoxItem comboBoxItem = new()
{
FontFamily = ff,
Content = ff.ToString()
};
- fontComboBox.Items.Add(comboBoxItem);
+ _ = fontComboBox.Items.Add(comboBoxItem);
if (ff.ToString() == GlobalFont)
{
@@ -677,17 +665,12 @@ namespace DesktopMagic
private void LayoutsComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
- if (layoutsComboBox.SelectedIndex == 0)
- {
- removeLayoutButton.IsEnabled = false;
- }
- else
- {
- removeLayoutButton.IsEnabled = true;
- }
+ removeLayoutButton.IsEnabled = layoutsComboBox.SelectedIndex != 0;
if (layoutsComboBox.SelectedIndex == -1 || !loaded)
+ {
return;
+ }
key.SetValue("SelectedLayout", layoutsComboBox.SelectedIndex);
@@ -697,7 +680,7 @@ namespace DesktopMagic
{
if (dat.Contains(":"))
{
- string value = dat[(dat.LastIndexOf(":") + 1)..];
+ string value = dat[(dat.LastIndexOf(":", StringComparison.InvariantCulture) + 1)..];
string name = dat.Replace(":" + value, "");
key.SetValue(name, value);
}
@@ -722,7 +705,9 @@ namespace DesktopMagic
foreach (string valueName in key.GetValueNames())
{
if (valueName != "SelectedLayout")
+ {
content += valueName + ":" + key.GetValue(valueName).ToString() + ";";
+ }
}
content += inputDialog.ResponseText + "\n";
@@ -734,7 +719,9 @@ namespace DesktopMagic
private void RemoveLayoutButton_Click(object sender, RoutedEventArgs e)
{
if (layoutsComboBox.SelectedIndex == -1)
+ {
return;
+ }
List lines = File.ReadAllLines(applicationDataPath + "\\layouts.save").ToList();
lines.RemoveAt(layoutsComboBox.SelectedIndex);
@@ -745,25 +732,27 @@ namespace DesktopMagic
private void SaveLayout()
{
- Task.Run(() =>
- {
- lock (applicationDataPath)
- {
- List lines = File.ReadAllLines(applicationDataPath + "\\layouts.save").ToList();
- string content = "";
- foreach (string valueName in key.GetValueNames())
- {
- if (valueName != "SelectedLayout")
- content += valueName + ":" + key.GetValue(valueName).ToString() + ";";
- }
- Dispatcher.Invoke(() =>
- {
- content += layoutsComboBox.SelectedItem.ToString();
- lines[layoutsComboBox.SelectedIndex] = content;
- });
- File.WriteAllLines(applicationDataPath + "\\layouts.save", lines);
- }
- });
+ _ = Task.Run(() =>
+ {
+ lock (applicationDataPath)
+ {
+ List lines = File.ReadAllLines(applicationDataPath + "\\layouts.save").ToList();
+ string content = "";
+ foreach (string valueName in key.GetValueNames())
+ {
+ if (valueName != "SelectedLayout")
+ {
+ content += valueName + ":" + key.GetValue(valueName).ToString() + ";";
+ }
+ }
+ Dispatcher.Invoke(() =>
+ {
+ content += layoutsComboBox.SelectedItem.ToString();
+ lines[layoutsComboBox.SelectedIndex] = content;
+ });
+ File.WriteAllLines(applicationDataPath + "\\layouts.save", lines);
+ }
+ });
}
private void LoadLayoutNames()
@@ -773,8 +762,8 @@ namespace DesktopMagic
foreach (string line in lines)
{
- string name = line[(line.LastIndexOf(";") + 1)..];
- layoutsComboBox.Items.Add(name);
+ string name = line[(line.LastIndexOf(";", StringComparison.InvariantCulture) + 1)..];
+ _ = layoutsComboBox.Items.Add(name);
}
layoutsComboBox.SelectedIndex = int.Parse(key.GetValue("SelectedLayout", "0").ToString());
}
@@ -807,7 +796,7 @@ namespace DesktopMagic
Windows.Clear();
WindowNames.Clear();
- var list = stackPanel.Children.OfType();
+ IEnumerable list = stackPanel.Children.OfType();
bool showWindow = true;
try
@@ -837,7 +826,7 @@ namespace DesktopMagic
catch (Exception ex)
{
File.AppendAllText(logFilePath, "\n" + ex);
- MessageBox.Show(ex.ToString());
+ _ = MessageBox.Show(ex.ToString());
}
if (!showWindow && minimize)
@@ -868,7 +857,7 @@ namespace DesktopMagic
private void OpenPluginsFolderButton_Click(object sender, RoutedEventArgs e)
{
- System.Diagnostics.Process.Start("explorer.exe", applicationDataPath + "\\Plugins");
+ _ = System.Diagnostics.Process.Start("explorer.exe", applicationDataPath + "\\Plugins");
}
private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
diff --git a/src/DesktopMagic/PluginData.cs b/src/DesktopMagic/Plugin/PluginData.cs
similarity index 100%
rename from src/DesktopMagic/PluginData.cs
rename to src/DesktopMagic/Plugin/PluginData.cs
diff --git a/src/DesktopMagic/PluginWindow.xaml b/src/DesktopMagic/Plugin/PluginWindow.xaml
similarity index 100%
rename from src/DesktopMagic/PluginWindow.xaml
rename to src/DesktopMagic/Plugin/PluginWindow.xaml
diff --git a/src/DesktopMagic/PluginWindow.xaml.cs b/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
similarity index 86%
rename from src/DesktopMagic/PluginWindow.xaml.cs
rename to src/DesktopMagic/Plugin/PluginWindow.xaml.cs
index 688d02b..60c916e 100644
--- a/src/DesktopMagic/PluginWindow.xaml.cs
+++ b/src/DesktopMagic/Plugin/PluginWindow.xaml.cs
@@ -1,7 +1,9 @@
using DesktopMagicPluginAPI;
+using DesktopMagicPluginAPI.Inputs;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
@@ -27,7 +29,6 @@ namespace DesktopMagic
private Plugin pluginClassInstance;
private readonly string pluginName = "";
- private int optionsIndex = 0;
private string pluginFolderPath = "";
private bool stop = false;
@@ -177,21 +178,7 @@ namespace DesktopMagic
return;
}
- string[,] optionsArray = pluginClassInstance.Inputs;
-
- int index = 0;
- List> optionsList = new();
- optionsList.AddRange(MainWindow.OptionsList);
- foreach (Tuple option in optionsList)
- {
- if (option.Item1 == pluginName)
- {
- optionsIndex = index;
- LoadOptions(optionsArray);
- break;
- }
- index++;
- }
+ LoadOptions(instance);
valueTimer = new System.Timers.Timer();
valueTimer.Interval = 1000;
@@ -206,35 +193,41 @@ namespace DesktopMagic
}
}
- private void LoadOptions(string[,] optionsArray)
+ private void LoadOptions(object instance)
{
- if (File.Exists($"{pluginFolderPath}\\{pluginName}.save"))
- {
- string[] lines = File.ReadAllLines($"{pluginFolderPath}\\{pluginName}.save");
+ Debug.WriteLine(instance.GetType().FullName);
+ FieldInfo[] props = instance.GetType().GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.GetField);
- for (int i = 0; i < lines.Length; i++)
+ List settingElements = new List();
+ foreach (FieldInfo prop in props)
+ {
+ if (prop.GetValue(instance) is Element element)
{
- string[] splitOptions = lines[i].Split('\t');
- for (int j = 0; j < optionsArray.GetLength(0); j++)
+ object[] attrs = prop.GetCustomAttributes(true);
+ foreach (object attr in attrs)
{
- if (optionsArray[j, 2] == splitOptions[2])
+ if (attr is ElementAttribute elementAttribute)
{
- optionsArray[j, 0] = splitOptions[0];
+ settingElements.Add(new SettingElement(element, elementAttribute.Name, elementAttribute.OrderIndex));
break;
}
}
}
}
- MainWindow.OptionsList[optionsIndex] = new Tuple(pluginName, optionsArray);
+
+ settingElements = settingElements.OrderBy(x => x.OrderIndex).ToList();
+ if (MainWindow.PluginsSettings.ContainsKey(pluginName))
+ {
+ MainWindow.PluginsSettings[pluginName] = settingElements;
+ }
+ else
+ {
+ MainWindow.PluginsSettings.Add(pluginName, settingElements);
+ }
}
private void ValueTimer_Elapsed(object sender, ElapsedEventArgs e)
{
- if (MainWindow.OptionsList[optionsIndex].Item2.GetLength(0) > 0)
- {
- pluginClassInstance.Inputs = MainWindow.OptionsList[optionsIndex].Item2;
- }
-
//Set Arguments
SolidBrush newBrush = (SolidBrush)MainWindow.GlobalSystemColor;
Color color = newBrush.Color;
@@ -304,11 +297,6 @@ namespace DesktopMagic
#region Plugin Methods
- public void OptionChanged(int optionIndex)
- {
- pluginClassInstance.OnOptionChanged(optionIndex);
- }
-
private void Clicked(System.Drawing.Point positon)
{
pluginClassInstance.OnMouseClick(positon);
diff --git a/src/DesktopMagic/Plugin/SettingElement.cs b/src/DesktopMagic/Plugin/SettingElement.cs
new file mode 100644
index 0000000..315c659
--- /dev/null
+++ b/src/DesktopMagic/Plugin/SettingElement.cs
@@ -0,0 +1,23 @@
+using DesktopMagicPluginAPI.Inputs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagic
+{
+ internal class SettingElement
+ {
+ public Element Element { get; }
+ public string Name { get; }
+ public int OrderIndex { get; }
+
+ public SettingElement(Element element, string name, int orderIndex)
+ {
+ Element = element;
+ Name = name;
+ OrderIndex = orderIndex;
+ }
+ }
+}
\ No newline at end of file
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 44a38ff..b8f0a6a 100644
--- a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.deps.json
+++ b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.deps.json
@@ -9,7 +9,7 @@
"DesktopMagic/1.0.0": {
"dependencies": {
"AlwaysUpToDate": "1.0.0.2",
- "DesktopMagicPluginAPI": "1.0.0",
+ "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",
@@ -334,7 +334,7 @@
}
}
},
- "DesktopMagicPluginAPI/1.0.0": {
+ "DesktopMagicPluginAPI/0.0.0.1": {
"dependencies": {
"System.Drawing.Common": "5.0.2"
},
@@ -532,7 +532,7 @@
"path": "system.text.json/5.0.2",
"hashPath": "system.text.json.5.0.2.nupkg.sha512"
},
- "DesktopMagicPluginAPI/1.0.0": {
+ "DesktopMagicPluginAPI/0.0.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll
index 354b2a0..2785a78 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.exe b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.exe
index f6af1a8..599708a 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.exe and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.exe differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb
index 26ac220..a6610a2 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/DesktopMagic.runtimeconfig.dev.json b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.runtimeconfig.dev.json
index 560c599..29e3525 100644
--- a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.runtimeconfig.dev.json
+++ b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.runtimeconfig.dev.json
@@ -3,8 +3,7 @@
"additionalProbingPaths": [
"C:\\Users\\David\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\David\\.nuget\\packages",
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
]
}
}
\ No newline at end of file
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll
index d389ab0..bad0bb0 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 ce08c27..c0c68d2 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/ref/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll
index 339612d..0d44437 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/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll
index b91b4e6..8015216 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.exe b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.exe
index f6af1a8..599708a 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.exe and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.exe differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb
index df65012..b405203 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/DesktopMagic.runtimeconfig.dev.json b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.runtimeconfig.dev.json
index 560c599..29e3525 100644
--- a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.runtimeconfig.dev.json
+++ b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.runtimeconfig.dev.json
@@ -3,8 +3,7 @@
"additionalProbingPaths": [
"C:\\Users\\David\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\David\\.nuget\\packages",
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
]
}
}
\ No newline at end of file
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll
index 79c0427..f37461b 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb
index 21cf341..fb65342 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb 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 4f1092c..75518a7 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 ed1443d..262c8cd 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 cb291a8..0319740 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 @@
-fad992f78c9897474b900604791c7e23772a784d
+8eedf8c25f9a39bf97651ddfe548d68907cae4c8
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 5fd531d..be6e997 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
@@ -162,3 +162,85 @@ C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debu
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\ref\DesktopMagic.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.pdb
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.genruntimeconfig.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagic.exe
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagic.deps.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagic.runtimeconfig.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagic.runtimeconfig.dev.json
+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
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Xceed.Wpf.AvalonDock.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Xceed.Wpf.Toolkit.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Google.Apis.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Google.Apis.Auth.PlatformServices.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Google.Apis.Auth.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Google.Apis.Calendar.v3.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Google.Apis.Core.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\Hardcodet.NotifyIcon.Wpf.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\MaterialDesignColors.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\MaterialDesignThemes.Wpf.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\NAudio.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\NAudio.Asio.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\NAudio.Core.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\NAudio.Midi.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\NAudio.Wasapi.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\NAudio.WinForms.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\NAudio.WinMM.dll
+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
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\fr\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\hu\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\it\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\ja-JP\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\ro\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\ru\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\sv\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\runtimes\unix\lib\netcoreapp3.0\System.Drawing.Common.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\runtimes\win\lib\netcoreapp3.0\System.Drawing.Common.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\runtimes\win\lib\netcoreapp2.0\System.Management.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Debug\net5.0-windows\DesktopMagicPluginAPI.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.csproj.AssemblyReference.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\CalendarWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\CpuUsageWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DateWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\MainWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\MusicVisualizerWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\Resources\StringResources.de.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\Resources\StringResources.en.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\TimeWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\App.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\CalendarWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\CpuUsageWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DateWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\InputDialog.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\MainWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\MusicVisualizerWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\Plugin\PluginWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\TimeWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\App.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic_MarkupCompile.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic_MarkupCompile.lref
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\InputDialog.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\Plugin\PluginWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.g.resources
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.AssemblyInfoInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.AssemblyInfo.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.csproj.CoreCompileInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.csproj.CopyComplete
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\DesktopMagic.dll
+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
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.runtimeconfig.json b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.runtimeconfig.json
index a39db45..7e7927e 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.runtimeconfig.json
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.designer.runtimeconfig.json
@@ -8,8 +8,7 @@
"additionalProbingPaths": [
"C:\\Users\\David\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\David\\.nuget\\packages",
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configProperties": {
"Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll
index 354b2a0..2785a78 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 86f94c5..6f533db 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.genruntimeconfig.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.genruntimeconfig.cache
index 0945adb..f55ccd9 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.genruntimeconfig.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.genruntimeconfig.cache
@@ -1 +1 @@
-a6b3c04ef8e616f7009fb6b97aec46015cf10813
+1b78c62ccd4bd7611f1b36a873f8433dd37da59a
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb
index 26ac220..a6610a2 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 3e85079..02f650f 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.cache
@@ -4,17 +4,17 @@
winexe
C#
.cs
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\
DesktopMagic
none
false
TRACE;DEBUG;NET;NET5_0;NETCOREAPP
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
-10-1821104012
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
+10-291818503
-15283295026
-226-2034942167
-CalendarWindow.xaml;CpuUsageWindow.xaml;DateWindow.xaml;InputDialog.xaml;MainWindow.xaml;MusicVisualizerWindow.xaml;PluginWindow.xaml;Resources\StringResources.de.xaml;Resources\StringResources.en.xaml;TimeWindow.xaml;
+17-911440499
+2261183705467
+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/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
index 816c24f..d890e94 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
@@ -4,17 +4,17 @@
winexe
C#
.cs
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Debug\net5.0-windows\
DesktopMagic
none
false
TRACE;DEBUG;NET;NET5_0;NETCOREAPP
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
-10-1821104012
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
+10-291818503
-171141795125
-226-2034942167
-CalendarWindow.xaml;CpuUsageWindow.xaml;DateWindow.xaml;InputDialog.xaml;MainWindow.xaml;MusicVisualizerWindow.xaml;PluginWindow.xaml;Resources\StringResources.de.xaml;Resources\StringResources.en.xaml;TimeWindow.xaml;
+19-52940400
+2261183705467
+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/Debug/net5.0-windows/DesktopMagic_MarkupCompile.lref b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.lref
index 2640167..e28a2e7 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.lref
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.lref
@@ -1,5 +1,5 @@
-FC:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\InputDialog.xaml;;
-FC:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\PluginWindow.xaml;;
+FC:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\InputDialog.xaml;;
+FC:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\Plugin\PluginWindow.xaml;;
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/apphost.exe b/src/DesktopMagic/obj/Debug/net5.0-windows/apphost.exe
index f6af1a8..599708a 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/apphost.exe and b/src/DesktopMagic/obj/Debug/net5.0-windows/apphost.exe 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 339612d..0d44437 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 828cece..caf918a 100644
--- a/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json
+++ b/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.dgspec.json
@@ -1,33 +1,32 @@
{
"format": 1,
"restore": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj": {}
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj": {}
},
"projects": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
"version": "0.0.0.1",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"projectName": "DesktopMagicPluginAPI",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
@@ -70,38 +69,37 @@
}
}
},
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj": {
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
"projectName": "DesktopMagic",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0-windows7.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net5.0-windows7.0": {
"targetAlias": "net5.0-windows",
"projectReferences": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
}
}
}
diff --git a/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.g.props b/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.g.props
index 9925ca8..26c23e7 100644
--- a/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.g.props
+++ b/src/DesktopMagic/obj/DesktopMagic.csproj.nuget.g.props
@@ -5,14 +5,13 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\
+ C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages
PackageReference
5.10.0
-
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
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 e664c68..c931556 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 9bea7e3..0dad2e2 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 @@
-dc28e5a70433ae3b8e5b562d6b901fd678c9b6bb
+dbe8cd736ddd3847699768ddcd597bd713e26b29
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 69b63a4..1a6b930 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,3 +162,85 @@ 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
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.Toolkit.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Google.Apis.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Google.Apis.Auth.PlatformServices.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Google.Apis.Auth.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Google.Apis.Calendar.v3.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Google.Apis.Core.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\Hardcodet.NotifyIcon.Wpf.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\MaterialDesignColors.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\MaterialDesignThemes.Wpf.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\NAudio.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\NAudio.Asio.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\NAudio.Core.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\NAudio.Midi.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\NAudio.Wasapi.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinForms.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinMM.dll
+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
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\fr\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\hu\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\it\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\ja-JP\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\ro\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\ru\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\sv\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\runtimes\unix\lib\netcoreapp3.0\System.Drawing.Common.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\runtimes\win\lib\netcoreapp3.0\System.Drawing.Common.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\runtimes\win\lib\netcoreapp2.0\System.Management.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagicPluginAPI.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.csproj.AssemblyReference.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\CalendarWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\CpuUsageWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DateWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\MainWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\MusicVisualizerWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\Resources\StringResources.de.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\Resources\StringResources.en.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\TimeWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\App.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\CalendarWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\CpuUsageWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DateWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\InputDialog.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\MainWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\MusicVisualizerWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\Plugin\PluginWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\TimeWindow.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\App.g.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic_MarkupCompile.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic_MarkupCompile.lref
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\InputDialog.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\Plugin\PluginWindow.baml
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.g.resources
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.AssemblyInfoInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.AssemblyInfo.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.csproj.CoreCompileInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\ref\DesktopMagic.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\DesktopMagic.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.deps.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.runtimeconfig.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.runtimeconfig.dev.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\bin\Release\net5.0-windows\ref\DesktopMagic.dll
+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
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.runtimeconfig.json b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.runtimeconfig.json
index a39db45..7e7927e 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.runtimeconfig.json
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.designer.runtimeconfig.json
@@ -8,8 +8,7 @@
"additionalProbingPaths": [
"C:\\Users\\David\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\David\\.nuget\\packages",
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configProperties": {
"Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll
index b91b4e6..8015216 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.g.resources b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources
index 4c32702..ee56418 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.genruntimeconfig.cache b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.genruntimeconfig.cache
index 0945adb..f55ccd9 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.genruntimeconfig.cache
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.genruntimeconfig.cache
@@ -1 +1 @@
-a6b3c04ef8e616f7009fb6b97aec46015cf10813
+1b78c62ccd4bd7611f1b36a873f8433dd37da59a
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb
index df65012..b405203 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 c4a7e93..e4a1fff 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.cache
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.cache
@@ -4,17 +4,17 @@
winexe
C#
.cs
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\
DesktopMagic
none
false
TRACE;RELEASE;NET;NET5_0;NETCOREAPP
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
-10-1821104012
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
+10-291818503
-15283295026
-226967963979
-CalendarWindow.xaml;CpuUsageWindow.xaml;DateWindow.xaml;InputDialog.xaml;MainWindow.xaml;MusicVisualizerWindow.xaml;PluginWindow.xaml;Resources\StringResources.de.xaml;Resources\StringResources.en.xaml;TimeWindow.xaml;
+17-911440499
+226-1364174901
+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 bc18fa8..95c14fb 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
@@ -4,17 +4,17 @@
winexe
C#
.cs
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\obj\Release\net5.0-windows\
DesktopMagic
none
false
TRACE;RELEASE;NET;NET5_0;NETCOREAPP
-C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
-10-1821104012
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
+10-291818503
-17254286507
-226967963979
-CalendarWindow.xaml;CpuUsageWindow.xaml;DateWindow.xaml;InputDialog.xaml;MainWindow.xaml;MusicVisualizerWindow.xaml;PluginWindow.xaml;Resources\StringResources.de.xaml;Resources\StringResources.en.xaml;TimeWindow.xaml;
+19-940449018
+226-1364174901
+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.lref b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.lref
index 2640167..e28a2e7 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.lref
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic_MarkupCompile.lref
@@ -1,5 +1,5 @@
-FC:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\InputDialog.xaml;;
-FC:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagic\PluginWindow.xaml;;
+FC:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\InputDialog.xaml;;
+FC:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\Plugin\PluginWindow.xaml;;
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs
index 1442296..5fc60ec 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/InputDialog.g.i.cs
@@ -86,7 +86,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/inputdialog.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/inputdialog.xaml", System.UriKind.Relative);
#line 1 "..\..\..\InputDialog.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
index 649bf7d..c27a4fa 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
@@ -288,7 +288,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/mainwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\MainWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
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/apphost.exe b/src/DesktopMagic/obj/Release/net5.0-windows/apphost.exe
index f6af1a8..599708a 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/apphost.exe and b/src/DesktopMagic/obj/Release/net5.0-windows/apphost.exe differ
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 4f1092c..75518a7 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 d339b85..1914bff 100644
--- a/src/DesktopMagic/obj/project.assets.json
+++ b/src/DesktopMagic/obj/project.assets.json
@@ -1090,41 +1090,39 @@
},
"packageFolders": {
"C:\\Users\\David\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
"projectName": "DesktopMagic",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0-windows7.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net5.0-windows7.0": {
"targetAlias": "net5.0-windows",
"projectReferences": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
}
}
}
diff --git a/src/DesktopMagic/obj/project.nuget.cache b/src/DesktopMagic/obj/project.nuget.cache
index 0546795..a86fd62 100644
--- a/src/DesktopMagic/obj/project.nuget.cache
+++ b/src/DesktopMagic/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "tlThlZfHuTZwobJjU75y3KvStqi+h3O2tjISpgJdLKJYu5qrwpxJb1thGk5nDPbXqcgoO6C3ixMf9KFSQ304qw==",
+ "dgSpecHash": "iO1J8G7zPvBH5piB9vrLjZFUdqKDO2srDSAqkIfbx66tUrR5z+jECTqkPX0cYsO47B833HpbduDM90H+WxtyCw==",
"success": true,
- "projectFilePath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagic\\DesktopMagic.csproj",
+ "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",
diff --git a/src/DesktopMagicPlugin.Test/PluginScript.cs b/src/DesktopMagicPlugin.Test/PluginScript.cs
index aba9469..4659f0a 100644
--- a/src/DesktopMagicPlugin.Test/PluginScript.cs
+++ b/src/DesktopMagicPlugin.Test/PluginScript.cs
@@ -1,4 +1,5 @@
using DesktopMagicPluginAPI;
+using DesktopMagicPluginAPI.Inputs;
using System;
using System.Diagnostics;
using System.Drawing;
@@ -7,17 +8,39 @@ namespace DesktopMagicPlugin.Test
{
public class PluginScript : Plugin
{
+ [Element("Heading")]
+ private Heading heading = new Heading("test");
+
+ [Element("Slider:")]
+ private Slider slider = new Slider(1, 23, 4);
+
+ [Element("Text:")]
+ private TextBox textBox = new TextBox("abc");
+
+ public PluginScript()
+ {
+ slider.OnValueChanged += Slider_OnValueChanged;
+ textBox.OnValueChanged += TextBox_OnValueChanged;
+ }
+
+ private void TextBox_OnValueChanged()
+ {
+ Debug.WriteLine("TextBox value changed:" + textBox.Value);
+ }
+
+ private void Slider_OnValueChanged()
+ {
+ Debug.WriteLine("Slider value changed:" + slider.Value);
+ }
+
public override Bitmap Main()
{
Bitmap bmp = new Bitmap(100, 100);
using Graphics g = Graphics.FromImage(bmp);
g.Clear(Application.Color);
+ g.DrawString(slider.Value.ToString(), new Font("arial", 10), Brushes.Black, new PointF(0, 0));
+ slider.Value++;
return bmp;
}
-
- public override void OnMouseClick(Point position)
- {
- Debug.WriteLine(position);
- }
}
}
\ No newline at end of file
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.deps.json b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.deps.json
index 70d78b3..c641a18 100644
--- a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.deps.json
+++ b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.deps.json
@@ -8,7 +8,7 @@
".NETCoreApp,Version=v5.0": {
"DesktopMagicPlugin.Test/1.0.0": {
"dependencies": {
- "DesktopMagicPluginAPI": "1.0.0",
+ "DesktopMagicPluginAPI": "0.0.0.1",
"System.Drawing.Common": "5.0.2"
},
"runtime": {
@@ -60,7 +60,7 @@
}
}
},
- "DesktopMagicPluginAPI/1.0.0": {
+ "DesktopMagicPluginAPI/0.0.0.1": {
"dependencies": {
"System.Drawing.Common": "5.0.2"
},
@@ -97,7 +97,7 @@
"path": "system.drawing.common/5.0.2",
"hashPath": "system.drawing.common.5.0.2.nupkg.sha512"
},
- "DesktopMagicPluginAPI/1.0.0": {
+ "DesktopMagicPluginAPI/0.0.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll
index 755c051..ab0f385 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb
index 39170e8..71e0b06 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll
index d87ca50..bad0bb0 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb
index e013c53..c0c68d2 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll
index de57783..a9588b7 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.assets.cache b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.assets.cache
index fe85179..67ffc3b 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.assets.cache and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.assets.cache differ
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.CoreCompileInputs.cache b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.CoreCompileInputs.cache
index 5c51788..c984d29 100644
--- a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.CoreCompileInputs.cache
+++ b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-6563cf0e841cae8437271556bdf55cc1001baf45
+b2d81a1822e345897b3638c6df1a9a5fe1575c17
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.FileListAbsolute.txt b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.FileListAbsolute.txt
index 78c3567..0f73e8b 100644
--- a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.FileListAbsolute.txt
+++ b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.csproj.FileListAbsolute.txt
@@ -13,3 +13,18 @@ C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPlugin.Test\o
C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPlugin.Test\obj\Debug\net5.0\ref\DesktopMagicPlugin.Test.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\bin\Debug\net5.0\DesktopMagicPlugin.Test.deps.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\bin\Debug\net5.0\DesktopMagicPlugin.Test.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\bin\Debug\net5.0\ref\DesktopMagicPlugin.Test.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\bin\Debug\net5.0\DesktopMagicPlugin.Test.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\bin\Debug\net5.0\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\bin\Debug\net5.0\DesktopMagicPluginAPI.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.csproj.AssemblyReference.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.AssemblyInfoInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.AssemblyInfo.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.csproj.CoreCompileInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.csproj.CopyComplete
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\ref\DesktopMagicPlugin.Test.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPlugin.Test\obj\Debug\net5.0\DesktopMagicPlugin.Test.pdb
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll
index 755c051..ab0f385 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb
index 39170e8..71e0b06 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb differ
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll
index de57783..a9588b7 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json b/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json
index 4964504..fd1b3b5 100644
--- a/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json
+++ b/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.dgspec.json
@@ -1,41 +1,40 @@
{
"format": 1,
"restore": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj": {}
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj": {}
},
"projects": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj": {
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
"projectName": "DesktopMagicPlugin.Test",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net5.0": {
"targetAlias": "net5.0",
"projectReferences": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
}
}
}
@@ -74,30 +73,29 @@
}
}
},
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
"version": "0.0.0.1",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"projectName": "DesktopMagicPluginAPI",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
diff --git a/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.g.props b/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.g.props
index bdd0480..f8a156c 100644
--- a/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.g.props
+++ b/src/DesktopMagicPlugin.Test/obj/DesktopMagicPlugin.Test.csproj.nuget.g.props
@@ -5,14 +5,13 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\
+ C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages
PackageReference
5.10.0
-
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
diff --git a/src/DesktopMagicPlugin.Test/obj/Release/net5.0/DesktopMagicPlugin.Test.assets.cache b/src/DesktopMagicPlugin.Test/obj/Release/net5.0/DesktopMagicPlugin.Test.assets.cache
index 8794fb0..e8e47bb 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Release/net5.0/DesktopMagicPlugin.Test.assets.cache and b/src/DesktopMagicPlugin.Test/obj/Release/net5.0/DesktopMagicPlugin.Test.assets.cache differ
diff --git a/src/DesktopMagicPlugin.Test/obj/project.assets.json b/src/DesktopMagicPlugin.Test/obj/project.assets.json
index fe82ff7..cbbb17b 100644
--- a/src/DesktopMagicPlugin.Test/obj/project.assets.json
+++ b/src/DesktopMagicPlugin.Test/obj/project.assets.json
@@ -169,41 +169,39 @@
},
"packageFolders": {
"C:\\Users\\David\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
"projectName": "DesktopMagicPlugin.Test",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net5.0": {
"targetAlias": "net5.0",
"projectReferences": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj"
}
}
}
diff --git a/src/DesktopMagicPlugin.Test/obj/project.nuget.cache b/src/DesktopMagicPlugin.Test/obj/project.nuget.cache
index a47af89..ab6fd0a 100644
--- a/src/DesktopMagicPlugin.Test/obj/project.nuget.cache
+++ b/src/DesktopMagicPlugin.Test/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "TuOcZPLALDGmU9LTAGn5iVicebN0kr4uGLHmPWAVlWjcIsPkr3qjci7XHJAa5QBVONH2TKxVLFrdKt/80PwHrg==",
+ "dgSpecHash": "bKNVRlJTkB1Q+qxz0L+/WVz3V7NPh6sYzdnDCosqJqTOuhzldTVhcpE7nvRH5DKOS1NAr66gqn7IiXnRcoxYkw==",
"success": true,
- "projectFilePath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.csproj",
+ "projectFilePath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPlugin.Test\\DesktopMagicPlugin.Test.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",
diff --git a/src/DesktopMagicPluginAPI/Inputs/CheckBox.cs b/src/DesktopMagicPluginAPI/Inputs/CheckBox.cs
new file mode 100644
index 0000000..5be3ee5
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/CheckBox.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ public class CheckBox : Element
+ {
+ private bool _value;
+
+ public bool Value
+ {
+ get => _value;
+ set
+ {
+ if (_value != value)
+ {
+ _value = value;
+ ValueChanged();
+ }
+ }
+ }
+
+ public CheckBox(bool value)
+ {
+ Value = value;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Inputs/Element.cs b/src/DesktopMagicPluginAPI/Inputs/Element.cs
new file mode 100644
index 0000000..0da63cb
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/Element.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ public abstract class Element
+ {
+ public event Action OnValueChanged;
+
+ protected void ValueChanged()
+ {
+ OnValueChanged?.Invoke();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs b/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
new file mode 100644
index 0000000..21322bd
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ [AttributeUsage(AttributeTargets.Field)
+]
+ public class ElementAttribute : Attribute
+ {
+ public string Name { get; }
+ public int OrderIndex { get; }
+
+ public ElementAttribute(string name, int orderIndex = 0)
+ {
+ Name = name;
+ OrderIndex = orderIndex;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Inputs/Heading.cs b/src/DesktopMagicPluginAPI/Inputs/Heading.cs
new file mode 100644
index 0000000..99702cc
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/Heading.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ public class Heading : Element
+ {
+ public string Value { get; }
+
+ public Heading(string value)
+ {
+ Value = value;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Inputs/IntegerUpDown.cs b/src/DesktopMagicPluginAPI/Inputs/IntegerUpDown.cs
new file mode 100644
index 0000000..236e2b6
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/IntegerUpDown.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ public class IntegerUpDown : Element
+ {
+ private int _value;
+ public int Maximum { get; }
+ public int Minimum { get; }
+
+ public int Value
+ {
+ get => _value;
+ set
+ {
+ if (_value != value)
+ {
+ _value = value;
+ ValueChanged();
+ }
+ }
+ }
+
+ public IntegerUpDown(int min, int max, int value = 0)
+ {
+ if (min < 0)
+ {
+ throw new ArgumentException("Value can not be negative!", nameof(min));
+ }
+ if (max < 0)
+ {
+ throw new ArgumentException("Value can not be negative!", nameof(max));
+ }
+ if (min > max)
+ {
+ throw new ArgumentException($"{nameof(min)} is greater than or equal to {nameof(max)}!");
+ }
+ if (value > max)
+ {
+ throw new ArgumentException($"{nameof(value)} is greater than {nameof(max)}!");
+ }
+ if (value < min)
+ {
+ throw new ArgumentException($"{nameof(value)} is less than {nameof(min)}!");
+ }
+
+ Minimum = min;
+ Maximum = max;
+ Value = value;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Inputs/Slider.cs b/src/DesktopMagicPluginAPI/Inputs/Slider.cs
new file mode 100644
index 0000000..e8307be
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/Slider.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ public sealed class Slider : Element
+ {
+ private double _value;
+ public double Maximum { get; }
+ public double Minimum { get; }
+
+ public double Value
+ {
+ get => _value;
+ set
+ {
+ if (_value != value)
+ {
+ _value = value;
+ ValueChanged();
+ }
+ }
+ }
+
+ public Slider(double min, double max, double value = 0)
+ {
+ if (min < 0)
+ {
+ throw new ArgumentException("Value can not be negative!", nameof(min));
+ }
+ if (max < 0)
+ {
+ throw new ArgumentException("Value can not be negative!", nameof(max));
+ }
+ if (min > max)
+ {
+ throw new ArgumentException($"{nameof(min)} is greater than or equal to {nameof(max)}!");
+ }
+ if (value > max)
+ {
+ throw new ArgumentException($"{nameof(value)} is greater than {nameof(max)}!");
+ }
+ if (value < min)
+ {
+ throw new ArgumentException($"{nameof(value)} is less than {nameof(min)}!");
+ }
+
+ Minimum = min;
+ Maximum = max;
+ Value = value;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Inputs/TextBox.cs b/src/DesktopMagicPluginAPI/Inputs/TextBox.cs
new file mode 100644
index 0000000..bcc4ba2
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/TextBox.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ public class TextBox : Element
+ {
+ private string _value;
+
+ public string Value
+ {
+ get => _value;
+ set
+ {
+ if (_value != value)
+ {
+ _value = value;
+ ValueChanged();
+ }
+ }
+ }
+
+ public TextBox(string value)
+ {
+ Value = value;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Plugin.cs b/src/DesktopMagicPluginAPI/Plugin.cs
index e3f3ac8..72c7db0 100644
--- a/src/DesktopMagicPluginAPI/Plugin.cs
+++ b/src/DesktopMagicPluginAPI/Plugin.cs
@@ -25,14 +25,8 @@ namespace DesktopMagicPluginAPI
public virtual int UpdateInterval { get; set; } = 1000;
- public virtual string[,] Inputs { get; set; } = new string[0, 0];
-
public abstract Bitmap Main();
- public virtual void OnOptionChanged(int optionIndex)
- {
- }
-
public virtual void OnMouseClick(Point position)
{
}
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.deps.json b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.deps.json
index 4448db2..31a608f 100644
--- a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.deps.json
+++ b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.deps.json
@@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v5.0": {
- "DesktopMagicPluginAPI/1.0.0": {
+ "DesktopMagicPluginAPI/0.0.0.1": {
"dependencies": {
"System.Drawing.Common": "5.0.2"
},
@@ -62,7 +62,7 @@
}
},
"libraries": {
- "DesktopMagicPluginAPI/1.0.0": {
+ "DesktopMagicPluginAPI/0.0.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll
index d389ab0..bad0bb0 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 ce08c27..c0c68d2 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 6aca182..48d15a8 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/bin/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll
index 79c0427..f37461b 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb
index 21cf341..fb65342 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll
index 2573684..1b4a935 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs
index 89e49bf..9a1bd66 100644
--- a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs
+++ b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfo.cs
@@ -11,13 +11,14 @@
using System;
using System.Reflection;
-[assembly: System.Reflection.AssemblyCompanyAttribute("DesktopMagicPluginAPI")]
+[assembly: System.Reflection.AssemblyCompanyAttribute("Stone_Red")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-[assembly: System.Reflection.AssemblyProductAttribute("DesktopMagicPluginAPI")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.1")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.1")]
+[assembly: System.Reflection.AssemblyProductAttribute("Stone_Red")]
[assembly: System.Reflection.AssemblyTitleAttribute("DesktopMagicPluginAPI")]
-[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.1")]
+[assembly: System.Reflection.AssemblyMetadataAttribute("RepositoryUrl", "https://github.com/Stone-Red-Code/DesktopMagic")]
// Von der MSBuild WriteCodeFragment-Klasse generiert.
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache
index c7d926c..10948ac 100644
--- a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache
+++ b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.AssemblyInfoInputs.cache
@@ -1 +1 @@
-ec3127a539283f133e4725b081b99947b1a90358
+047460573638f7775be64f97de00b14c8c2bbda6
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.assets.cache b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.assets.cache
index 84ded9c..d78010d 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.assets.cache and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.assets.cache differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
index 252e047..d5200e9 100644
--- a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
+++ b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8df801694bea836d41acd56826af208602a65493
+3d351e819578d1d8c8cf3fc4ddef05ac96911424
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt
index 50648a9..78320f0 100644
--- a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt
+++ b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt
@@ -10,3 +10,15 @@ C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPluginAPI\obj
C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPluginAPI\obj\Debug\net5.0\ref\DesktopMagicPluginAPI.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Debug\net5.0\DesktopMagicPluginAPI.deps.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Debug\net5.0\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Debug\net5.0\ref\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Debug\net5.0\DesktopMagicPluginAPI.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.csproj.AssemblyReference.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.AssemblyInfoInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.AssemblyInfo.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\ref\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Debug\net5.0\DesktopMagicPluginAPI.pdb
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll
index d389ab0..bad0bb0 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 ce08c27..c0c68d2 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 6aca182..48d15a8 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
diff --git a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json
index 92fe21e..e5e8079 100644
--- a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json
+++ b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.dgspec.json
@@ -1,33 +1,32 @@
{
"format": 1,
"restore": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {}
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {}
},
"projects": {
- "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
+ "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj": {
"version": "0.0.0.1",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"projectName": "DesktopMagicPluginAPI",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
diff --git a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.g.props b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.g.props
index bdd0480..f8a156c 100644
--- a/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.g.props
+++ b/src/DesktopMagicPluginAPI/obj/DesktopMagicPluginAPI.csproj.nuget.g.props
@@ -5,14 +5,13 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\
+ C:\Users\David\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages
PackageReference
5.10.0
-
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.assets.cache b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.assets.cache
index ebe968f..6f3f293 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.assets.cache and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.assets.cache differ
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
index bcb6ea4..8d99647 100644
--- a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
+++ b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-033f37169beeb202feda91d08f981cb680cc4b22
+78b084028688b20b372609aac30267390d5f6d25
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt
index 8bb3f8a..583eb14 100644
--- a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt
+++ b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.FileListAbsolute.txt
@@ -22,3 +22,15 @@ C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\ref\DesktopMagicPluginAPI.dll
C:\Users\David\Google Drive\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Release\net5.0\DesktopMagicPluginAPI.deps.json
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Release\net5.0\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Release\net5.0\ref\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\bin\Release\net5.0\DesktopMagicPluginAPI.pdb
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.csproj.AssemblyReference.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.AssemblyInfoInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.AssemblyInfo.cs
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\ref\DesktopMagicPluginAPI.dll
+C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagicPluginAPI\obj\Release\net5.0\DesktopMagicPluginAPI.pdb
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll
index 79c0427..f37461b 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb
index 21cf341..fb65342 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll
index 2573684..1b4a935 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/project.assets.json b/src/DesktopMagicPluginAPI/obj/project.assets.json
index 2e18d0e..b8859ee 100644
--- a/src/DesktopMagicPluginAPI/obj/project.assets.json
+++ b/src/DesktopMagicPluginAPI/obj/project.assets.json
@@ -150,33 +150,31 @@
},
"packageFolders": {
"C:\\Users\\David\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
},
"project": {
"version": "0.0.0.1",
"restore": {
- "projectUniqueName": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectUniqueName": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"projectName": "DesktopMagicPluginAPI",
- "projectPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "projectPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
"packagesPath": "C:\\Users\\David\\.nuget\\packages\\",
- "outputPath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
+ "outputPath": "C:\\Users\\David\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\David\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net5.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "C:\\Users\\David\\AppData\\Roaming\\Cosmos User Kit\\packages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
diff --git a/src/DesktopMagicPluginAPI/obj/project.nuget.cache b/src/DesktopMagicPluginAPI/obj/project.nuget.cache
index 18b0584..11a69cc 100644
--- a/src/DesktopMagicPluginAPI/obj/project.nuget.cache
+++ b/src/DesktopMagicPluginAPI/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "08N26zii9pk9wdNK/Re+ETaT0gBBQc7cOeR/kknBOmCIlaORYvra6ROXT75LPs73/8KHFjccVwCrZ3IluDzQ/g==",
+ "dgSpecHash": "+b7ffutxpVrmCwRmkCKJuA+T1JzbuNT4idwJ6fOh9Wv5DD7Tt6uplsP6zk0Qo5C6IDEHWyhaEa0PPr34upBxbQ==",
"success": true,
- "projectFilePath": "C:\\Users\\David\\Google Drive\\Programmieren\\DesktopMagic\\src\\DesktopMagicPluginAPI\\DesktopMagicPluginAPI.csproj",
+ "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",