Skip to content
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.

Sign up for GitHub

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

dogukan/tekla2023 installer #382

Merged
merged 6 commits into from
Nov 12, 2024
Merged

dogukan/tekla2023 installer #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1cc258
build for 2023
dogukankaratas Nov 12, 2024
254c7c6
fix: Delete Assets/*.bmp from csproj as it is referenced in shproj now
AlanRynne Nov 12, 2024
b07785f
updates the icon
dogukankaratas Nov 12, 2024
d585d42
fix: Revert changes to build.sh
AlanRynne Nov 12, 2024
c497520
adds notes
dogukankaratas Nov 12, 2024
20125cf
Merge branch 'dogukan/tekla2023-installer' of https://github.com/spec…
dogukankaratas Nov 12, 2024
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
8 changes: 7 additions & 1 deletion Build/Consts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
]
)
};
}

Expand Down
6 changes: 0 additions & 6 deletions Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 0 additions & 6 deletions Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
dogukankaratas marked this conversation as resolved.
Show resolved Hide resolved
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}")
)
)
{
Expand Down
Loading