fix (tekla): updates the vebview2 dependency (#562)

* updates webview dependencies * updates csproj --------- Co-authored-by: Adam Hathcock <[email protected]> Co-authored-by: Claire Kuang <[email protected]> Co-authored-by: Oğuzhan Koral <[email protected]>
specklesystems · Feb 18, 2025 · 12dcf47 · 12dcf47
1 parent 42e45af
commit 12dcf47
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/Connectors/Tekla/Directory.Build.targets b/Connectors/Tekla/Directory.Build.targets
@@ -1,26 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Target AfterTargets="Build"  Name="AfterBuildTekla" Condition="'$(TeklaVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
+  <Target AfterTargets="Build" Name="AfterBuildTekla" Condition="'$(TeklaVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
     <ItemGroup>
       <TeklaDlls Include="$(TargetDir)\**\*.*" Exclude="$(TargetDir)*.bmp" />
-      <TeklaBmp Include="$(TargetDir)\Assets\et_element_Speckle.bmp"/>
+      <TeklaBmp Include="$(TargetDir)\Resources\et_element_Speckle.bmp"/>
     </ItemGroup>
     <Message Text="Tekla Version $(TeklaVersion)" Importance="high"/>
+
+    <!-- Delete win-arm64 folder if it exists -->
+    <RemoveDir Condition="Exists('$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native')"
+               Directories="$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native" />
+
+    <RemoveDir Condition="Exists('C:\TeklaStructures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native')"
+               Directories="C:\TeklaStructures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native" />
+
+    <!-- ProgramData path -->
     <Copy Condition="Exists('$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0')"
           DestinationFolder="$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\%(RecursiveDir)"
           SourceFiles="@(TeklaDlls)" />
-    <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-      <Copy Condition="Exists('$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0')"
-            DestinationFolder="$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Bitmaps"
-            SourceFiles="@(TeklaBmp)" />
-    </ItemGroup>
-    <Copy Condition="Exists('C:\TeklaStructures\2024.0')"
-          DestinationFolder="C:\TeklaStructures\2024.0\Environments\common\extensions\Speckle3TeklaStructures\%(RecursiveDir)"
+
+    <Copy Condition="Exists('$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0')"
+          DestinationFolder="$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Bitmaps"
+          SourceFiles="@(TeklaBmp)" />
+
+    <!-- TeklaStructures direct path -->
+    <Copy Condition="Exists('C:\TeklaStructures\$(TeklaVersion).0')"
+          DestinationFolder="C:\TeklaStructures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\%(RecursiveDir)"
           SourceFiles="@(TeklaDlls)" />
-    <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-      <Copy Condition="Exists('C:\TeklaStructures\2024.0')"
-            DestinationFolder="$(ProgramFiles)\TeklaStructures\2024.0\bin\Env\Bitmaps"
-            SourceFiles="@(TeklaBmp)" />
-    </ItemGroup>
+
+    <Copy Condition="Exists('C:\TeklaStructures\$(TeklaVersion).0')"
+          DestinationFolder="C:\TeklaStructures\$(TeklaVersion).0\Bitmaps"
+          SourceFiles="@(TeklaBmp)" />
   </Target>
 </Project>
diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <TeklaVersion>2023</TeklaVersion>
     <UseWpf>true</UseWpf>
     <DefineConstants>$(DefineConstants);TEKLA2023</DefineConstants>

diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json
@@ -442,6 +442,19 @@
         "resolved": "3.1.0-dev.270",
         "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
       }
+    },
+    ".NETFramework,Version=v4.8/win-x64": {
+      "SQLitePCLRaw.lib.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.4",
+        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
+      },
+      "Microsoft.Web.WebView2": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.1938.49, )",
+        "resolved": "1.0.1938.49",
+        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
+      }
     }
   }
 }
diff --git a/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj b/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj
@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
+    <!-- we're doing it because tekla is complaning about arm dlls -->
+    <!-- we don't really want to support windows arm for now -->
+    <PlatformTarget>x64</PlatformTarget> 
     <UseWpf>true</UseWpf>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <Configurations>Debug;Release;Local</Configurations>