dogukan/tekla2023 installer (#382)

* build for 2023 * fix: Delete Assets/*.bmp from csproj as it is referenced in shproj now * updates the icon * fix: Revert changes to build.sh * adds notes --------- Co-authored-by: Alan Rynne <alan@speckle.systems>
specklesystems · Nov 12, 2024 · 76ea67a · 76ea67a
1 parent 12c80e2
commit 76ea67a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git 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.Tekla2023/Speckle.Connector.Tekla2023.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj
@@ -48,12 +48,6 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Assets\et_element_Speckle.bmp">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <Import Project="..\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.projitems" Label="Shared" />
 
 </Project>
diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj
@@ -47,12 +47,6 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Assets\et_element_Speckle.bmp">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <Import Project="..\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.projitems" Label="Shared" />
 
 </Project>
diff --git 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

diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs
@@ -24,10 +24,13 @@ 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 (
       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}")
       )
     )
     {