diff --git a/readme.md b/readme.md index c2da482..8aaa849 100644 --- a/readme.md +++ b/readme.md @@ -1,9 +1,9 @@ # Xeno.ToolsHub + Flexible tools launcher desktop app which is "_not your average extensible sidebar_" **_This project is a Work in Progress_** - ||| | --- | --- | | **License** | [![GitHub license](https://img.shields.io/github/license/DamianSuess/ToolsHub.svg)](https://github.com/DamianSuess/ToolsHub/blob/master/LICENSE) | @@ -15,58 +15,67 @@ Flexible tools launcher desktop app which is "_not your average extensible sideb Author: [Damian Suess](https://www.linkedin.com/in/damiansuess/) ## Active Features + * Launch app from System Tray * Add-on extensions via [Mono.Addins](https://github.com/mono/mono-addins) ### Future Features + * Safely send shutdown signals to your add-ons * Launch app from Sidebar (_i.e. RocketDock, ObjectDock_) * Launch app on system startup - ## Use case + ### SystemTray Launcher + * **Status:** Ready * Launch shortcuts (_apps, folders, urls_) directly from SystemTray ### Sidebar Launcher + * **Status:** _n/a_ * (_i.e. RocketDock, ObjectDock_) ### VeraCrypt + * **Status:** WiP * Auto-mount drives on startup * Safely dismount drive on system shutdown to guard against corruption - ## Coding + The framework relies on [Mono.Addins](https://github.com/mono/mono-addins) for extending to add new features. We provide a list of key [extension points](https://github.com/xenoinc/ToolsHub/wiki/Addin-ExtensionPoints) you can attach to. ### Cloning + From a fresh start:
``git clone --recurse-submodules https://github.com/xenoinc/ToolsHub.git`` - If closed and forgot the submodule:
``git submodule update --init --recursive`` ### How to contribute + Read our wiki to learn how to help and make your own add-in. +## Squirrel Updater -# Squirrel Updater See, ``Docs\Squirrel-Usage.md`` for more info. -## Requirements +### Requirements + * NuGet: ``Squirrel.Windows`` * NuGet: ``NuGet.CommandLine`` -## Create Installer (Official) +### Create Installer (Official) + 1. Open command prompt in root of project 2. ``MSBuild /t:MakeInstaller`` 3. **Carefully copy** select output from "Releases" folder to our network share. -## MANUAL Distributing +### MANUAL Distributing + Only perform this method if the **MSBuild** one does not. 1. **VS:** Update the version numbers in ApplicationInfo.cs diff --git a/source/ToolsHub.sln b/source/ToolsHub.sln index 6a55136..373298b 100644 --- a/source/ToolsHub.sln +++ b/source/ToolsHub.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30804.86 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32804.467 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9E14C472-22F2-418B-873E-0F2016A8287A}" ProjectSection(SolutionItems) = preProject @@ -20,13 +20,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeraCryptAddin", "Xeno.Tool EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleXmlAddin", "Xeno.ToolsHub.SampleXmlAddin\SampleXmlAddin.csproj", "{D6EEB528-ACF4-4235-BAED-8D52AB64035B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins", "..\libs\Mono.Addins\Mono.Addins\Mono.Addins.csproj", "{91DD5A2D-9FE3-4C3C-9253-876141874DAD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins", "..\libs\Mono.Addins\Mono.Addins\Mono.Addins.csproj", "{91DD5A2D-9FE3-4C3C-9253-876141874DAD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{F56A5BD1-867B-4826-98D7-BCD527B2F00E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mautil", "..\libs\Mono.Addins\mautil\mautil.csproj", "{EA2F08DC-8289-4A89-A405-1A70D8B4C569}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mautil", "..\libs\Mono.Addins\mautil\mautil.csproj", "{EA2F08DC-8289-4A89-A405-1A70D8B4C569}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Setup", "..\libs\Mono.Addins\Mono.Addins.Setup\Mono.Addins.Setup.csproj", "{A85C9721-C054-4BD8-A1F3-0227615F0A36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins.Setup", "..\libs\Mono.Addins\Mono.Addins.Setup\Mono.Addins.Setup.csproj", "{A85C9721-C054-4BD8-A1F3-0227615F0A36}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleAssmAddin", "Xeno.ToolsHub.SampleAssmAddin\SampleAssmAddin.csproj", "{D7C7DBE9-5AEB-4B1C-99C0-722F5AEF16E2}" EndProject @@ -40,6 +40,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SidebarAddin", "addins\Side EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddinSamples", "AddinSamples", "{08CA5688-B633-46EB-9F75-17D2550482B5}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins.CecilReflector", "..\libs\Mono.Addins\Mono.Addins.CecilReflector\Mono.Addins.CecilReflector.csproj", "{42D1CE65-A14B-4218-B787-58AD7AA68513}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -86,6 +88,10 @@ Global {5728D1EF-2CF9-4D23-933D-35ACDDB38021}.Debug|Any CPU.Build.0 = Debug|Any CPU {5728D1EF-2CF9-4D23-933D-35ACDDB38021}.Release|Any CPU.ActiveCfg = Release|Any CPU {5728D1EF-2CF9-4D23-933D-35ACDDB38021}.Release|Any CPU.Build.0 = Release|Any CPU + {42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -100,6 +106,7 @@ Global {E47834DE-8778-4B90-AF7F-C8A1564D2FAE} = {37DE3F0F-4238-4D03-B6D3-5B27C50BCF42} {8A35B6CD-B222-481D-A73D-8AD73618D223} = {AE268EE2-8ECA-4ABC-A750-84970AFE053E} {5728D1EF-2CF9-4D23-933D-35ACDDB38021} = {AE268EE2-8ECA-4ABC-A750-84970AFE053E} + {42D1CE65-A14B-4218-B787-58AD7AA68513} = {F56A5BD1-867B-4826-98D7-BCD527B2F00E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6B32460D-0DAC-4239-A1B9-A9AF3236C7EC} diff --git a/source/Xeno.ToolsHub.SampleAssmAddin/SampleAssmAddin.csproj b/source/Xeno.ToolsHub.SampleAssmAddin/SampleAssmAddin.csproj index 818dd27..8cb6adf 100644 --- a/source/Xeno.ToolsHub.SampleAssmAddin/SampleAssmAddin.csproj +++ b/source/Xeno.ToolsHub.SampleAssmAddin/SampleAssmAddin.csproj @@ -9,9 +9,10 @@ Properties Xeno.ToolsHub.SampleAssmAddin SampleAssmAddin - v4.6.1 + v4.8 512 true + true diff --git a/source/Xeno.ToolsHub.SampleAssmAddin/app.config b/source/Xeno.ToolsHub.SampleAssmAddin/app.config index b9e4b5c..5e5a48e 100644 --- a/source/Xeno.ToolsHub.SampleAssmAddin/app.config +++ b/source/Xeno.ToolsHub.SampleAssmAddin/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/source/Xeno.ToolsHub.SampleAssmAddin/packages.config b/source/Xeno.ToolsHub.SampleAssmAddin/packages.config index c4bde02..b68eadf 100644 --- a/source/Xeno.ToolsHub.SampleAssmAddin/packages.config +++ b/source/Xeno.ToolsHub.SampleAssmAddin/packages.config @@ -7,7 +7,6 @@ Copyright Xeno Innovations, Inc. 2020 * Description: * --> - \ No newline at end of file diff --git a/source/Xeno.ToolsHub.SampleXmlAddin/SampleXmlAddin.csproj b/source/Xeno.ToolsHub.SampleXmlAddin/SampleXmlAddin.csproj index 5e28a81..549b848 100644 --- a/source/Xeno.ToolsHub.SampleXmlAddin/SampleXmlAddin.csproj +++ b/source/Xeno.ToolsHub.SampleXmlAddin/SampleXmlAddin.csproj @@ -9,9 +9,10 @@ Properties Xeno.ToolsHub.SampleXmlAddin SampleXmlAddin - v4.6.1 + v4.8 512 true + true diff --git a/source/Xeno.ToolsHub.SampleXmlAddin/app.config b/source/Xeno.ToolsHub.SampleXmlAddin/app.config index b9e4b5c..5e5a48e 100644 --- a/source/Xeno.ToolsHub.SampleXmlAddin/app.config +++ b/source/Xeno.ToolsHub.SampleXmlAddin/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/source/Xeno.ToolsHub.SampleXmlAddin/packages.config b/source/Xeno.ToolsHub.SampleXmlAddin/packages.config index c4bde02..b68eadf 100644 --- a/source/Xeno.ToolsHub.SampleXmlAddin/packages.config +++ b/source/Xeno.ToolsHub.SampleXmlAddin/packages.config @@ -7,7 +7,6 @@ Copyright Xeno Innovations, Inc. 2020 * Description: * --> - \ No newline at end of file diff --git a/source/Xeno.ToolsHub.Tests/Xeno.ToolsHub.Tests.csproj b/source/Xeno.ToolsHub.Tests/Xeno.ToolsHub.Tests.csproj index 15ea5eb..11c82a2 100644 --- a/source/Xeno.ToolsHub.Tests/Xeno.ToolsHub.Tests.csproj +++ b/source/Xeno.ToolsHub.Tests/Xeno.ToolsHub.Tests.csproj @@ -10,7 +10,7 @@ Properties Xeno.ToolsHub.Tests Xeno.ToolsHub.Tests - v4.6.1 + v4.8 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 @@ -20,6 +20,7 @@ UnitTest + true diff --git a/source/Xeno.ToolsHub.Tests/app.config b/source/Xeno.ToolsHub.Tests/app.config index 6b8d9f6..968ce89 100644 --- a/source/Xeno.ToolsHub.Tests/app.config +++ b/source/Xeno.ToolsHub.Tests/app.config @@ -1,4 +1,4 @@ - + - - - + + - \ No newline at end of file + diff --git a/source/Xeno.ToolsHub.VeraCryptAddin/App.config b/source/Xeno.ToolsHub.VeraCryptAddin/App.config index 5bb4878..56c522b 100644 --- a/source/Xeno.ToolsHub.VeraCryptAddin/App.config +++ b/source/Xeno.ToolsHub.VeraCryptAddin/App.config @@ -1,14 +1,14 @@ - + - + - - + + - \ No newline at end of file + diff --git a/source/Xeno.ToolsHub.VeraCryptAddin/VeraCryptAddin.csproj b/source/Xeno.ToolsHub.VeraCryptAddin/VeraCryptAddin.csproj index bf56208..9f05bd9 100644 --- a/source/Xeno.ToolsHub.VeraCryptAddin/VeraCryptAddin.csproj +++ b/source/Xeno.ToolsHub.VeraCryptAddin/VeraCryptAddin.csproj @@ -8,9 +8,10 @@ Library Xeno.ToolsHub.VeraCryptAddin VeraCryptAddin - v4.6.1 + v4.8 512 true + AnyCPU diff --git a/source/Xeno.ToolsHub.VeraCryptAddin/packages.config b/source/Xeno.ToolsHub.VeraCryptAddin/packages.config index c4bde02..b68eadf 100644 --- a/source/Xeno.ToolsHub.VeraCryptAddin/packages.config +++ b/source/Xeno.ToolsHub.VeraCryptAddin/packages.config @@ -7,7 +7,6 @@ Copyright Xeno Innovations, Inc. 2020 * Description: * --> - \ No newline at end of file diff --git a/source/Xeno.ToolsHub/App.config b/source/Xeno.ToolsHub/App.config index b8dbd64..fd677b9 100644 --- a/source/Xeno.ToolsHub/App.config +++ b/source/Xeno.ToolsHub/App.config @@ -1,4 +1,4 @@ - + - - + - - + + - \ No newline at end of file + diff --git a/source/Xeno.ToolsHub/Program.cs b/source/Xeno.ToolsHub/Program.cs index 8100c5e..99d32e7 100644 --- a/source/Xeno.ToolsHub/Program.cs +++ b/source/Xeno.ToolsHub/Program.cs @@ -13,7 +13,9 @@ namespace Xeno.ToolsHub using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; - using Squirrel; +#if USE_SQUIRREL + ////using Squirrel; +#endif using Xeno.ToolsHub.Config; using Xeno.ToolsHub.Services.Logging; @@ -73,45 +75,51 @@ private static async Task SquirrelAutoUpdateAsync() //// Log.Error($"Error attempting to set network creds for update location. Ex: {ex.Message}"); ////} - try - { - ReleaseEntry release = null; - - // TODO: Network creds https://github.com/Squirrel/Squirrel.Windows/issues/946 - using (var mgr = new UpdateManager(Constants.RemoteUpdateStablePath)) - { - SquirrelAwareApp.HandleEvents( - onInitialInstall: _ => mgr.CreateShortcutForThisExe(), - onAppUpdate: _ => mgr.CreateShortcutForThisExe(), - onAppUninstall: _ => mgr.RemoveShortcutForThisExe(), - onFirstRun: SquirrelWelcomeMessage); - - UpdateInfo updateInfo = await mgr.CheckForUpdate(); - if (updateInfo.ReleasesToApply.Any()) - { - Log.Debug("Update found! Applying it to application..."); - release = await mgr.UpdateApp(); - } - else - { - Log.Debug("No updates found in repository."); - } - } - - if (release != null) - { - Log.Debug("Restarting application..."); - UpdateManager.RestartApp(); - } - else - { - Log.Debug("No updates are required."); - } - } - catch (Exception exUpdate) - { - Log.Error($"Issue looking for updates. {exUpdate.Message}"); - } + await Task.Yield(); + +#if USE_SQUIRREL + ////try + ////{ + //// ReleaseEntry release = null; + //// + //// // TODO: Network creds https://github.com/Squirrel/Squirrel.Windows/issues/946 + //// using (var mgr = new UpdateManager(Constants.RemoteUpdateStablePath)) + //// { + //// SquirrelAwareApp.HandleEvents( + //// onInitialInstall: _ => mgr.CreateShortcutForThisExe(), + //// onAppUpdate: _ => mgr.CreateShortcutForThisExe(), + //// onAppUninstall: _ => mgr.RemoveShortcutForThisExe(), + //// onFirstRun: SquirrelWelcomeMessage); + //// + //// UpdateInfo updateInfo = await mgr.CheckForUpdate(); + //// if (updateInfo.ReleasesToApply.Any()) + //// { + //// Log.Debug("Update found! Applying it to application..."); + //// release = await mgr.UpdateApp(); + //// } + //// else + //// { + //// Log.Debug("No updates found in repository."); + //// } + //// } + //// + //// if (release != null) + //// { + //// Log.Debug("Restarting application..."); + //// UpdateManager.RestartApp(); + //// } + //// else + //// { + //// Log.Debug("No updates are required."); + //// } + ////} + ////catch (Exception exUpdate) + ////{ + //// Log.Error($"Issue looking for updates. {exUpdate.Message}"); + ////} +#else + Log.Debug($"Squirrel Updater is not enabled."); +#endif } private static void SquirrelWelcomeMessage() diff --git a/source/Xeno.ToolsHub/Properties/Resources.Designer.cs b/source/Xeno.ToolsHub/Properties/Resources.Designer.cs index f5c361a..ccf9777 100644 --- a/source/Xeno.ToolsHub/Properties/Resources.Designer.cs +++ b/source/Xeno.ToolsHub/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Xeno.ToolsHub.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/source/Xeno.ToolsHub/Properties/Settings.Designer.cs b/source/Xeno.ToolsHub/Properties/Settings.Designer.cs index b8f4c42..4e7ea84 100644 --- a/source/Xeno.ToolsHub/Properties/Settings.Designer.cs +++ b/source/Xeno.ToolsHub/Properties/Settings.Designer.cs @@ -1,12 +1,4 @@ -/* Copyright Xeno Innovations, Inc. 2018 - * Date: 2018-7-17 - * Author: Damian Suess - * File: Settings.Designer.cs - * Description: - * - */ - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -16,23 +8,19 @@ // //------------------------------------------------------------------------------ -namespace Xeno.ToolsHub.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } +namespace Xeno.ToolsHub.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } } - } } diff --git a/source/Xeno.ToolsHub/Xeno.ToolsHub.csproj b/source/Xeno.ToolsHub/Xeno.ToolsHub.csproj index 5fd3d32..5c79a69 100644 --- a/source/Xeno.ToolsHub/Xeno.ToolsHub.csproj +++ b/source/Xeno.ToolsHub/Xeno.ToolsHub.csproj @@ -1,6 +1,5 @@  - Debug @@ -9,11 +8,12 @@ WinExe Xeno.ToolsHub ToolsHub - v4.6.1 + v4.8 512 true + AnyCPU @@ -63,18 +63,12 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\squirrel.windows.2.0.1\lib\Net45\NuGet.Squirrel.dll - ..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll ..\packages\Splat.1.6.2\lib\Net45\Splat.dll - - ..\packages\squirrel.windows.2.0.1\lib\Net45\Squirrel.dll - @@ -238,10 +232,4 @@ - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/source/Xeno.ToolsHub/packages.config b/source/Xeno.ToolsHub/packages.config index fb9494d..fb0d1b8 100644 --- a/source/Xeno.ToolsHub/packages.config +++ b/source/Xeno.ToolsHub/packages.config @@ -15,6 +15,5 @@ Copyright Xeno Innovations, Inc. 2018 - \ No newline at end of file diff --git a/source/addins/PomodoroAddin/PomodoroAddin.csproj b/source/addins/PomodoroAddin/PomodoroAddin.csproj index 76b8a93..7f7bd9e 100644 --- a/source/addins/PomodoroAddin/PomodoroAddin.csproj +++ b/source/addins/PomodoroAddin/PomodoroAddin.csproj @@ -9,9 +9,10 @@ Properties PomodoroAddin PomodoroAddin - v4.6.1 + v4.8 512 true + true diff --git a/source/addins/PomodoroAddin/app.config b/source/addins/PomodoroAddin/app.config index b9e4b5c..5e5a48e 100644 --- a/source/addins/PomodoroAddin/app.config +++ b/source/addins/PomodoroAddin/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/source/addins/SidebarAddin/Properties/Resources.Designer.cs b/source/addins/SidebarAddin/Properties/Resources.Designer.cs index 209a190..8d14449 100644 --- a/source/addins/SidebarAddin/Properties/Resources.Designer.cs +++ b/source/addins/SidebarAddin/Properties/Resources.Designer.cs @@ -9,6 +9,7 @@ //------------------------------------------------------------------------------ namespace Xeno.ToolsHub.SidebarAddin.Properties { + using System; /// @@ -18,7 +19,7 @@ namespace Xeno.ToolsHub.SidebarAddin.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -37,7 +38,7 @@ internal Resources() { [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { - if ((resourceMan == null)) { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xeno.ToolsHub.SidebarAddin.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } diff --git a/source/addins/SidebarAddin/Properties/Settings.Designer.cs b/source/addins/SidebarAddin/Properties/Settings.Designer.cs index 53bc0db..e985dea 100644 --- a/source/addins/SidebarAddin/Properties/Settings.Designer.cs +++ b/source/addins/SidebarAddin/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace Xeno.ToolsHub.SidebarAddin.Properties -{ +namespace Xeno.ToolsHub.SidebarAddin.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - public static Settings Default - { - get - { + public static Settings Default { + get { return defaultInstance; } } diff --git a/source/addins/SidebarAddin/SidebarAddin.csproj b/source/addins/SidebarAddin/SidebarAddin.csproj index 44926d2..4a09204 100644 --- a/source/addins/SidebarAddin/SidebarAddin.csproj +++ b/source/addins/SidebarAddin/SidebarAddin.csproj @@ -8,11 +8,12 @@ library Xeno.ToolsHub.SidebarAddin SidebarAddin - v4.6.1 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + true diff --git a/source/addins/SidebarAddin/app.config b/source/addins/SidebarAddin/app.config index b9e4b5c..5e5a48e 100644 --- a/source/addins/SidebarAddin/app.config +++ b/source/addins/SidebarAddin/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file +