Fix: remove converter references for CSI (#1547)

* receive now works * sending now works Co-authored-by: Connor Ivy <[email protected]> Co-authored-by: Alan Rynne <[email protected]>
specklesystems · Aug 30, 2022 · d8e782b · d8e782b
1 parent 078813c
commit d8e782b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 35 deletions.
diff --git a/ConnectorCSI/ConnectorCSI.sln b/ConnectorCSI/ConnectorCSI.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31624.102
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorETABS", "ConnectorETABS\ConnectorETABS.csproj", "{81299D15-5788-414D-A962-1A568C251323}"
 EndProject
@@ -42,23 +42,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriverPluginCSharp", "DriverPluginCSharp\DriverPluginCSharp.csproj", "{C59939F6-D383-44E3-A7EF-4E160E3DFB73}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{14d40a8a-9f8f-44f6-b256-21b7f5cc4fb6}*SharedItemsImports = 5
-		ConnectorCSIShared\ConnectorCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4
-		ConnectorCSIShared\ConnectorCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13
-		ConnectorCSIShared\ConnectorCSIShared.projitems*{61374cd0-e774-4dcd-bfab-6356b0931283}*SharedItemsImports = 13
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{7572e400-c007-48e4-98fc-614fdee0b572}*SharedItemsImports = 5
-		ConnectorCSIShared\ConnectorCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{8431e383-838b-4f0a-8065-979c3dae9ccb}*SharedItemsImports = 5
-		ConnectorCSIShared\ConnectorCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4
-		ConnectorCSIShared\ConnectorCSIShared.projitems*{c091e499-597d-4077-b83f-08e069091090}*SharedItemsImports = 4
-		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{c95c0d85-50c2-46d1-9e27-f86d0d40058c}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -146,4 +129,17 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {61234D5B-1E5E-4C97-89A1-FA97E4B63D95}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{14d40a8a-9f8f-44f6-b256-21b7f5cc4fb6}*SharedItemsImports = 5
+		ConnectorCSIShared\ConnectorCSIShared.projitems*{23be6e54-96c1-4373-89f3-e18a1c9807fd}*SharedItemsImports = 4
+		ConnectorCSIShared\ConnectorCSIShared.projitems*{31e0c098-6813-4571-ab96-a245e0fc1c23}*SharedItemsImports = 4
+		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{5bbde14e-50f8-4d6e-8e35-747667ad4a09}*SharedItemsImports = 13
+		ConnectorCSIShared\ConnectorCSIShared.projitems*{61374cd0-e774-4dcd-bfab-6356b0931283}*SharedItemsImports = 13
+		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{7572e400-c007-48e4-98fc-614fdee0b572}*SharedItemsImports = 5
+		ConnectorCSIShared\ConnectorCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 4
+		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{8431e383-838b-4f0a-8065-979c3dae9ccb}*SharedItemsImports = 5
+		ConnectorCSIShared\ConnectorCSIShared.projitems*{9d188843-8841-4a76-a844-efbe8e32ee05}*SharedItemsImports = 4
+		ConnectorCSIShared\ConnectorCSIShared.projitems*{c091e499-597d-4077-b83f-08e069091090}*SharedItemsImports = 4
+		..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{c95c0d85-50c2-46d1-9e27-f86d0d40058c}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
diff --git a/ConnectorCSI/ConnectorCSIBridge/ConnectorCSIBridge.csproj b/ConnectorCSI/ConnectorCSIBridge/ConnectorCSIBridge.csproj
@@ -114,6 +114,5 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="..\ConnectorCSIShared\ConnectorCSIShared.projitems" Label="Shared" />
-  <Import Project="..\..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/ConnectorCSI/ConnectorETABS/ConnectorETABS.csproj b/ConnectorCSI/ConnectorETABS/ConnectorETABS.csproj
@@ -107,7 +107,6 @@
       <Version>1.3.6</Version>
     </PackageReference>
   </ItemGroup>
-  <Import Project="..\..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems" Label="Shared" />
   <Import Project="..\ConnectorCSIShared\ConnectorCSIShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/ConnectorCSI/ConnectorSAFE/ConnectorSAFE.csproj b/ConnectorCSI/ConnectorSAFE/ConnectorSAFE.csproj
@@ -108,6 +108,5 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="..\ConnectorCSIShared\ConnectorCSIShared.projitems" Label="Shared" />
-  <Import Project="..\..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/ConnectorCSI/ConnectorSAP2000/ConnectorSAP2000.csproj b/ConnectorCSI/ConnectorSAP2000/ConnectorSAP2000.csproj
@@ -62,14 +62,6 @@
       <Project>{0c1b9ae4-1d21-4c02-bdac-287e9660b5f6}</Project>
       <Name>DesktopUI2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Objects\Converters\StructuralUtilities\PolygonMesher\PolygonMesher.csproj">
-      <Project>{bf1a4f95-acf7-4353-b60a-4d79c2f44651}</Project>
-      <Name>PolygonMesher</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Objects\Objects\Objects.csproj">
-      <Project>{f6f813fc-153b-49fe-9b33-25152be85ba8}</Project>
-      <Name>Objects</Name>
-    </ProjectReference>
     <ProjectReference Include="..\DriverCSharp\DriverCSharp.csproj">
       <Project>{c091e499-597d-4077-b83f-08e069091090}</Project>
       <Name>DriverCSharp</Name>
@@ -107,7 +99,6 @@
       <Version>1.3.6</Version>
     </PackageReference>
   </ItemGroup>
-  <Import Project="..\..\Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems" Label="Shared" />
   <Import Project="..\ConnectorCSIShared\ConnectorCSIShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSI.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/ConverterCSI.cs
@@ -75,6 +75,8 @@ public bool CanConvertToNative(Base @object)
 
     public bool CanConvertToSpeckle(object @object)
     {
+      if (@object == null)
+        return false;
       foreach (var type in Enum.GetNames(typeof(ConverterCSI.CSIAPIUsableTypes)))
       {
         if (type == @object.ToString())

diff --git a/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs b/Objects/Converters/ConverterCSI/ConverterCSIShared/Partial Classes/Geometry/ConvertFrame.cs
@@ -44,7 +44,7 @@ public object FrameToNative(Element1D element1D)
       string units = ModelUnits();
       string newFrame = "";
       Line baseline = element1D.baseLine;
-      string[] properties = null;
+      string[] properties = new string[] { };
       int number = 0;
       Model.PropFrame.GetNameList(ref number, ref properties);
       if (!properties.Contains(element1D.property.name))

diff --git a/...onverters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs b/...onverters/ConverterCSI/ConverterCSIShared/Partial Classes/Properties/Convert1DProperty.cs
@@ -15,7 +15,7 @@ public partial class ConverterCSI
     public object Property1DToNative(Property1D property1D)
     {
       int numbMaterial = 0;
-      string[] materials = null;
+      string[] materials = new string[] { };
       Model.PropFrame.GetNameList(ref numbMaterial, ref materials);
       if (property1D.material != null)
       {

diff --git a/Objects/Converters/ConverterCSI/ConverterSAP2000/ConverterSAP2000.csproj b/Objects/Converters/ConverterCSI/ConverterSAP2000/ConverterSAP2000.csproj
@@ -36,8 +36,8 @@
     <IsDesktopBuild Condition="'$(IsDesktopBuild)' == ''">true</IsDesktopBuild>
   </PropertyGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent"  Condition="'$(IsDesktopBuild)' == true">
-    <Exec Condition="$([MSBuild]::IsOsPlatform('Windows'))" Command="xcopy /Y /S &quot;$(TargetDir)$(AssemblyName).dll&quot; &quot;$(AppData)\Speckle\Kits\Objects\&quot;" />
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(IsDesktopBuild)' == true">
+    <Exec Condition="$([MSBuild]::IsOsPlatform('Windows'))" Command="xcopy /Y /S &quot;$(TargetDir)$(AssemblyName).dll&quot; &quot;$(AppData)\Speckle\Kits\Objects\&quot;&#xD;&#xA;xcopy /Y /S &quot;$(TargetDir)PolygonMesher.dll&quot; &quot;$(AppData)\Speckle\Kits\Objects\&quot;" />
   </Target>
 
 </Project>