Merge branch 'testing' of https://github.com/ENGworks-DEV/ENGyn into …

…testing
ENGworks-DEV · Dec 19, 2018 · 51f906d · 51f906d
2 parents 2a58447 + 6ed8806
commit 51f906d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/ENGyn-Installer2019.iss b/ENGyn-Installer2019.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{B827E3D1-F82E-45B9-9352-53C8EF41399F}
 AppName=ENGworks ENGyn 2019    
-AppVersion=0.1.4.5
+AppVersion=0.1.4.6
 
 AppPublisher=PRD
 AppPublisherURL=-
@@ -17,7 +17,7 @@ DefaultDirName={pf}\ENGyn
 DisableDirPage=yes
 DefaultGroupName=ENGworks ENGyn 2019
 DisableProgramGroupPage=yes
-OutputBaseFilename=ENG ENGyn 2019 Setup 0.1.4.5
+OutputBaseFilename=ENG ENGyn 2019 Setup 0.1.4.6
 Compression=lzma
 SolidCompression=yes
 OutputManifestFile=Setup-Manifest.txt

diff --git a/examples/GUID.vplxml b/examples/GUID.vplxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Document GraphFlowDirection="Horizontal">
+  <Nodes>
+    <ENGyn.Nodes.Selection.GetSelectionByGUID GUID="8eae42cf-30dc-4f97-b4fd-b5365476ea50" TOP="39910" Left="39928.362038664323" />
+    <TUM.CMS.VplControl.Nodes.Input.TextNode GUID="5e6bb51c-c9ac-4f35-97a0-52fb06ef21bd" TOP="39904" Left="39659.362038664323" Text="e1d4bdfb-2688-47c1-a386-3b481166e058" />
+    <ENGyn.Nodes.Navisworks.SetValueByCatProp GUID="8d3eda63-8cd5-46b6-bdde-3ee19d952acd" TOP="39953" Left="40174.362038664323" />
+    <TUM.CMS.VplControl.Nodes.Input.TextNode GUID="b4e6041d-7f8a-40c4-ba0f-0f1b169b788e" TOP="40024" Left="39825" Text="MyCategory" />
+    <TUM.CMS.VplControl.Nodes.Input.TextNode GUID="5c9ae26e-198b-41c7-b2e9-cd3383e744cb" TOP="40112" Left="39823" Text="MyProperty" />
+    <TUM.CMS.VplControl.Nodes.Input.TextNode GUID="8bcadd43-4d11-4b1d-989d-9d6e9209221e" TOP="39416" Left="39198" Text="" />
+    <TUM.CMS.VplControl.Nodes.Input.TextNode GUID="c2a96ca7-7ddc-4284-9440-ee0948d20a3b" TOP="40203" Left="39826" Text="MyValue" />
+  </Nodes>
+  <Connectors>
+    <TUM.CMS.VplControl.Core.Connector StartNode="5e6bb51c-c9ac-4f35-97a0-52fb06ef21bd" StartIndex="0" EndNode="8eae42cf-30dc-4f97-b4fd-b5365476ea50" EndIndex="0" />
+    <TUM.CMS.VplControl.Core.Connector StartNode="8eae42cf-30dc-4f97-b4fd-b5365476ea50" StartIndex="0" EndNode="8d3eda63-8cd5-46b6-bdde-3ee19d952acd" EndIndex="0" />
+    <TUM.CMS.VplControl.Core.Connector StartNode="b4e6041d-7f8a-40c4-ba0f-0f1b169b788e" StartIndex="0" EndNode="8d3eda63-8cd5-46b6-bdde-3ee19d952acd" EndIndex="1" />
+    <TUM.CMS.VplControl.Core.Connector StartNode="c2a96ca7-7ddc-4284-9440-ee0948d20a3b" StartIndex="0" EndNode="8d3eda63-8cd5-46b6-bdde-3ee19d952acd" EndIndex="3" />
+    <TUM.CMS.VplControl.Core.Connector StartNode="5c9ae26e-198b-41c7-b2e9-cd3383e744cb" StartIndex="0" EndNode="8d3eda63-8cd5-46b6-bdde-3ee19d952acd" EndIndex="2" />
+  </Connectors>
+</Document>
diff --git a/examples/examples.zip b/examples/examples.zip
diff --git a/src/ENGyn-Nodes/MainTools.cs b/src/ENGyn-Nodes/MainTools.cs
@@ -84,7 +84,7 @@ private static void StrechArgumentLists(List<Port> ports, List<Tuple<int, object
 
 
         //The sleep of reason produces monsters, or in my case horrible methods
-        public static object RunFunction(Func<object, object, object, object, object, object> method, List<Port> ports)
+        public static object RunFunction(Func< object, object, object, object, object, object> method, List<Port> ports)
         {
 
             var properties = method.GetType().GetProperties();

diff --git a/src/ENGyn/ENGyn.csproj b/src/ENGyn/ENGyn.csproj
@@ -136,34 +136,18 @@
       <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.gui.common.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="navisworks.gui.generic" Condition="'$(Configuration)' == 'Autodesk Navisworks Manage 2018'">
-      <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.gui.generic.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="navisworks.gui.generic, Version=15.0.1314.36, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.gui.generic.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="navisworks.gui.interface" Condition="'$(Configuration)' == 'Autodesk Navisworks Manage 2018'">
-      <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.gui.interface.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="navisworks.gui.interface, Version=15.0.1314.36, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.gui.interface.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="navisworks.gui.roamer" Condition="'$(Configuration)' == 'Autodesk Navisworks Manage 2018'">
-      <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.gui.roamer.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="navisworks.gui.roamer, Version=15.0.1314.36, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.gui.roamer.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="navisworks.roamer.plugin" Condition="'$(Configuration)' == 'Autodesk Navisworks Manage 2018'">
-      <HintPath>..\packages\Navisworks-2018-2019-x64-API.1.0.1\lib\net46\navisworks.roamer.plugin.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="AdWindows" Condition="'$(Configuration)' == 'Autodesk Navisworks Manage 2017'">
       <HintPath>..\packages\Navisworks-2017-x64-API.1.0.0\lib\net46\AdWindows.dll</HintPath>
       <Private>False</Private>
@@ -240,9 +224,6 @@
     <Reference Include="NCalc, Version=1.3.8.0, Culture=neutral, PublicKeyToken=973cde3f1cafed03, processorArchitecture=MSIL">
       <HintPath>..\packages\ncalc.1.3.8\lib\NCalc.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json" Condition="'$(Configuration)' == 'Autodesk Navisworks Manage 2018'">
-      <HintPath>C:\Program Files\Autodesk\Navisworks Manage 2018\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json" Condition="'$(Configuration)' == 'Autodesk Navisworks Manage 2017'">
       <HintPath>C:\Program Files\Autodesk\Navisworks Manage 2017\Newtonsoft.Json.dll</HintPath>
     </Reference>