From c1cc258a69999117745fd4460ef42f36f8e0d8f9 Mon Sep 17 00:00:00 2001 From: Dogukan Karatas Date: Tue, 12 Nov 2024 12:58:15 +0100 Subject: [PATCH 1/5] build for 2023 --- Build/Consts.cs | 8 +++++++- .../Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Build/Consts.cs b/Build/Consts.cs index 8fabcd0cf..93fb96031 100644 --- a/Build/Consts.cs +++ b/Build/Consts.cs @@ -41,7 +41,13 @@ public static class Consts new("Connectors/Autocad/Speckle.Connectors.Civil3d2025", "net8.0-windows") ] ), - new("tekla-structures", [new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")]) + new( + "tekla-structures", + [ + new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"), + new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48") + ] + ) }; } diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs index 901e2c479..87a7fc644 100644 --- a/Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs @@ -2,9 +2,9 @@ namespace Speckle.Connector.Tekla2024.Plugin; -[Plugin("Speckle (Beta)")] +[Plugin("Speckle")] [PluginUserInterface("Speckle.Connector.Tekla2024.SpeckleTeklaPanelHost")] -[InputObjectDependency(InputObjectDependency.NOT_DEPENDENT)] // See DevDocs/InputObjectDependency.NOT_DEPENDENT.png +[InputObjectDependency(InputObjectDependency.NOT_DEPENDENT)] public class TeklaPlugin : PluginBase { #pragma warning disable IDE1006 From 254c7c64e649888d988fae7a44f3410d8641c6e9 Mon Sep 17 00:00:00 2001 From: Alan Rynne Date: Tue, 12 Nov 2024 13:24:35 +0100 Subject: [PATCH 2/5] fix: Delete Assets/*.bmp from csproj as it is referenced in shproj now --- .../Speckle.Connector.Tekla2023.csproj | 6 ------ .../Speckle.Connector.Tekla2024.csproj | 6 ------ build.sh | 0 3 files changed, 12 deletions(-) mode change 100755 => 100644 build.sh diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj index 04402ca45..b3fcb0edd 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj @@ -48,12 +48,6 @@ - - - Always - - - diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj index 5fe48282f..e25666ed0 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj @@ -47,12 +47,6 @@ - - - Always - - - diff --git a/build.sh b/build.sh old mode 100755 new mode 100644 From b07785f10d1df5f11d0816dc743b58374dfbb6de Mon Sep 17 00:00:00 2001 From: Dogukan Karatas Date: Tue, 12 Nov 2024 15:09:48 +0100 Subject: [PATCH 3/5] updates the icon --- .../Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs index 57247100d..a3a082c65 100644 --- a/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs @@ -24,10 +24,12 @@ public SpeckleTeklaPanelHost() this.Text = "Speckle (Beta)"; this.Name = "Speckle (Beta)"; + string version = GetVersion().ToString()[1..]; // removes the 'v' from version + string resourcePath = $"Speckle.Connector.Tekla{version}.Resources.et_element_Speckle.bmp"; using ( Bitmap bmp = new Bitmap( - GetType().Assembly.GetManifestResourceStream("Speckle.Connector.Tekla2024.Resources.et_element_Speckle.bmp") - ?? throw new InvalidOperationException() + GetType().Assembly.GetManifestResourceStream(resourcePath) + ?? throw new InvalidOperationException($"Could not find resource: {resourcePath}") ) ) { From d585d42c6399c90e193593f560bf15220f363c82 Mon Sep 17 00:00:00 2001 From: Alan Rynne Date: Tue, 12 Nov 2024 15:29:10 +0100 Subject: [PATCH 4/5] fix: Revert changes to build.sh --- build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 From c49752015a5d328026c6ff7d33d391e4707beabb Mon Sep 17 00:00:00 2001 From: Dogukan Karatas Date: Tue, 12 Nov 2024 15:34:39 +0100 Subject: [PATCH 5/5] adds notes --- .../Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs index a3a082c65..1979989b5 100644 --- a/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs @@ -24,6 +24,7 @@ public SpeckleTeklaPanelHost() this.Text = "Speckle (Beta)"; this.Name = "Speckle (Beta)"; + // CNX-790: Needs to be solved string version = GetVersion().ToString()[1..]; // removes the 'v' from version string resourcePath = $"Speckle.Connector.Tekla{version}.Resources.et_element_Speckle.bmp"; using (