From a7fde616f188bd8b9d52833d2af4a8b4dc31eafb Mon Sep 17 00:00:00 2001 From: Arnaud Declercq Date: Wed, 17 Jun 2026 15:59:21 +0100 Subject: [PATCH 1/5] Switch to byte arrays for icons to keep Excel_UI compatible with dotnet --- Excel_UI/Properties/Resources.Designer.cs | 4 ++-- Excel_UI/Properties/Resources.resx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Excel_UI/Properties/Resources.Designer.cs b/Excel_UI/Properties/Resources.Designer.cs index 6e5f1918..e4e98e83 100644 --- a/Excel_UI/Properties/Resources.Designer.cs +++ b/Excel_UI/Properties/Resources.Designer.cs @@ -87,8 +87,8 @@ internal Resources() { /// internal static System.Drawing.Bitmap BHoM_Logo { get { - object obj = ResourceManager.GetObject("BHoM_Logo", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + byte[] bytes = (byte[])ResourceManager.GetObject("BHoM_Logo", resourceCulture); + return new System.Drawing.Bitmap(new System.IO.MemoryStream(bytes)); } } } diff --git a/Excel_UI/Properties/Resources.resx b/Excel_UI/Properties/Resources.resx index 2e9e2e2a..54c491ba 100644 --- a/Excel_UI/Properties/Resources.resx +++ b/Excel_UI/Properties/Resources.resx @@ -119,6 +119,6 @@ - Resources\BHoM_Logo-48x48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\BHoM_Logo-48x48.png;System.Byte[], mscorlib \ No newline at end of file From 43e72a270b23ec1812d91703b0f69bc212df8baf Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Mon, 6 Jul 2026 11:29:18 +0100 Subject: [PATCH 2/5] Update assembly file version to 9.3.0.0 --- ExcelUI_Engine/ExcelUI_Engine.csproj | 74 ++++----- Excel_UI/Excel_UI.csproj | 216 +++++++++++++-------------- 2 files changed, 145 insertions(+), 145 deletions(-) diff --git a/ExcelUI_Engine/ExcelUI_Engine.csproj b/ExcelUI_Engine/ExcelUI_Engine.csproj index e89b6e40..0a112daa 100644 --- a/ExcelUI_Engine/ExcelUI_Engine.csproj +++ b/ExcelUI_Engine/ExcelUI_Engine.csproj @@ -1,37 +1,37 @@ - - -net472 - Library - BH.Engine.Excel - ..\Build\ - false - ExcelUI_Engine - https://github.com/BHoM/Excel_UI - BHoM - Copyright � https://github.com/BHoM - 9.0.0.0 - 9.2.0.0 - - - - - - - $(ProgramData)\BHoM\Assemblies\BHoM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll - False - False - - - - - + + +net472 + Library + BH.Engine.Excel + ..\Build\ + false + ExcelUI_Engine + https://github.com/BHoM/Excel_UI + BHoM + Copyright � https://github.com/BHoM + 9.0.0.0 + 9.3.0.0 + + + + + + + $(ProgramData)\BHoM\Assemblies\BHoM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll + False + False + + + + + diff --git a/Excel_UI/Excel_UI.csproj b/Excel_UI/Excel_UI.csproj index 705444f5..6743c31b 100644 --- a/Excel_UI/Excel_UI.csproj +++ b/Excel_UI/Excel_UI.csproj @@ -1,108 +1,108 @@ - - -net472 - Library - BH.UI.Excel - true - true - true - ..\Build\ - false - en-US - https://github.com/BHoM/Excel_UI - Copyright © https://github.com/BHoM - 9.0.0.0 - 9.2.0.0 - - - - - - - $(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Adapter_oM.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\BHoM.dll - False - - - $(ProgramData)\BHoM\Assemblies\BHoM_Adapter.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\BHoM_UI.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\Data_oM.dll - False - - - False - $(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll - False - - - False - $(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll - False - - - False - $(ProgramData)\BHoM\Assemblies\UI_Engine.dll - False - - - False - $(ProgramData)\BHoM\Assemblies\UI_oM.dll - False - - - False - $(ProgramData)\BHoM\Assemblies\Versioning_oM.dll - False - - - ..\libs\office.dll - False - - - - - - - - - - - - - - - - Program - C:\Program Files\Microsoft Office\root\Office16\EXCEL.EXE - - - C:\Program Files\Microsoft Office\root\Office16\EXCEL.EXE - - - Program - - + + +net472 + Library + BH.UI.Excel + true + true + true + ..\Build\ + false + en-US + https://github.com/BHoM/Excel_UI + Copyright © https://github.com/BHoM + 9.0.0.0 + 9.3.0.0 + + + + + + + $(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Adapter_oM.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\BHoM.dll + False + + + $(ProgramData)\BHoM\Assemblies\BHoM_Adapter.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\BHoM_UI.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\Data_oM.dll + False + + + False + $(ProgramData)\BHoM\Assemblies\Reflection_Engine.dll + False + + + False + $(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll + False + + + False + $(ProgramData)\BHoM\Assemblies\UI_Engine.dll + False + + + False + $(ProgramData)\BHoM\Assemblies\UI_oM.dll + False + + + False + $(ProgramData)\BHoM\Assemblies\Versioning_oM.dll + False + + + ..\libs\office.dll + False + + + + + + + + + + + + + + + + Program + C:\Program Files\Microsoft Office\root\Office16\EXCEL.EXE + + + C:\Program Files\Microsoft Office\root\Office16\EXCEL.EXE + + + Program + + From e3a390035911ad5e9fd35fa1c22c43e19e61e799 Mon Sep 17 00:00:00 2001 From: Seun Akanni Date: Tue, 14 Jul 2026 15:36:33 +0100 Subject: [PATCH 3/5] ci: onboard new CI checks (beta tier) --- .github/workflows/ci-beta.yml | 138 ++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 .github/workflows/ci-beta.yml diff --git a/.github/workflows/ci-beta.yml b/.github/workflows/ci-beta.yml new file mode 100644 index 00000000..f82dcbbd --- /dev/null +++ b/.github/workflows/ci-beta.yml @@ -0,0 +1,138 @@ +# Beta-tier proxy, BHoM variant. Bundles the tier's checks plus +# copyright-compliance (BHoM enforces OSS copyright; the BHE variant omits it). +# Copy to .github/workflows/ci-beta.yml in each BHoM beta repo. +# Runs on pull_request, non-blocking until a ruleset requires its checks. +# Workflow name CI keeps check contexts bare: required contexts are the job names. + +name: CI + +on: + pull_request: + branches: + - develop + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }} + cancel-in-progress: true + +jobs: + build: + runs-on: windows-2025-vs2026 + timeout-minutes: 30 + steps: + - name: Run build + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-build@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + code-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run code compliance + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: code + patterns: '*.cs' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + copyright-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run copyright compliance + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: copyright + patterns: '*.cs' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + dataset-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run dataset compliance + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: dataset + patterns: '**/*[Dd]atasets*/**/*.json **/*[Dd]atasets*.json' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + documentation-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run documentation compliance + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: documentation + patterns: '*.cs' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + project-compliance: + runs-on: windows-2025-vs2026 + timeout-minutes: 20 + permissions: + contents: read + pull-requests: read + actions: write + steps: + - name: Run project compliance + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + with: + check_type: project + patterns: 'AssemblyInfo.cs *.csproj' + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + dataset-tests: + runs-on: windows-2025-vs2026 + timeout-minutes: 30 + steps: + - name: Run dataset tests + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-dataset-tests@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + + serialisation: + runs-on: windows-2025-vs2026 + timeout-minutes: 90 + steps: + - name: Run serialisation + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-serialisation@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} + base_ref: ${{ github.base_ref }} + + versioning: + runs-on: windows-2025-vs2026 + timeout-minutes: 90 + steps: + - name: Run versioning + uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-versioning@develop + with: + app_id: ${{ secrets.BHOM_APP_ID }} + private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} From fcd4962495f6a4b3b59e7435cf845d12743c195d Mon Sep 17 00:00:00 2001 From: Seun Akanni Date: Fri, 24 Jul 2026 14:27:27 +0100 Subject: [PATCH 4/5] ci: prefix job names with ci- to avoid BHoMBot status-check name collision --- .github/workflows/ci-beta.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-beta.yml b/.github/workflows/ci-beta.yml index f82dcbbd..5b30267e 100644 --- a/.github/workflows/ci-beta.yml +++ b/.github/workflows/ci-beta.yml @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true jobs: - build: + ci-build: runs-on: windows-2025-vs2026 timeout-minutes: 30 steps: @@ -26,7 +26,7 @@ jobs: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - code-compliance: + ci-code-compliance: runs-on: windows-2025-vs2026 timeout-minutes: 20 permissions: @@ -42,7 +42,7 @@ jobs: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - copyright-compliance: + ci-copyright-compliance: runs-on: windows-2025-vs2026 timeout-minutes: 20 permissions: @@ -58,7 +58,7 @@ jobs: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - dataset-compliance: + ci-dataset-compliance: runs-on: windows-2025-vs2026 timeout-minutes: 20 permissions: @@ -74,7 +74,7 @@ jobs: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - documentation-compliance: + ci-documentation-compliance: runs-on: windows-2025-vs2026 timeout-minutes: 20 permissions: @@ -90,7 +90,7 @@ jobs: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - project-compliance: + ci-project-compliance: runs-on: windows-2025-vs2026 timeout-minutes: 20 permissions: @@ -106,7 +106,7 @@ jobs: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - dataset-tests: + ci-dataset-tests: runs-on: windows-2025-vs2026 timeout-minutes: 30 steps: @@ -116,7 +116,7 @@ jobs: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} - serialisation: + ci-serialisation: runs-on: windows-2025-vs2026 timeout-minutes: 90 steps: @@ -127,7 +127,7 @@ jobs: private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} base_ref: ${{ github.base_ref }} - versioning: + ci-versioning: runs-on: windows-2025-vs2026 timeout-minutes: 90 steps: From 2a853b6177cc5782f92c55fd71d1f72c9b54c69f Mon Sep 17 00:00:00 2001 From: Seun Akanni Date: Fri, 14 Aug 2026 23:48:09 +0100 Subject: [PATCH 5/5] ci: point the CI workflow at BHoM/CI_Toolkit --- .github/workflows/ci-beta.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-beta.yml b/.github/workflows/ci-beta.yml index 5b30267e..b7ade026 100644 --- a/.github/workflows/ci-beta.yml +++ b/.github/workflows/ci-beta.yml @@ -21,7 +21,7 @@ jobs: timeout-minutes: 30 steps: - name: Run build - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-build@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-build@develop with: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} @@ -35,7 +35,7 @@ jobs: actions: write steps: - name: Run code compliance - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop with: check_type: code patterns: '*.cs' @@ -51,7 +51,7 @@ jobs: actions: write steps: - name: Run copyright compliance - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop with: check_type: copyright patterns: '*.cs' @@ -67,10 +67,10 @@ jobs: actions: write steps: - name: Run dataset compliance - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop with: check_type: dataset - patterns: '**/*[Dd]atasets*/**/*.json **/*[Dd]atasets*.json' + patterns: ':(icase)*datasets*.json' app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} @@ -83,7 +83,7 @@ jobs: actions: write steps: - name: Run documentation compliance - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop with: check_type: documentation patterns: '*.cs' @@ -99,10 +99,10 @@ jobs: actions: write steps: - name: Run project compliance - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-compliance@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-compliance@develop with: check_type: project - patterns: 'AssemblyInfo.cs *.csproj' + patterns: '*AssemblyInfo.cs *.csproj' app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} @@ -111,7 +111,7 @@ jobs: timeout-minutes: 30 steps: - name: Run dataset tests - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-dataset-tests@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-dataset-tests@develop with: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} @@ -121,7 +121,7 @@ jobs: timeout-minutes: 90 steps: - name: Run serialisation - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-serialisation@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-serialisation@develop with: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }} @@ -132,7 +132,7 @@ jobs: timeout-minutes: 90 steps: - name: Run versioning - uses: BuroHappoldEngineeringAdmin/CI_Toolkit/.github/actions/ci-versioning@develop + uses: BHoM/CI_Toolkit/.github/actions/ci-versioning@develop with: app_id: ${{ secrets.BHOM_APP_ID }} private_key: ${{ secrets.BHOM_APP_PRIVATE_KEY }}