From 15210eed2771138ed58c5cc137287e4d8c6509a6 Mon Sep 17 00:00:00 2001 From: BHoMBot Date: Mon, 6 Jul 2026 11:29:06 +0100 Subject: [PATCH 1/2] Update assembly file version to 9.3.0.0 --- ETABS_Engine/ETABS_Engine.csproj | 206 ++++++------- ETABS_oM/ETABS_oM.csproj | 110 +++---- Etabs_Adapter/Etabs_Adapter.csproj | 462 ++++++++++++++--------------- 3 files changed, 389 insertions(+), 389 deletions(-) diff --git a/ETABS_Engine/ETABS_Engine.csproj b/ETABS_Engine/ETABS_Engine.csproj index 8c2311a2..b7989158 100644 --- a/ETABS_Engine/ETABS_Engine.csproj +++ b/ETABS_Engine/ETABS_Engine.csproj @@ -1,103 +1,103 @@ - - -net472 - Library - BH.Engine.Adapters.ETABS - Debug;Debug16;Debug17;Debug18;Release;Release16;Release17;Release18 - ETABS_Engine - https://github.com/BHoM/ETABS_Toolkit - ETABS_Engine - Copyright � https://github.com/BHoM - 9.0.0.0 - 9.2.0.0 - - - - - - ..\Build\ - MinimumRecommendedRules.ruleset - - - true - ..\Build\ - MinimumRecommendedRules.ruleset - - - - $(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\Analytical_oM.dll - False - - - $(ProgramData)\BHoM\Assemblies\Architecture_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\BHoM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Data_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Dimensional_oM.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\Geometry_Engine.dll - False - - - $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\Physical_oM.dll - False - - - $(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Structure_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Structure_oM.dll - False - False - - - - - - - - - - - - - + + +net472 + Library + BH.Engine.Adapters.ETABS + Debug;Debug16;Debug17;Debug18;Release;Release16;Release17;Release18 + ETABS_Engine + https://github.com/BHoM/ETABS_Toolkit + ETABS_Engine + Copyright � https://github.com/BHoM + 9.0.0.0 + 9.3.0.0 + + + + + + ..\Build\ + MinimumRecommendedRules.ruleset + + + true + ..\Build\ + MinimumRecommendedRules.ruleset + + + + $(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\Analytical_oM.dll + False + + + $(ProgramData)\BHoM\Assemblies\Architecture_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\BHoM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Data_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Dimensional_oM.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\Geometry_Engine.dll + False + + + $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\Physical_oM.dll + False + + + $(ProgramData)\BHoM\Assemblies\Serialiser_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Structure_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Structure_oM.dll + False + False + + + + + + + + + + + + + diff --git a/ETABS_oM/ETABS_oM.csproj b/ETABS_oM/ETABS_oM.csproj index 08635ebb..a5f31f78 100644 --- a/ETABS_oM/ETABS_oM.csproj +++ b/ETABS_oM/ETABS_oM.csproj @@ -1,55 +1,55 @@ - - -net472 - Library - BH.oM.Adapters.ETABS - Debug;Debug16;Debug17;Debug18;Release;Release16;Release17;Release18 - ETABS_oM - https://github.com/BHoM/ETABS_Toolkit - ETABS_oM - Copyright � https://github.com/BHoM - 9.0.0.0 - 9.2.0.0 - - - - - - ..\Build\ - true - MinimumRecommendedRules.ruleset - - - ..\Build\ - MinimumRecommendedRules.ruleset - - - - $(ProgramData)\BHoM\Assemblies\BHoM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Data_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Quantities_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Structure_oM.dll - False - False - - - - - + + +net472 + Library + BH.oM.Adapters.ETABS + Debug;Debug16;Debug17;Debug18;Release;Release16;Release17;Release18 + ETABS_oM + https://github.com/BHoM/ETABS_Toolkit + ETABS_oM + Copyright � https://github.com/BHoM + 9.0.0.0 + 9.3.0.0 + + + + + + ..\Build\ + true + MinimumRecommendedRules.ruleset + + + ..\Build\ + MinimumRecommendedRules.ruleset + + + + $(ProgramData)\BHoM\Assemblies\BHoM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Data_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Quantities_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Structure_oM.dll + False + False + + + + + diff --git a/Etabs_Adapter/Etabs_Adapter.csproj b/Etabs_Adapter/Etabs_Adapter.csproj index 4fa7d3a7..bf2236c2 100644 --- a/Etabs_Adapter/Etabs_Adapter.csproj +++ b/Etabs_Adapter/Etabs_Adapter.csproj @@ -1,231 +1,231 @@ - - -net472 - Debug16 - Library - BH.Adapter.ETABS - ETABS17_Adapter - Debug;Debug16;Debug17;Debug18;Release;Release16;Release17;Release18 - Release18 - ETABS_Adapter - https://github.com/BHoM/ETABS_Toolkit - ETABS_Adapter - Copyright � https://github.com/BHoM - 9.0.0.0 - 9.2.0.0 - - - - - - true - ..\Build\ - TRACE;DEBUG;Debug16 - MinimumRecommendedRules.ruleset - ETABS2016_Adapter - - - true - ..\Build\ - TRACE;DEBUG;Debug17 - MinimumRecommendedRules.ruleset - ETABS17_Adapter - - - true - ..\Build\ - TRACE;Release16 - MinimumRecommendedRules.ruleset - Etabs2016_Adapter - - - true - ..\Build\ - TRACE;Release17 - MinimumRecommendedRules.ruleset - ETABS17_Adapter - - - true - ..\Build\ - TRACE;DEBUG;Debug18 - MinimumRecommendedRules.ruleset - ETABS18_Adapter - - - true - ..\Build\ - TRACE;Release18 - MinimumRecommendedRules.ruleset - ETABS18_Adapter - - - ..\Build\ - TRACE;DEBUG;Debug18 - MinimumRecommendedRules.ruleset - - - true - ..\Build\ - TRACE;Release18 - MinimumRecommendedRules.ruleset - ETABS_Adapter - - - true - ..\Build\ - TRACE;DEBUG;Debug16 - MinimumRecommendedRules.ruleset - ETABS2016_Adapter - - - true - ..\Build\ - TRACE;DEBUG;Debug17 - MinimumRecommendedRules.ruleset - ETABS17_Adapter - - - true - ..\Build\ - TRACE;Release16 - MinimumRecommendedRules.ruleset - ETABS2016_Adapter - - - true - ..\Build\ - TRACE;Release17 - MinimumRecommendedRules.ruleset - ETABS17_Adapter - - - ..\Build\ - TRACE;DEBUG;Debug18 - MinimumRecommendedRules.ruleset - - - true - ..\Build\ - TRACE;Release18 - MinimumRecommendedRules.ruleset - - - true - ..\Build\ - TRACE;DEBUG;Debug18 - MinimumRecommendedRules.ruleset - ETABS18_Adapter - - - true - ..\Build\ - TRACE;Release18 - MinimumRecommendedRules.ruleset - ETABS18_Adapter - - - - $(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Adapter_oM.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\Analytical_oM.dll - False - - - $(ProgramData)\BHoM\Assemblies\Architecture_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 - - - False - ..\libs\CSiAPIv1.dll - - - $(ProgramData)\BHoM\Assemblies\Data_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Dimensional_oM.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\Geometry_Engine.dll - False - - - $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll - False - False - - - False - $(ProgramData)\BHoM\Assemblies\Physical_oM.dll - False - - - $(ProgramData)\BHoM\Assemblies\Spatial_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Spatial_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Structure_AdapterModules.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Structure_Engine.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Structure_oM.dll - False - False - - - $(ProgramData)\BHoM\Assemblies\Units_Engine.dll - False - False - - - - - - - - - - - + + +net472 + Debug16 + Library + BH.Adapter.ETABS + ETABS17_Adapter + Debug;Debug16;Debug17;Debug18;Release;Release16;Release17;Release18 + Release18 + ETABS_Adapter + https://github.com/BHoM/ETABS_Toolkit + ETABS_Adapter + Copyright � https://github.com/BHoM + 9.0.0.0 + 9.3.0.0 + + + + + + true + ..\Build\ + TRACE;DEBUG;Debug16 + MinimumRecommendedRules.ruleset + ETABS2016_Adapter + + + true + ..\Build\ + TRACE;DEBUG;Debug17 + MinimumRecommendedRules.ruleset + ETABS17_Adapter + + + true + ..\Build\ + TRACE;Release16 + MinimumRecommendedRules.ruleset + Etabs2016_Adapter + + + true + ..\Build\ + TRACE;Release17 + MinimumRecommendedRules.ruleset + ETABS17_Adapter + + + true + ..\Build\ + TRACE;DEBUG;Debug18 + MinimumRecommendedRules.ruleset + ETABS18_Adapter + + + true + ..\Build\ + TRACE;Release18 + MinimumRecommendedRules.ruleset + ETABS18_Adapter + + + ..\Build\ + TRACE;DEBUG;Debug18 + MinimumRecommendedRules.ruleset + + + true + ..\Build\ + TRACE;Release18 + MinimumRecommendedRules.ruleset + ETABS_Adapter + + + true + ..\Build\ + TRACE;DEBUG;Debug16 + MinimumRecommendedRules.ruleset + ETABS2016_Adapter + + + true + ..\Build\ + TRACE;DEBUG;Debug17 + MinimumRecommendedRules.ruleset + ETABS17_Adapter + + + true + ..\Build\ + TRACE;Release16 + MinimumRecommendedRules.ruleset + ETABS2016_Adapter + + + true + ..\Build\ + TRACE;Release17 + MinimumRecommendedRules.ruleset + ETABS17_Adapter + + + ..\Build\ + TRACE;DEBUG;Debug18 + MinimumRecommendedRules.ruleset + + + true + ..\Build\ + TRACE;Release18 + MinimumRecommendedRules.ruleset + + + true + ..\Build\ + TRACE;DEBUG;Debug18 + MinimumRecommendedRules.ruleset + ETABS18_Adapter + + + true + ..\Build\ + TRACE;Release18 + MinimumRecommendedRules.ruleset + ETABS18_Adapter + + + + $(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Adapter_oM.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\Analytical_oM.dll + False + + + $(ProgramData)\BHoM\Assemblies\Architecture_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 + + + False + ..\libs\CSiAPIv1.dll + + + $(ProgramData)\BHoM\Assemblies\Data_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Dimensional_oM.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\Geometry_Engine.dll + False + + + $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll + False + False + + + False + $(ProgramData)\BHoM\Assemblies\Physical_oM.dll + False + + + $(ProgramData)\BHoM\Assemblies\Spatial_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Spatial_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Structure_AdapterModules.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Structure_Engine.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Structure_oM.dll + False + False + + + $(ProgramData)\BHoM\Assemblies\Units_Engine.dll + False + False + + + + + + + + + + + From 18c01c7dc38231df4ff3ddec30fb855198d62c26 Mon Sep 17 00:00:00 2001 From: Christopher Short Date: Sun, 6 Sep 2026 13:44:20 +0100 Subject: [PATCH 2/2] Expand reference to resolve conflict --- Etabs_Adapter/ETABSAdapter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Etabs_Adapter/ETABSAdapter.cs b/Etabs_Adapter/ETABSAdapter.cs index 30e06cce..3370ec70 100644 --- a/Etabs_Adapter/ETABSAdapter.cs +++ b/Etabs_Adapter/ETABSAdapter.cs @@ -148,7 +148,7 @@ public ETABSAdapter(string filePath = "", EtabsSettings etabsSetting = null, boo if (processes > 0) { - object runningInstance = Query.GetActiveObject(programId); + object runningInstance = BH.Engine.Adapter.Query.GetActiveObject(programId); m_app = (cOAPI)runningInstance; m_model = m_app.SapModel;