Bump SDK and enforce msbuild warnings (#379)

* Bump SDK * Updated Tekla structures nugets * Tekla architecture targeting * Fixed remaining warnings
specklesystems · Nov 14, 2024 · f84c4b2 · f84c4b2
1 parent b03e848
commit f84c4b2
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 204 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
 
       - name: Cache Nuget     
         uses: actions/cache@v4
@@ -38,7 +38,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
 
       - name: Cache Nuget     
         uses: actions/cache@v4

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
 
       - name: Cache Nuget
         uses: actions/cache@v4
@@ -79,7 +79,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)
+          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
 
       - name: Cache Nuget
         uses: actions/cache@v4

diff --git a/Build/Program.cs b/Build/Program.cs
@@ -150,7 +150,10 @@ void RemoveDirectory(string d)
     var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild";
     var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.0";
     Console.WriteLine($"Version: {version} & {fileVersion}");
-    Run("dotnet", $"build {s} -c Release --no-restore -p:Version={version} -p:FileVersion={fileVersion} -v:m");
+    Run(
+      "dotnet",
+      $"build {s} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
+    );
   }
 );
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets
@@ -154,7 +154,6 @@
         Log.LogErrorFromException(ex);
         return false;
       }
-      return Success;
     ]]>
       </Code>
     </Task>
@@ -190,7 +189,7 @@
             {
                 Log.LogMessage(MessageImportance.Low, "RelativePaths: " + i.ToString());
             }
-            return true;
+            Success = true;
 			 ]]>
       </Code>
     </Task>
@@ -266,7 +265,6 @@
         CleanInfo = AssemblyName + extension;
       }
       Success = true;
-      return Success;
 	]]>
       </Code>
     </Task>

diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
     <TeklaVersion>2023</TeklaVersion>
     <UseWpf>true</UseWpf>
     <DefineConstants>$(DefineConstants);TEKLA2023</DefineConstants>
@@ -33,10 +34,10 @@
   </Target>
   <ItemGroup>
     <PackageReference Include="Speckle.Objects" />
-    <PackageReference Include="Tekla.Structures.Dialog" IncludeAssets="compile; build" VersionOverride =" 2023.0.0" />
-    <PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile; build" VersionOverride =" 2023.0.0"/>
-    <PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile; build" VersionOverride =" 2023.0.0" />
-    <PackageReference Include="Tekla.Structures.Plugins" IncludeAssets="compile; build" VersionOverride =" 2023.0.0" />
+    <PackageReference Include="Tekla.Structures.Dialog" IncludeAssets="compile; build" VersionOverride =" 2023.0.1" />
+    <PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile; build" VersionOverride =" 2023.0.1"/>
+    <PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile; build" VersionOverride =" 2023.0.1" />
+    <PackageReference Include="Tekla.Structures.Plugins" IncludeAssets="compile; build" VersionOverride =" 2023.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json
@@ -44,61 +44,49 @@
       },
       "Tekla.Structures.Dialog": {
         "type": "Direct",
-        "requested": "[2023.0.0, )",
-        "resolved": "2023.0.0",
-        "contentHash": "DPwrFnmhnaQJT0HmuormXow/b0jgyUSJ6llW1If8Vp8EQJlk/+VyelwqTFGCE3kNQrw0BPGvZ/fgUYaxjHcfdw==",
+        "requested": "[2023.0.1, )",
+        "resolved": "2023.0.1",
+        "contentHash": "gtU7dwMvnGe1+JnERp4ve6vHAIX55zNDg4VpoPKNMH75s8eV8qVPYD3ThFj9mhAylFPaQWVohXIqHXpNaDSJ5A==",
         "dependencies": {
-          "Tekla.Structures": "2023.0.0",
-          "Tekla.Structures.Catalogs": "2023.0.0",
-          "Tekla.Structures.Datatype": "2023.0.0",
-          "Tekla.Structures.Model": "2023.0.0",
-          "Tekla.Structures.Plugins": "2023.0.0"
+          "Tekla.Structures": "2023.0.1",
+          "Tekla.Structures.Catalogs": "2023.0.1",
+          "Tekla.Structures.Datatype": "2023.0.1",
+          "Tekla.Structures.Model": "2023.0.1",
+          "Tekla.Structures.Plugins": "2023.0.1"
         }
       },
       "Tekla.Structures.Drawing": {
         "type": "Direct",
-        "requested": "[2023.0.0, )",
-        "resolved": "2023.0.0",
-        "contentHash": "22WqaO0GKxFOOEctU92ZmNCSzNJGjFwzDC/Px0+4Iimh6A3WL5Z7lvYSUhyCeF64YA7QbvK5PZKrtdhrB7Illg==",
+        "requested": "[2023.0.1, )",
+        "resolved": "2023.0.1",
+        "contentHash": "YAOYc0L1Tvjls1tFlpUTmLE2K3urq4XSxtxa2UtX6hC7XDiblRmwJTXAcBeiQ/mbB67k//WH8wh7QR/2h5nBAQ==",
         "dependencies": {
-          "DotNetZip": "1.13.7",
-          "Newtonsoft.Json": "13.0.1",
-          "Tekla.Structures": "2023.0.0",
-          "Tekla.Structures.Datatype": "2023.0.0",
-          "Tekla.Structures.Dialog": "2023.0.0",
-          "Tekla.Structures.Model": "2023.0.0",
-          "Tekla.Structures.Plugins": "2023.0.0",
-          "Tekla.Technology.Akit5": "5.8.17235.1",
-          "Tekla.Technology.Scripting": "5.0.20041"
+          "Tekla.Structures": "2023.0.1",
+          "Tekla.Structures.Datatype": "2023.0.1",
+          "Tekla.Structures.Dialog": "2023.0.1",
+          "Tekla.Structures.Model": "2023.0.1",
+          "Tekla.Structures.Plugins": "2023.0.1"
         }
       },
       "Tekla.Structures.Model": {
         "type": "Direct",
-        "requested": "[2023.0.0, )",
-        "resolved": "2023.0.0",
-        "contentHash": "dkw8cA4kqE/Jc6WAq8Zrzcn49Vs7kh0YNXuEBpcx6J76lv6jSl4n+EsIvxE8NEBJnEHsGoG67uLTaTkiKAmuXQ==",
+        "requested": "[2023.0.1, )",
+        "resolved": "2023.0.1",
+        "contentHash": "99e9lyTcW+Me4c4wUKqLbXoxHusPGSeBJGf01Upzg2lzXzaw5pUmVxEikNvievoN9Qt3Y09NTvhuL87UML7OIQ==",
         "dependencies": {
-          "Tekla.Structures": "2023.0.0",
-          "Tekla.Structures.Datatype": "2023.0.0"
+          "Tekla.Structures": "2023.0.1",
+          "Tekla.Structures.Datatype": "2023.0.1"
         }
       },
       "Tekla.Structures.Plugins": {
         "type": "Direct",
-        "requested": "[2023.0.0, )",
-        "resolved": "2023.0.0",
-        "contentHash": "8mD7XoH03QnHTTkHHICjdXJk8MrvhMNt74LmwtiYgYm/bF7TErGIzDEyl/MFgBPjji9m2I+mUJmCUvOde+A6NQ==",
+        "requested": "[2023.0.1, )",
+        "resolved": "2023.0.1",
+        "contentHash": "Wap1V8Fri3VAirfX51tqaQk6yPqPGj9Y9Y2FGPdyXg+7wZy+S1H+3DxtzEmh7ZuCHqCv5gIP0r+1yLE9fcjHdw==",
         "dependencies": {
-          "Tekla.Structures": "2023.0.0",
-          "Tekla.Technology.Akit5": "5.8.17235.1",
-          "Tekla.Technology.Scripting": "5.0.20041",
-          "Tekla.Technology.Scripting.Plugins": "5.3.17206"
+          "Tekla.Structures": "2023.0.1"
         }
       },
-      "DotNetZip": {
-        "type": "Transitive",
-        "resolved": "1.13.7",
-        "contentHash": "MGXK1jFJlxCWId2xcXnEdUov7M1oSMk+Gc/rF1psLOoqWNhCkfCqAIhIk1rSxeRCAGRt7JztQRMLC+DTapxc6g=="
-      },
       "GraphQL.Client": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -224,16 +212,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Mono.Cecil": {
-        "type": "Transitive",
-        "resolved": "0.9.6.1",
-        "contentHash": "yMsurNaOxxKIjyW9pEB+tRrR1S3DFnN1+iBgKvYvXG8kW0Y6yknJeMAe/tl3+P78/2C6304TgF7aVqpqXgEQ9Q=="
-      },
-      "Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.1",
-        "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
-      },
       "Speckle.DoubleNumerics": {
         "type": "Transitive",
         "resolved": "4.0.1",
@@ -331,41 +309,23 @@
       },
       "Tekla.Structures": {
         "type": "Transitive",
-        "resolved": "2023.0.0",
-        "contentHash": "tSO+SQZMoxA25t0a0SZj4U3Nw44nUdS/XetSZGUky1j0OYiHUOuA6EGMq+NMUapRJlWfL9lmlPOPPmVvVVHluQ=="
+        "resolved": "2023.0.1",
+        "contentHash": "M+3JfeWQsgYH3Lukhkfb/7nDOuANymde1HBYeyv+qG98vuIsgiU6u66vJv3XXiYM2islRodCBn7+ZI3vaJ1Tug=="
       },
       "Tekla.Structures.Catalogs": {
         "type": "Transitive",
-        "resolved": "2023.0.0",
-        "contentHash": "CMzgDBTeVOYGCQfpzJxjnkSZ7h64PWR/CcIQCC5W3vU8xokV4vR4XFp7ecU/ckz7olex9IZE1xmSGaC0LCXYQA==",
+        "resolved": "2023.0.1",
+        "contentHash": "jrsQDTiy/Xy72rI/s+olNzgN98WEDAcAj4TPT5opM0dvcnqMlf3uEGrEOKciO4tjSTmKfL9EJ8GZODsARKgKpw==",
         "dependencies": {
-          "Tekla.Structures": "2023.0.0",
-          "Tekla.Structures.Datatype": "2023.0.0",
-          "Tekla.Structures.Model": "2023.0.0"
+          "Tekla.Structures": "2023.0.1",
+          "Tekla.Structures.Datatype": "2023.0.1",
+          "Tekla.Structures.Model": "2023.0.1"
         }
       },
       "Tekla.Structures.Datatype": {
         "type": "Transitive",
-        "resolved": "2023.0.0",
-        "contentHash": "5q/7OvUTFgJrXfkcUrrRzF5yJqxHuVyFZvf1M5smC/RgF5zFqJsfUXxxFlhk03pc0pu+f6cD/QjRTVopAMU9Aw=="
-      },
-      "Tekla.Technology.Akit5": {
-        "type": "Transitive",
-        "resolved": "5.8.17235.1",
-        "contentHash": "MVvgt7lcJDYj9xqyZfVIfXXCUKodIL+F3y3Rvp7rc/46ukTzEtwuiW+IIlId1IQqtO3/WCZBPBQmBxfwhx9sFA=="
-      },
-      "Tekla.Technology.Scripting": {
-        "type": "Transitive",
-        "resolved": "5.0.20041",
-        "contentHash": "PXD4j7++eEWxmL7K7JxqEcwLmIfjDgbM4DsA1m9iw9NcSWj3DAx4V/luWRfEcUTYvV0cRgD6/nGoiCQQTVbiZQ=="
-      },
-      "Tekla.Technology.Scripting.Plugins": {
-        "type": "Transitive",
-        "resolved": "5.3.17206",
-        "contentHash": "GbdMWQjGufzB637bzfoQiP5N+MCbuTs5WqBEyOLvY7dA22zkKlwnwoPnW3Hy2hXPGhywNlcKmWCn4oKOcj22Uw==",
-        "dependencies": {
-          "Mono.Cecil": "0.9.6.1"
-        }
+        "resolved": "2023.0.1",
+        "contentHash": "24KbR++C2WYEIyDymIHX/AVuHYcgwyQrvgExMKDnMobQPNM+AmMNnwdyYxBbw4AvYXd8QHoi+lmmavhTCL8E3w=="
       },
       "speckle.connectors.common": {
         "type": "Project",
@@ -401,8 +361,8 @@
         "type": "Project",
         "dependencies": {
           "Speckle.Converters.Common": "[1.0.0, )",
-          "Tekla.Structures.Drawing": "[2023.0.0, )",
-          "Tekla.Structures.Model": "[2023.0.0, )"
+          "Tekla.Structures.Drawing": "[2023.0.1, )",
+          "Tekla.Structures.Model": "[2023.0.1, )"
         }
       },
       "speckle.converters.common": {

diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
     <TeklaVersion>2024</TeklaVersion>
     <UseWpf>true</UseWpf>
     <DefineConstants>$(DefineConstants);TEKLA2024</DefineConstants>

diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj b/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile" VersionOverride =" 2023.0.0" />
-    <PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile" VersionOverride =" 2023.0.0" />
+    <PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile" VersionOverride =" 2023.0.1" />
+    <PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile" VersionOverride =" 2023.0.1" />
   </ItemGroup>
 
   <ItemGroup>