From d4ce57ef997e43f6bf254237143215293033a4ad Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Fri, 23 Jun 2023 19:36:24 +0100 Subject: [PATCH 1/5] Upgrade AssemblyFileVersion to 6.3.0.0 --- .ci/code/UI_Test/Properties/AssemblyInfo.cs | 2 +- BHoM_UI/Properties/AssemblyInfo.cs | 2 +- UI_Engine/Properties/AssemblyInfo.cs | 2 +- UI_oM/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/code/UI_Test/Properties/AssemblyInfo.cs b/.ci/code/UI_Test/Properties/AssemblyInfo.cs index 755df57..211dcd2 100644 --- a/.ci/code/UI_Test/Properties/AssemblyInfo.cs +++ b/.ci/code/UI_Test/Properties/AssemblyInfo.cs @@ -55,5 +55,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.0.0")] diff --git a/BHoM_UI/Properties/AssemblyInfo.cs b/BHoM_UI/Properties/AssemblyInfo.cs index 5239910..01aa99b 100644 --- a/BHoM_UI/Properties/AssemblyInfo.cs +++ b/BHoM_UI/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.0.0")] diff --git a/UI_Engine/Properties/AssemblyInfo.cs b/UI_Engine/Properties/AssemblyInfo.cs index b3dde0b..01772ba 100644 --- a/UI_Engine/Properties/AssemblyInfo.cs +++ b/UI_Engine/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.0.0")] diff --git a/UI_oM/Properties/AssemblyInfo.cs b/UI_oM/Properties/AssemblyInfo.cs index c247a08..34b1df2 100644 --- a/UI_oM/Properties/AssemblyInfo.cs +++ b/UI_oM/Properties/AssemblyInfo.cs @@ -55,7 +55,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.3.0.0")] From c5056ee084020a12553a0cdc392ec66e7b30d42e Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Fri, 14 Jul 2023 14:41:57 +0100 Subject: [PATCH 2/5] Add nuspec template file --- .ci/BHoMBot/Nuget/BHoM.UI.nuspec | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .ci/BHoMBot/Nuget/BHoM.UI.nuspec diff --git a/.ci/BHoMBot/Nuget/BHoM.UI.nuspec b/.ci/BHoMBot/Nuget/BHoM.UI.nuspec new file mode 100644 index 0000000..163b0f9 --- /dev/null +++ b/.ci/BHoMBot/Nuget/BHoM.UI.nuspec @@ -0,0 +1,27 @@ + + + + BHoM.UI + + BHoM + https://github.com/BHoM/BHoM_UI + licence.txt + icon.png + readme.md + false + Base engine for all BHoM UIs - more information available at https://github.com/BHoM/BHoM_UI + + + BHoM interop csharp ui aec + + + + + + + + + + + + \ No newline at end of file From 99df5e639d04020627cccb6145d0dd0546618823 Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Thu, 24 Aug 2023 16:09:13 +0100 Subject: [PATCH 3/5] Ensure settings load when UI is loaded. --- BHoM_UI/BHoM_UI.csproj | 3 +++ BHoM_UI/Global/Initialisation.cs | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/BHoM_UI/BHoM_UI.csproj b/BHoM_UI/BHoM_UI.csproj index 99c7719..30eac8b 100644 --- a/BHoM_UI/BHoM_UI.csproj +++ b/BHoM_UI/BHoM_UI.csproj @@ -102,6 +102,9 @@ False False + + ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Settings_Engine.dll + False diff --git a/BHoM_UI/Global/Initialisation.cs b/BHoM_UI/Global/Initialisation.cs index b57346b..0d8b5c7 100644 --- a/BHoM_UI/Global/Initialisation.cs +++ b/BHoM_UI/Global/Initialisation.cs @@ -31,6 +31,7 @@ using System.IO; using System.Linq; using System.Reflection; +using System.Runtime; using System.Text; using System.Threading.Tasks; using System.Windows; @@ -67,27 +68,29 @@ public static bool Activate() public static bool LoadToolkitSettings() { - if (!Directory.Exists(@"C:\ProgramData\BHoM\Settings")) + string directory = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.CommonApplicationData), "BHoM", "Settings"); + if(!Directory.Exists(directory)) { - Engine.Base.Compute.RecordWarning(@"C:\ProgramData\BHoM\Settings doesn't exist. Toolkits setting are not loaded."); + BH.Engine.Base.Compute.RecordWarning($"{directory} doesn't exist. Toolkit settings are not loaded."); return false; } + BH.Engine.Settings.Compute.LoadSettings(directory); + BH.Engine.Settings.Compute.LoadSettings(directory, "*.cfg"); //Legacy cfg files to be loaded in + + List allSettings = BH.Engine.Settings.Query.GetAllSettings(); + List initialisationSettings = allSettings.OfType().ToList(); + bool success = true; - foreach (string file in Directory.GetFiles(@"C:\ProgramData\BHoM\Settings", "*.cfg")) + foreach(var settings in initialisationSettings) { try { - string fileName = Path.GetFileNameWithoutExtension(file); - ISettings settings = Engine.UI.Query.Settings(fileName); - - // Initialise the toolkit if needed - if (settings is IInitialisationSettings) - success = InitialiseToolkit(settings as IInitialisationSettings); + success &= InitialiseToolkit(settings); } - catch (Exception e) + catch(Exception e) { - Engine.Base.Compute.RecordWarning(@"Failed to load one of the config file. Error:\n" + e.Message); + BH.Engine.Base.Compute.RecordWarning(e, $"Failed to load settings of type {settings.GetType().Name}."); } } From 06d7fe3bed30773fab294824b78366dd482618ed Mon Sep 17 00:00:00 2001 From: Fraser Greenroyd Date: Thu, 24 Aug 2023 16:12:28 +0100 Subject: [PATCH 4/5] Update project compliance --- BHoM_UI/BHoM_UI.csproj | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/BHoM_UI/BHoM_UI.csproj b/BHoM_UI/BHoM_UI.csproj index 30eac8b..0d21f3b 100644 --- a/BHoM_UI/BHoM_UI.csproj +++ b/BHoM_UI/BHoM_UI.csproj @@ -32,47 +32,47 @@ - C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll + $(ProgramData)\BHoM\Assemblies\Adapter_oM.dll False False - C:\ProgramData\BHoM\Assemblies\BHoM.dll + $(ProgramData)\BHoM\Assemblies\BHoM.dll False False - C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll + $(ProgramData)\BHoM\Assemblies\BHoM_Adapter.dll False False - C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll + $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll False False - C:\ProgramData\BHoM\Assemblies\Data_Engine.dll + $(ProgramData)\BHoM\Assemblies\Data_Engine.dll False False - C:\ProgramData\BHoM\Assemblies\Data_oM.dll + $(ProgramData)\BHoM\Assemblies\Data_oM.dll False False - C:\ProgramData\BHoM\Assemblies\Geometry_Engine.dll + $(ProgramData)\BHoM\Assemblies\Geometry_Engine.dll False False False - C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll + $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll False - C:\ProgramData\BHoM\Assemblies\Library_Engine.dll + $(ProgramData)\BHoM\Assemblies\Library_Engine.dll False False @@ -83,27 +83,27 @@ False - C:\ProgramData\BHoM\Assemblies\Programming_oM.dll + $(ProgramData)\BHoM\Assemblies\Programming_oM.dll False False - C:\ProgramData\BHoM\Assemblies\Quantities_oM.dll + $(ProgramData)\BHoM\Assemblies\Quantities_oM.dll False False - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll + $(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll False False - C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll + $(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll False False - ..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Settings_Engine.dll + $(ProgramData)\BHoM\Assemblies\Settings_Engine.dll False @@ -140,16 +140,16 @@ False - C:\ProgramData\BHoM\Assemblies\Test_oM.dll + $(ProgramData)\BHoM\Assemblies\Test_oM.dll False - C:\ProgramData\BHoM\Assemblies\Versioning_Engine.dll + $(ProgramData)\BHoM\Assemblies\Versioning_Engine.dll False False - C:\ProgramData\BHoM\Assemblies\Versioning_oM.dll + $(ProgramData)\BHoM\Assemblies\Versioning_oM.dll False False @@ -277,7 +277,7 @@ - xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y + xcopy "$(TargetDir)$(TargetFileName)" "$(ProgramData)\BHoM\Assemblies" /Y