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..386b589 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..0d43cf9 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..6ca7604 100644 Binary files a/src/DesktopMagic.Installer/DesktopMagic.exe and b/src/DesktopMagic.Installer/DesktopMagic.exe differ diff --git a/src/DesktopMagic.Installer/Installer.iss b/src/DesktopMagic.Installer/Installer.iss index 7b36095..8f843af 100644 --- a/src/DesktopMagic.Installer/Installer.iss +++ b/src/DesktopMagic.Installer/Installer.iss @@ -37,7 +37,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip [Files] Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\DesktopMagic\bin\Release\net5.0-windows\AlwaysUpToDate.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\DesktopMagic\bin\Release\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.deps.json"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -64,7 +64,6 @@ Source: "..\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinMM.dll"; DestDir: Source: "..\DesktopMagic\bin\Release\net5.0-windows\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Drawing.Common.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Management.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Text.Json.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll"; DestDir: "{app}"; Flags: ignoreversion diff --git a/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll b/src/DesktopMagic.Installer/bin/Debug/net5.0/DesktopMagic.Installer.dll index f7f4eb4..17c26f1 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..40ba353 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/Debug/net5.0/Installer.iss b/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss index 7b36095..8f843af 100644 --- a/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss +++ b/src/DesktopMagic.Installer/bin/Debug/net5.0/Installer.iss @@ -37,7 +37,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip [Files] Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\DesktopMagic\bin\Release\net5.0-windows\AlwaysUpToDate.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\DesktopMagic\bin\Release\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.deps.json"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -64,7 +64,6 @@ Source: "..\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinMM.dll"; DestDir: Source: "..\DesktopMagic\bin\Release\net5.0-windows\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Drawing.Common.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Management.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Text.Json.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll"; DestDir: "{app}"; Flags: ignoreversion diff --git a/src/DesktopMagic.Installer/bin/Release/net5.0/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/bin/Release/net5.0/Installer.iss b/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss index 7b36095..8f843af 100644 --- a/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss +++ b/src/DesktopMagic.Installer/bin/Release/net5.0/Installer.iss @@ -37,7 +37,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip [Files] Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\DesktopMagic\bin\Release\net5.0-windows\AlwaysUpToDate.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\DesktopMagic\bin\Release\net5.0-windows\Stone_Red-C-Sharp-Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.deps.json"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\DesktopMagic.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -64,7 +64,6 @@ Source: "..\DesktopMagic\bin\Release\net5.0-windows\NAudio.WinMM.dll"; DestDir: Source: "..\DesktopMagic\bin\Release\net5.0-windows\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Drawing.Common.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Management.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\DesktopMagic\bin\Release\net5.0-windows\System.Text.Json.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\DesktopMagic\bin\Release\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.dll"; DestDir: "{app}"; Flags: ignoreversion diff --git a/src/DesktopMagic.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..17c26f1 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..40ba353 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..e4f83d8 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": { @@ -60,7 +59,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.303\\RuntimeIdentifierGraph.json" } } } 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..ee1cdb4 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": { @@ -68,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.303\\RuntimeIdentifierGraph.json" } } } diff --git a/src/DesktopMagic.Installer/obj/project.nuget.cache b/src/DesktopMagic.Installer/obj/project.nuget.cache index 284c2ed..e2b81a3 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": "M19ffigmz4ZI/nqmigxCLhAQXqCqmN/tdMxvwHkoPFkKupgAOrF0uyrX7vGIM7ELR2H6H5gs5HXNWWRNN6xudg==", "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..63bd82b 100644 --- a/src/DesktopMagic/CalendarManagment.cs +++ b/src/DesktopMagic/CalendarManagment.cs @@ -12,8 +12,6 @@ namespace DesktopMagic { internal class CalendarManagment { - // If Pluginifying these scopes, delete your previously saved credentials - // at ~/.credentials/calendar-dotnet-quickstart.json private static string[] Scopes = { CalendarService.Scope.CalendarReadonly }; private static string ApplicationName = "Google Calendar API .NET " + MainWindow.AppName; @@ -24,6 +22,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 b/src/DesktopMagic/DesktopMagic.csproj index 400c497..71ed275 100644 --- a/src/DesktopMagic/DesktopMagic.csproj +++ b/src/DesktopMagic/DesktopMagic.csproj @@ -15,12 +15,12 @@ - + diff --git a/src/DesktopMagic/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/InputDialog.xaml b/src/DesktopMagic/InputDialog.xaml index 8733e86..790377a 100644 --- a/src/DesktopMagic/InputDialog.xaml +++ b/src/DesktopMagic/InputDialog.xaml @@ -8,9 +8,13 @@ Title="InputDialog" Height="152.812" Width="322.812" ResizeMode="NoResize"> -