Skip to content

Commit 02f079d

Browse files
al-fisheral-fisher
authored
8.1 Deployment (#507)
2 parents 81ea180 + 6a0d68a commit 02f079d

File tree

125 files changed

+579
-907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+579
-907
lines changed

‎.ci/code/UI_Test/Helpers/InstantiateCaller.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -93,3 +93,4 @@ public static Caller InstantiateCaller(Type type)
9393

9494

9595

96+

‎.ci/code/UI_Test/Helpers/PossibleComponentItems.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -48,3 +48,4 @@ public static List<SearchItem> PossibleComponentItems()
4848

4949

5050

51+

‎.ci/code/UI_Test/Objects/DummyAccessor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -131,3 +131,4 @@ private T GetDummyObject<T>()
131131

132132

133133

134+

‎.ci/code/UI_Test/Objects/DummyCaller.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -77,3 +77,4 @@ public override object Run(List<object> inputs)
7777

7878

7979

80+

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -55,6 +55,7 @@
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
5757
[assembly: AssemblyVersion("8.0.0.0")]
58-
[assembly: AssemblyFileVersion("8.0.0.0")]
58+
[assembly: AssemblyFileVersion("8.1.0.0")]
59+
5960

6061

‎.ci/code/UI_Test/Verify/ComponentInstantiation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -88,3 +88,4 @@ public static TestResult ComponentInstantiation(SearchItem item)
8888

8989

9090

91+

‎.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -134,3 +134,4 @@ public static TestResult ComponentReadWriteCycle(SearchItem item)
134134

135135

136136

137+

‎.ci/code/UI_Test/Verify/ComponentRunCycle.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -146,3 +146,4 @@ public static TestResult ComponentRunCycle(SearchItem item)
146146

147147

148148

149+

‎BHoM_UI/BHoM_UI.csproj

Lines changed: 25 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{69F4F042-E23A-4673-AB32-3D787CFA976C}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>BH.UI</RootNamespace>
11-
<AssemblyName>BHoM_UI</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>..\Build\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>..\Build\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net472</TargetFramework>
5+
<AssemblyVersion>8.0.0.0</AssemblyVersion>
6+
<Description>https://github.com/BHoM/BHoM_UI</Description>
7+
<Version>5.0.0</Version>
8+
<Authors>BHoM</Authors>
9+
<Copyright>Copyright © https://github.com/BHoM</Copyright>
10+
<RootNamespace>BH.UI</RootNamespace>
11+
<FileVersion>8.1.0.0</FileVersion>
12+
<OutputPath>..\Build\</OutputPath>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\UI_Engine\UI_Engine.csproj" />
17+
<ProjectReference Include="..\UI_oM\UI_oM.csproj" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
3421
<Reference Include="Adapter_oM">
3522
<HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_oM.dll</HintPath>
3623
<Private>False</Private>
@@ -159,137 +146,9 @@
159146
<Private>False</Private>
160147
</Reference>
161148
</ItemGroup>
162-
<ItemGroup>
163-
<Compile Include="Caller\IO_CRUD.cs" />
164-
<Compile Include="Caller\AddToMenu.cs" />
165-
<Compile Include="Caller\Read.cs" />
166-
<Compile Include="Caller\Compile.cs" />
167-
<Compile Include="Caller\SetParamSelectionMenu.cs" />
168-
<Compile Include="Caller\SetOutputs.cs" />
169-
<Compile Include="Caller\SetInputs.cs" />
170-
<Compile Include="Caller\SetComponentDetails.cs" />
171-
<Compile Include="CallerTemplates\MultiChoiceCaller.cs" />
172-
<Compile Include="Caller\Write.cs" />
173-
<Compile Include="Caller\SetItem.cs" />
174-
<Compile Include="Caller\Run.cs" />
175-
<Compile Include="Components\Engine\External.cs" />
176-
<Compile Include="Components\Adapter\CreateRequest.cs" />
177-
<Compile Include="Components\Adapter\CreateAdapter.cs" />
178-
<Compile Include="Components\Adapter\Move.cs" />
179-
<Compile Include="Components\Adapter\Execute.cs" />
180-
<Compile Include="Components\Adapter\Pull.cs" />
181-
<Compile Include="Components\Adapter\Remove.cs" />
182-
<Compile Include="Components\Adapter\Push.cs" />
183-
<Compile Include="Components\Engine\Explode.cs" />
184-
<Compile Include="Components\Engine\GetEvents.cs" />
185-
<Compile Include="Components\Engine\GetInfo.cs" />
186-
<Compile Include="Components\Engine\Query.cs" />
187-
<Compile Include="Components\Engine\Modify.cs" />
188-
<Compile Include="Components\Engine\Convert.cs" />
189-
<Compile Include="Components\Engine\Compute.cs" />
190-
<Compile Include="Components\Engine\SetProperty.cs" />
191-
<Compile Include="Components\Engine\GetProperty.cs" />
192-
<Compile Include="Components\Engine\FromJson.cs" />
193-
<Compile Include="Components\Engine\ToJson.cs" />
194-
<Compile Include="Components\oM\CreateCustom.cs" />
195-
<Compile Include="Components\oM\CreateData.cs" />
196-
<Compile Include="Components\oM\CreateEnum.cs" />
197-
<Compile Include="Components\oM\CreateType.cs" />
198-
<Compile Include="Components\oM\CreateObject.cs" />
199-
<Compile Include="Components\oM\CreateDictionary.cs" />
200-
<Compile Include="Components\UI\FalseStartToggle.cs" />
201-
<Compile Include="Components\UI\UnitTest.cs" />
202-
<Compile Include="Global\DocumentListener.cs" />
203-
<Compile Include="Global\Initialisation.cs" />
204-
<Compile Include="Global\GlobalSearch.cs" />
205-
<Compile Include="Global\SearchMenu.cs" />
206-
<Compile Include="Global\SearchMenu_WinForm.cs" />
207-
<Compile Include="Global\SearchMenu_Wpf.cs" />
208-
<Compile Include="Menus\ParamSelectorMenu.cs" />
209-
<Compile Include="Menus\IItemSelectorMenu.cs" />
210-
<Compile Include="Menus\ItemSelector.cs" />
211-
<Compile Include="Caller\Core.cs" />
212-
<Compile Include="Properties\AssemblyInfo.cs" />
213-
<Compile Include="Properties\Resources.Designer.cs" />
214-
<Compile Include="Menus\ItemSelectorMenu.cs" />
215-
<Compile Include="Menus\ItemSelectorMenu_WinForm.cs" />
216-
<Compile Include="Menus\ItemSelectorMenu_Wpf.cs" />
217-
</ItemGroup>
218-
<ItemGroup>
219-
<EmbeddedResource Include="Properties\Resources.resx">
220-
<SubType>Designer</SubType>
221-
</EmbeddedResource>
222-
</ItemGroup>
223-
<ItemGroup>
224-
<Content Include="Properties\Resources\Adapter.png" />
225-
<Content Include="Properties\Resources\BHoM_Alligator_Icon.png" />
226-
<Content Include="Properties\Resources\BHoM_BHoM_Object.png" />
227-
<Content Include="Properties\Resources\BHoM_Create_CustomData.png" />
228-
<Content Include="Properties\Resources\BHoM_Filter.png" />
229-
<Content Include="Properties\Resources\BHoM_FromJSON.png" />
230-
<Content Include="Properties\Resources\BHoM_GetProperty.png" />
231-
<Content Include="Properties\Resources\BHoM_GetPropertyNames.png" />
232-
<None Include="Properties\Resources\BHoM_Logo.png" />
233-
<None Include="Properties\Resources\BHoM_Icon.ico" />
234-
<Content Include="Properties\Resources\BHoM_Read _CustomData.png" />
235-
<Content Include="Properties\Resources\BHoM_SetProperty.png" />
236-
<Content Include="Properties\Resources\BHoM_ToJSON.png" />
237-
<Content Include="Properties\Resources\BooleanToggleOff.png" />
238-
<Content Include="Properties\Resources\BooleanToggleOn.png" />
239-
<Content Include="Properties\Resources\BS_Script.png" />
240-
<Content Include="Properties\Resources\Compute.png" />
241-
<Content Include="Properties\Resources\Convert.png" />
242-
<Content Include="Properties\Resources\CreateBHoM.png" />
243-
<Content Include="Properties\Resources\CustomObject.png" />
244-
<Content Include="Properties\Resources\Data.png" />
245-
<Content Include="Properties\Resources\Delete.png" />
246-
<Content Include="Properties\Resources\Dictionary.png" />
247-
<Content Include="Properties\Resources\Empty.png" />
248-
<Content Include="Properties\Resources\Enum.png" />
249-
<Content Include="Properties\Resources\Execute.png" />
250-
<Content Include="Properties\Resources\Explode.png" />
251-
<Content Include="Properties\Resources\External.png" />
252-
<Content Include="Properties\Resources\FromJson.png" />
253-
<Content Include="Properties\Resources\gator.png" />
254-
<None Include="Properties\Resources\GetEvents.png" />
255-
<Content Include="Properties\Resources\GetInfo.png" />
256-
<Content Include="Properties\Resources\Modify.png" />
257-
<Content Include="Properties\Resources\Move.png" />
258-
<None Include="Properties\Resources\newBooleanToggle.png" />
259-
<Content Include="Properties\Resources\Pull.png" />
260-
<Content Include="Properties\Resources\Push.png" />
261-
<Content Include="Properties\Resources\Query.png" />
262-
<Content Include="Properties\Resources\CreateRequest.png" />
263-
<Content Include="Properties\Resources\RunCode.png" />
264-
<Content Include="Properties\Resources\ToJson.png" />
265-
<Content Include="Properties\Resources\Type.png" />
266-
<None Include="Properties\Resources\UnitTest.png" />
267-
<Content Include="Properties\Resources\UpdateProperty.png" />
268-
<Content Include="Properties\Resources\VBH_Script.png" />
269-
<Content Include="Properties\Resources\VS_Script.png" />
270-
</ItemGroup>
271-
<ItemGroup />
272-
<ItemGroup>
273-
<ProjectReference Include="..\UI_Engine\UI_Engine.csproj">
274-
<Project>{565ddbd0-5c04-4be9-b57d-ce54c2124abb}</Project>
275-
<Name>UI_Engine</Name>
276-
<Private>False</Private>
277-
</ProjectReference>
278-
<ProjectReference Include="..\UI_oM\UI_oM.csproj">
279-
<Project>{50d4c1ed-c16c-4365-a742-938bf49ec4b0}</Project>
280-
<Name>UI_oM</Name>
281-
<Private>False</Private>
282-
</ProjectReference>
283-
</ItemGroup>
284-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
285-
<PropertyGroup>
286-
<PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "$(ProgramData)\BHoM\Assemblies" /Y</PostBuildEvent>
287-
</PropertyGroup>
288-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
289-
Other similar extension points exist, see Microsoft.Common.targets.
290-
<Target Name="BeforeBuild">
291-
</Target>
292-
<Target Name="AfterBuild">
293-
</Target>
294-
-->
149+
150+
151+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
152+
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y" />
153+
</Target>
295154
</Project>

‎BHoM_UI/Caller/AddToMenu.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -83,3 +83,4 @@ public void SetSelectorMenu<M>(ItemSelectorMenu<M> selectorMenu)
8383

8484

8585

86+

‎BHoM_UI/Caller/Compile.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -51,7 +51,7 @@ protected virtual void CompileInputGetters()
5151
for (int index = 0; index < InputParams.Count; index++)
5252
{
5353
ParamInfo param = InputParams[index];
54-
Func<IDataAccessor, int, object> func = Engine.UI.Create.InputAccessor(accessorType, param.DataType);
54+
Func<IDataAccessor, int, object> func = Engine.UI.Compute.InputAccessor(accessorType, param.DataType);
5555
m_CompiledGetters.Add(func);
5656
}
5757
}
@@ -69,7 +69,7 @@ protected virtual void CompileOutputSetters()
6969
for (int index = 0; index < OutputParams.Count; index++)
7070
{
7171
ParamInfo param = OutputParams[index];
72-
Func<IDataAccessor, object, int, bool> function = Engine.UI.Create.OutputAccessor(accessorType, param.DataType);
72+
Func<IDataAccessor, object, int, bool> function = Engine.UI.Compute.OutputAccessor(accessorType, param.DataType);
7373
m_CompiledSetters.Add(function);
7474
}
7575
}
@@ -94,3 +94,4 @@ protected virtual void CompileMethod()
9494

9595

9696

97+

‎BHoM_UI/Caller/Core.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -190,3 +190,4 @@ protected void MarkAsModified(CallerUpdate update)
190190

191191

192192

193+

‎BHoM_UI/Caller/IO_CRUD.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -52,7 +52,7 @@ public virtual bool AddInput(int index, string name, Type type = null)
5252
{
5353
ParamInfo param = Engine.UI.Create.ParamInfo(name, type);
5454
InputParams.Insert(index, param);
55-
m_CompiledGetters.Insert(index, Engine.UI.Create.InputAccessor(m_DataAccessor.GetType(), param.DataType));
55+
m_CompiledGetters.Insert(index, Engine.UI.Compute.InputAccessor(m_DataAccessor.GetType(), param.DataType));
5656
}
5757

5858
return true;
@@ -88,7 +88,7 @@ public virtual bool UpdateInput(int index, string name = null, Type type = null)
8888
if (type != null)
8989
{
9090
if (type != InputParams[index].DataType)
91-
m_CompiledGetters[index] = Engine.UI.Create.InputAccessor(m_DataAccessor.GetType(), type);
91+
m_CompiledGetters[index] = Engine.UI.Compute.InputAccessor(m_DataAccessor.GetType(), type);
9292

9393
InputParams[index].DataType = type;
9494
}
@@ -198,3 +198,4 @@ public virtual bool CanUpdateInput(int index, string name)
198198

199199

200200

201+

0 commit comments

Comments
 (0)