Skip to content

Commit 92fa8a8

Browse files
author
Fraser Greenroyd
authored
6.3 Deployment (#470)
2 parents 5ff4d3d + 76ba676 commit 92fa8a8

File tree

7 files changed

+67
-32
lines changed

7 files changed

+67
-32
lines changed

‎.ci/BHoMBot/Nuget/BHoM.UI.nuspec

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package>
3+
<metadata>
4+
<id>BHoM.UI</id>
5+
<version></version>
6+
<authors>BHoM</authors>
7+
<projectUrl>https://github.com/BHoM/BHoM_UI</projectUrl>
8+
<license type="file">licence.txt</license>
9+
<icon>icon.png</icon>
10+
<readme>readme.md</readme>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>Base engine for all BHoM UIs - more information available at https://github.com/BHoM/BHoM_UI</description>
13+
<releaseNotes></releaseNotes>
14+
<copyright></copyright>
15+
<tags>BHoM interop csharp ui aec</tags>
16+
<title></title>
17+
<dependencies>
18+
<group targetFramework="netstandard2.0.0">
19+
</group>
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<file src="licence/licence.txt" target="" />
24+
<file src="images/icon.png" target="" />
25+
<file src="docs/readme.md" target="" />
26+
</files>
27+
</package>

‎.ci/code/UI_Test/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
5757
[assembly: AssemblyVersion("6.0.0.0")]
58-
[assembly: AssemblyFileVersion("6.2.0.0")]
58+
[assembly: AssemblyFileVersion("6.3.0.0")]
5959

‎BHoM_UI/BHoM_UI.csproj

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,47 +32,47 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="Adapter_oM">
35-
<HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
35+
<HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_oM.dll</HintPath>
3636
<Private>False</Private>
3737
<SpecificVersion>False</SpecificVersion>
3838
</Reference>
3939
<Reference Include="BHoM">
40-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
40+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
4141
<Private>False</Private>
4242
<SpecificVersion>False</SpecificVersion>
4343
</Reference>
4444
<Reference Include="BHoM_Adapter">
45-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
45+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Adapter.dll</HintPath>
4646
<Private>False</Private>
4747
<SpecificVersion>False</SpecificVersion>
4848
</Reference>
4949
<Reference Include="BHoM_Engine">
50-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
50+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
5151
<Private>False</Private>
5252
<SpecificVersion>False</SpecificVersion>
5353
</Reference>
5454
<Reference Include="Data_Engine">
55-
<HintPath>C:\ProgramData\BHoM\Assemblies\Data_Engine.dll</HintPath>
55+
<HintPath>$(ProgramData)\BHoM\Assemblies\Data_Engine.dll</HintPath>
5656
<Private>False</Private>
5757
<SpecificVersion>False</SpecificVersion>
5858
</Reference>
5959
<Reference Include="Data_oM">
60-
<HintPath>C:\ProgramData\BHoM\Assemblies\Data_oM.dll</HintPath>
60+
<HintPath>$(ProgramData)\BHoM\Assemblies\Data_oM.dll</HintPath>
6161
<Private>False</Private>
6262
<SpecificVersion>False</SpecificVersion>
6363
</Reference>
6464
<Reference Include="Geometry_Engine">
65-
<HintPath>C:\ProgramData\BHoM\Assemblies\Geometry_Engine.dll</HintPath>
65+
<HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_Engine.dll</HintPath>
6666
<Private>False</Private>
6767
<SpecificVersion>False</SpecificVersion>
6868
</Reference>
6969
<Reference Include="Geometry_oM">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll</HintPath>
71+
<HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_oM.dll</HintPath>
7272
<Private>False</Private>
7373
</Reference>
7474
<Reference Include="Library_Engine">
75-
<HintPath>C:\ProgramData\BHoM\Assemblies\Library_Engine.dll</HintPath>
75+
<HintPath>$(ProgramData)\BHoM\Assemblies\Library_Engine.dll</HintPath>
7676
<Private>False</Private>
7777
<SpecificVersion>False</SpecificVersion>
7878
</Reference>
@@ -83,22 +83,27 @@
8383
<Private>False</Private>
8484
</Reference>
8585
<Reference Include="Programming_oM">
86-
<HintPath>C:\ProgramData\BHoM\Assemblies\Programming_oM.dll</HintPath>
86+
<HintPath>$(ProgramData)\BHoM\Assemblies\Programming_oM.dll</HintPath>
8787
<Private>False</Private>
8888
<SpecificVersion>False</SpecificVersion>
8989
</Reference>
9090
<Reference Include="Quantities_oM">
91-
<HintPath>C:\ProgramData\BHoM\Assemblies\Quantities_oM.dll</HintPath>
91+
<HintPath>$(ProgramData)\BHoM\Assemblies\Quantities_oM.dll</HintPath>
9292
<Private>False</Private>
9393
<SpecificVersion>False</SpecificVersion>
9494
</Reference>
9595
<Reference Include="Reflection_Engine">
96-
<HintPath>C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll</HintPath>
96+
<HintPath>$(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll</HintPath>
9797
<Private>False</Private>
9898
<SpecificVersion>False</SpecificVersion>
9999
</Reference>
100100
<Reference Include="Serialiser_Engine">
101-
<HintPath>C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
101+
<HintPath>$(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
102+
<Private>False</Private>
103+
<SpecificVersion>False</SpecificVersion>
104+
</Reference>
105+
<Reference Include="Settings_Engine">
106+
<HintPath>$(ProgramData)\BHoM\Assemblies\Settings_Engine.dll</HintPath>
102107
<Private>False</Private>
103108
<SpecificVersion>False</SpecificVersion>
104109
</Reference>
@@ -137,16 +142,16 @@
137142
</Reference>
138143
<Reference Include="Test_oM">
139144
<SpecificVersion>False</SpecificVersion>
140-
<HintPath>C:\ProgramData\BHoM\Assemblies\Test_oM.dll</HintPath>
145+
<HintPath>$(ProgramData)\BHoM\Assemblies\Test_oM.dll</HintPath>
141146
<Private>False</Private>
142147
</Reference>
143148
<Reference Include="Versioning_Engine">
144-
<HintPath>C:\ProgramData\BHoM\Assemblies\Versioning_Engine.dll</HintPath>
149+
<HintPath>$(ProgramData)\BHoM\Assemblies\Versioning_Engine.dll</HintPath>
145150
<Private>False</Private>
146151
<SpecificVersion>False</SpecificVersion>
147152
</Reference>
148153
<Reference Include="Versioning_oM">
149-
<HintPath>C:\ProgramData\BHoM\Assemblies\Versioning_oM.dll</HintPath>
154+
<HintPath>$(ProgramData)\BHoM\Assemblies\Versioning_oM.dll</HintPath>
150155
<Private>False</Private>
151156
<SpecificVersion>False</SpecificVersion>
152157
</Reference>
@@ -274,7 +279,7 @@
274279
</ItemGroup>
275280
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
276281
<PropertyGroup>
277-
<PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y</PostBuildEvent>
282+
<PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "$(ProgramData)\BHoM\Assemblies" /Y</PostBuildEvent>
278283
</PropertyGroup>
279284
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
280285
Other similar extension points exist, see Microsoft.Common.targets.

‎BHoM_UI/Global/Initialisation.cs

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
using System.IO;
3232
using System.Linq;
3333
using System.Reflection;
34+
using System.Runtime;
3435
using System.Text;
3536
using System.Threading.Tasks;
3637
using System.Windows;
@@ -67,27 +68,29 @@ public static bool Activate()
6768

6869
public static bool LoadToolkitSettings()
6970
{
70-
if (!Directory.Exists(@"C:\ProgramData\BHoM\Settings"))
71+
string directory = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.CommonApplicationData), "BHoM", "Settings");
72+
if(!Directory.Exists(directory))
7173
{
72-
Engine.Base.Compute.RecordWarning(@"C:\ProgramData\BHoM\Settings doesn't exist. Toolkits setting are not loaded.");
74+
BH.Engine.Base.Compute.RecordWarning($"{directory} doesn't exist. Toolkit settings are not loaded.");
7375
return false;
7476
}
7577

78+
BH.Engine.Settings.Compute.LoadSettings(directory);
79+
BH.Engine.Settings.Compute.LoadSettings(directory, "*.cfg"); //Legacy cfg files to be loaded in
80+
81+
List<ISettings> allSettings = BH.Engine.Settings.Query.GetAllSettings();
82+
List<IInitialisationSettings> initialisationSettings = allSettings.OfType<IInitialisationSettings>().ToList();
83+
7684
bool success = true;
77-
foreach (string file in Directory.GetFiles(@"C:\ProgramData\BHoM\Settings", "*.cfg"))
85+
foreach(var settings in initialisationSettings)
7886
{
7987
try
8088
{
81-
string fileName = Path.GetFileNameWithoutExtension(file);
82-
ISettings settings = Engine.UI.Query.Settings(fileName);
83-
84-
// Initialise the toolkit if needed
85-
if (settings is IInitialisationSettings)
86-
success = InitialiseToolkit(settings as IInitialisationSettings);
89+
success &= InitialiseToolkit(settings);
8790
}
88-
catch (Exception e)
91+
catch(Exception e)
8992
{
90-
Engine.Base.Compute.RecordWarning(@"Failed to load one of the config file. Error:\n" + e.Message);
93+
BH.Engine.Base.Compute.RecordWarning(e, $"Failed to load settings of type {settings.GetType().Name}.");
9194
}
9295
}
9396

‎BHoM_UI/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
5757
[assembly: AssemblyVersion("6.0.0.0")]
58-
[assembly: AssemblyFileVersion("6.2.0.0")]
58+
[assembly: AssemblyFileVersion("6.3.0.0")]
5959

6060

6161

‎UI_Engine/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
5757
[assembly: AssemblyVersion("6.0.0.0")]
58-
[assembly: AssemblyFileVersion("6.2.0.0")]
58+
[assembly: AssemblyFileVersion("6.3.0.0")]
5959

6060

6161

‎UI_oM/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
5757
[assembly: AssemblyVersion("6.0.0.0")]
58-
[assembly: AssemblyFileVersion("6.2.0.0")]
58+
[assembly: AssemblyFileVersion("6.3.0.0")]
5959

6060

6161

0 commit comments

Comments
 (0)