Skip to content

8.1 Deployment #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Mar 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
470bf29
Update assembly file version to 8.1.0.0
BHoMBot Dec 19, 2024
a757441
Update copyright headers to new year 2025
BHoMBot Dec 19, 2024
723b491
Start of milestone changes for 8.1 (#501)
IsakNaslundBh Dec 20, 2024
d846cff
#503 Update csprojects to new format
IsakNaslundBh Feb 10, 2025
c61810e
Code restructuring and update to how setting a new project ID is handled
IsakNaslundBh Feb 11, 2025
1050207
Include filename in TriggerLogUsage
IsakNaslundBh Feb 11, 2025
7149a27
add ProjectId as optional input for logging to be able to log directly
IsakNaslundBh Feb 11, 2025
56c3734
Update csproj format for Window project
IsakNaslundBh Feb 11, 2025
4e863e0
fix project compliance
IsakNaslundBh Feb 11, 2025
a228d56
Remove triggering via events and event listener, and change how openi…
IsakNaslundBh Feb 12, 2025
9d6ad5d
Slight code re-organisation
IsakNaslundBh Feb 12, 2025
accb309
Remove no longer required event handlers
IsakNaslundBh Feb 12, 2025
1dd38a2
Correct name for puplic eventhandler (should not start with m_)
IsakNaslundBh Feb 12, 2025
ca9e424
minor cleanup
IsakNaslundBh Feb 12, 2025
c2b7eff
Slight reorganisation, and additional collection to store files logge…
IsakNaslundBh Feb 12, 2025
81cb345
minor comment update
IsakNaslundBh Feb 12, 2025
dd64984
nullchecks
IsakNaslundBh Feb 12, 2025
7a4af15
Centralise to cache is only updated in one place
IsakNaslundBh Feb 14, 2025
a4f5cb7
BHoM_UI: Fix how analytics and projectId is handled (#505)
IsakNaslundBh Feb 21, 2025
cbca535
Fix issue with versioning log and thread abort
IsakNaslundBh Mar 20, 2025
9f810b0
Add ProjectId to triggerUseageLogArgs and check if set and update Pro…
IsakNaslundBh Mar 20, 2025
39fefd5
Fixing Code Compliance issue on Create.InputAccessor and Create.Outpu…
adecler Mar 20, 2025
b63464c
Fix issue with versioning log and thread abort (#509)
IsakNaslundBh Mar 20, 2025
f88dc6a
Add ProjectId to triggerUseageLogArgs and check if set and update Pro…
IsakNaslundBh Mar 20, 2025
b729d42
Add missing versioning attributes
IsakNaslundBh Mar 22, 2025
1d375f7
Fixing Code Compliance issue on Create.InputAccessor and Create.Outpu…
adecler Mar 23, 2025
a75ae7d
Check if projectId is set on CheckLogOnUiEndOpening and update if it is
IsakNaslundBh Mar 26, 2025
6a0d68a
Check if projectId is set on CheckLogOnUiEndOpening and update if it …
IsakNaslundBh Mar 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .ci/code/UI_Test/Helpers/InstantiateCaller.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -93,3 +93,4 @@ public static Caller InstantiateCaller(Type type)




3 changes: 2 additions & 1 deletion .ci/code/UI_Test/Helpers/PossibleComponentItems.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -48,3 +48,4 @@ public static List<SearchItem> PossibleComponentItems()




3 changes: 2 additions & 1 deletion .ci/code/UI_Test/Objects/DummyAccessor.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -131,3 +131,4 @@ private T GetDummyObject<T>()




3 changes: 2 additions & 1 deletion .ci/code/UI_Test/Objects/DummyCaller.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -77,3 +77,4 @@ public override object Run(List<object> inputs)




5 changes: 3 additions & 2 deletions .ci/code/UI_Test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -55,6 +55,7 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.0.0.0")]
[assembly: AssemblyFileVersion("8.0.0.0")]
[assembly: AssemblyFileVersion("8.1.0.0")]



3 changes: 2 additions & 1 deletion .ci/code/UI_Test/Verify/ComponentInstantiation.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -88,3 +88,4 @@ public static TestResult ComponentInstantiation(SearchItem item)




3 changes: 2 additions & 1 deletion .ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -134,3 +134,4 @@ public static TestResult ComponentReadWriteCycle(SearchItem item)




3 changes: 2 additions & 1 deletion .ci/code/UI_Test/Verify/ComponentRunCycle.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -146,3 +146,4 @@ public static TestResult ComponentRunCycle(SearchItem item)




191 changes: 25 additions & 166 deletions BHoM_UI/BHoM_UI.csproj
Original file line number Diff line number Diff line change
@@ -1,36 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{69F4F042-E23A-4673-AB32-3D787CFA976C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BH.UI</RootNamespace>
<AssemblyName>BHoM_UI</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Build\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Build\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<AssemblyVersion>8.0.0.0</AssemblyVersion>
<Description>https://github.com/BHoM/BHoM_UI</Description>
<Version>5.0.0</Version>
<Authors>BHoM</Authors>
<Copyright>Copyright © https://github.com/BHoM</Copyright>
<RootNamespace>BH.UI</RootNamespace>
<FileVersion>8.1.0.0</FileVersion>
<OutputPath>..\Build\</OutputPath>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\UI_Engine\UI_Engine.csproj" />
<ProjectReference Include="..\UI_oM\UI_oM.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="Adapter_oM">
<HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_oM.dll</HintPath>
<Private>False</Private>
Expand Down Expand Up @@ -159,137 +146,9 @@
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Caller\IO_CRUD.cs" />
<Compile Include="Caller\AddToMenu.cs" />
<Compile Include="Caller\Read.cs" />
<Compile Include="Caller\Compile.cs" />
<Compile Include="Caller\SetParamSelectionMenu.cs" />
<Compile Include="Caller\SetOutputs.cs" />
<Compile Include="Caller\SetInputs.cs" />
<Compile Include="Caller\SetComponentDetails.cs" />
<Compile Include="CallerTemplates\MultiChoiceCaller.cs" />
<Compile Include="Caller\Write.cs" />
<Compile Include="Caller\SetItem.cs" />
<Compile Include="Caller\Run.cs" />
<Compile Include="Components\Engine\External.cs" />
<Compile Include="Components\Adapter\CreateRequest.cs" />
<Compile Include="Components\Adapter\CreateAdapter.cs" />
<Compile Include="Components\Adapter\Move.cs" />
<Compile Include="Components\Adapter\Execute.cs" />
<Compile Include="Components\Adapter\Pull.cs" />
<Compile Include="Components\Adapter\Remove.cs" />
<Compile Include="Components\Adapter\Push.cs" />
<Compile Include="Components\Engine\Explode.cs" />
<Compile Include="Components\Engine\GetEvents.cs" />
<Compile Include="Components\Engine\GetInfo.cs" />
<Compile Include="Components\Engine\Query.cs" />
<Compile Include="Components\Engine\Modify.cs" />
<Compile Include="Components\Engine\Convert.cs" />
<Compile Include="Components\Engine\Compute.cs" />
<Compile Include="Components\Engine\SetProperty.cs" />
<Compile Include="Components\Engine\GetProperty.cs" />
<Compile Include="Components\Engine\FromJson.cs" />
<Compile Include="Components\Engine\ToJson.cs" />
<Compile Include="Components\oM\CreateCustom.cs" />
<Compile Include="Components\oM\CreateData.cs" />
<Compile Include="Components\oM\CreateEnum.cs" />
<Compile Include="Components\oM\CreateType.cs" />
<Compile Include="Components\oM\CreateObject.cs" />
<Compile Include="Components\oM\CreateDictionary.cs" />
<Compile Include="Components\UI\FalseStartToggle.cs" />
<Compile Include="Components\UI\UnitTest.cs" />
<Compile Include="Global\DocumentListener.cs" />
<Compile Include="Global\Initialisation.cs" />
<Compile Include="Global\GlobalSearch.cs" />
<Compile Include="Global\SearchMenu.cs" />
<Compile Include="Global\SearchMenu_WinForm.cs" />
<Compile Include="Global\SearchMenu_Wpf.cs" />
<Compile Include="Menus\ParamSelectorMenu.cs" />
<Compile Include="Menus\IItemSelectorMenu.cs" />
<Compile Include="Menus\ItemSelector.cs" />
<Compile Include="Caller\Core.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs" />
<Compile Include="Menus\ItemSelectorMenu.cs" />
<Compile Include="Menus\ItemSelectorMenu_WinForm.cs" />
<Compile Include="Menus\ItemSelectorMenu_Wpf.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="Properties\Resources\Adapter.png" />
<Content Include="Properties\Resources\BHoM_Alligator_Icon.png" />
<Content Include="Properties\Resources\BHoM_BHoM_Object.png" />
<Content Include="Properties\Resources\BHoM_Create_CustomData.png" />
<Content Include="Properties\Resources\BHoM_Filter.png" />
<Content Include="Properties\Resources\BHoM_FromJSON.png" />
<Content Include="Properties\Resources\BHoM_GetProperty.png" />
<Content Include="Properties\Resources\BHoM_GetPropertyNames.png" />
<None Include="Properties\Resources\BHoM_Logo.png" />
<None Include="Properties\Resources\BHoM_Icon.ico" />
<Content Include="Properties\Resources\BHoM_Read _CustomData.png" />
<Content Include="Properties\Resources\BHoM_SetProperty.png" />
<Content Include="Properties\Resources\BHoM_ToJSON.png" />
<Content Include="Properties\Resources\BooleanToggleOff.png" />
<Content Include="Properties\Resources\BooleanToggleOn.png" />
<Content Include="Properties\Resources\BS_Script.png" />
<Content Include="Properties\Resources\Compute.png" />
<Content Include="Properties\Resources\Convert.png" />
<Content Include="Properties\Resources\CreateBHoM.png" />
<Content Include="Properties\Resources\CustomObject.png" />
<Content Include="Properties\Resources\Data.png" />
<Content Include="Properties\Resources\Delete.png" />
<Content Include="Properties\Resources\Dictionary.png" />
<Content Include="Properties\Resources\Empty.png" />
<Content Include="Properties\Resources\Enum.png" />
<Content Include="Properties\Resources\Execute.png" />
<Content Include="Properties\Resources\Explode.png" />
<Content Include="Properties\Resources\External.png" />
<Content Include="Properties\Resources\FromJson.png" />
<Content Include="Properties\Resources\gator.png" />
<None Include="Properties\Resources\GetEvents.png" />
<Content Include="Properties\Resources\GetInfo.png" />
<Content Include="Properties\Resources\Modify.png" />
<Content Include="Properties\Resources\Move.png" />
<None Include="Properties\Resources\newBooleanToggle.png" />
<Content Include="Properties\Resources\Pull.png" />
<Content Include="Properties\Resources\Push.png" />
<Content Include="Properties\Resources\Query.png" />
<Content Include="Properties\Resources\CreateRequest.png" />
<Content Include="Properties\Resources\RunCode.png" />
<Content Include="Properties\Resources\ToJson.png" />
<Content Include="Properties\Resources\Type.png" />
<None Include="Properties\Resources\UnitTest.png" />
<Content Include="Properties\Resources\UpdateProperty.png" />
<Content Include="Properties\Resources\VBH_Script.png" />
<Content Include="Properties\Resources\VS_Script.png" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\UI_Engine\UI_Engine.csproj">
<Project>{565ddbd0-5c04-4be9-b57d-ce54c2124abb}</Project>
<Name>UI_Engine</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\UI_oM\UI_oM.csproj">
<Project>{50d4c1ed-c16c-4365-a742-938bf49ec4b0}</Project>
<Name>UI_oM</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "$(ProgramData)\BHoM\Assemblies" /Y</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->


<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y" />
</Target>
</Project>
3 changes: 2 additions & 1 deletion BHoM_UI/Caller/AddToMenu.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -83,3 +83,4 @@ public void SetSelectorMenu<M>(ItemSelectorMenu<M> selectorMenu)




7 changes: 4 additions & 3 deletions BHoM_UI/Caller/Compile.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -51,7 +51,7 @@ protected virtual void CompileInputGetters()
for (int index = 0; index < InputParams.Count; index++)
{
ParamInfo param = InputParams[index];
Func<IDataAccessor, int, object> func = Engine.UI.Create.InputAccessor(accessorType, param.DataType);
Func<IDataAccessor, int, object> func = Engine.UI.Compute.InputAccessor(accessorType, param.DataType);
m_CompiledGetters.Add(func);
}
}
Expand All @@ -69,7 +69,7 @@ protected virtual void CompileOutputSetters()
for (int index = 0; index < OutputParams.Count; index++)
{
ParamInfo param = OutputParams[index];
Func<IDataAccessor, object, int, bool> function = Engine.UI.Create.OutputAccessor(accessorType, param.DataType);
Func<IDataAccessor, object, int, bool> function = Engine.UI.Compute.OutputAccessor(accessorType, param.DataType);
m_CompiledSetters.Add(function);
}
}
Expand All @@ -94,3 +94,4 @@ protected virtual void CompileMethod()




3 changes: 2 additions & 1 deletion BHoM_UI/Caller/Core.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -190,3 +190,4 @@ protected void MarkAsModified(CallerUpdate update)




7 changes: 4 additions & 3 deletions BHoM_UI/Caller/IO_CRUD.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2025, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -52,7 +52,7 @@ public virtual bool AddInput(int index, string name, Type type = null)
{
ParamInfo param = Engine.UI.Create.ParamInfo(name, type);
InputParams.Insert(index, param);
m_CompiledGetters.Insert(index, Engine.UI.Create.InputAccessor(m_DataAccessor.GetType(), param.DataType));
m_CompiledGetters.Insert(index, Engine.UI.Compute.InputAccessor(m_DataAccessor.GetType(), param.DataType));
}

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

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




Loading