Update to new deployment workflow

meso-unimpressed · Sep 3, 2018 · 882ade2 · 882ade2
1 parent c3f825c
commit 882ade2
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 32 deletions.
diff --git a/AbstractBehaviorNode.cs b/AbstractBehaviorNode.cs
@@ -57,7 +57,7 @@ public void Evaluate(int SpreadMax)
     }
 
     public abstract class AbstractBehaviorNode<T> : IPartImportsSatisfiedNotification, IPluginEvaluate
-        where T: InteractionBehavior, new()
+        where T: new()
     {
         [Output("Output")] public Pin<T> FOutput;
 
@@ -268,7 +268,7 @@ private void AddMemberPin(PropertyInfo member)
             IsMemberDictionary.Add(member, dictionary);
         }
 
-        private void FillObject(PropertyInfo member, InteractionBehavior behav, int i)
+        private void FillObject(PropertyInfo member, T behav, int i)
         {
             if (IsMemberDictionary[member])
             {

diff --git a/Notuiv.csproj b/Notuiv.csproj
@@ -35,22 +35,30 @@
       <HintPath>dlls\FeralTic.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
-    <Reference Include="md.stdl, Version=0.2.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\md-stdl.0.2.6-beta\lib\Net47\md.stdl.dll</HintPath>
+    <Reference Include="md.stdl, Version=0.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\md-stdl.0.3.2\lib\Net47\md.stdl.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="mp.pddn, Version=1.1.34.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\mp.pddn.1.1.34\lib\net47\mp.pddn.dll</HintPath>
+    <Reference Include="mp.pddn, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\mp.pddn.1.2.0\lib\net47\mp.pddn.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="Notui, Version=0.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Notui.0.2.2-beta\lib\Net47\Notui.dll</HintPath>
+    <Reference Include="Notui, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Notui.0.3.0\lib\Net47\Notui.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="SevenZip, Version=9.20.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\LZMA-SDK.9.20\lib\net20\SevenZip.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
       <HintPath>packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="SharpDX.Direct3D11">
       <HintPath>dlls\SharpDX.Direct3D11.dll</HintPath>
@@ -64,21 +72,20 @@
     </Reference>
     <Reference Include="SharpDX.RawInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
       <HintPath>packages\SharpDX.RawInput.4.0.1\lib\net45\SharpDX.RawInput.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="SimMetrics.Net, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\SimMetrics.Net.1.0.4\lib\net45\SimMetrics.Net.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="SlimDX, Version=4.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>dlls\vvvvlib\SlimDX.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.Composition.CodePlex">
       <HintPath>dlls\vvvvlib\System.ComponentModel.Composition.CodePlex.dll</HintPath>
       <Private>False</Private>
@@ -87,36 +94,50 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Interactive, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>packages\System.Interactive.3.1.1\lib\net45\System.Interactive.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>packages\System.Reactive.4.0.0-preview00001\lib\net46\System.Reactive.dll</HintPath>
+      <HintPath>packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>packages\System.Reactive.Core.4.0.0-preview00001\lib\net46\System.Reactive.Core.dll</HintPath>
+      <HintPath>packages\System.Reactive.Core.4.0.0\lib\net46\System.Reactive.Core.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>packages\System.Reactive.Interfaces.4.0.0-preview00001\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>packages\System.Reactive.Interfaces.4.0.0\lib\net46\System.Reactive.Interfaces.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>packages\System.Reactive.Linq.4.0.0-preview00001\lib\net46\System.Reactive.Linq.dll</HintPath>
+      <HintPath>packages\System.Reactive.Linq.4.0.0\lib\net46\System.Reactive.Linq.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>packages\System.Reactive.PlatformServices.4.0.0-preview00001\lib\net46\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>packages\System.Reactive.PlatformServices.4.0.0\lib\net46\System.Reactive.PlatformServices.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Reflection.Context.CodePlex">
       <HintPath>dlls\vvvvlib\System.Reflection.Context.CodePlex.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -168,6 +189,7 @@
       <HintPath>dlls\vvvvlib\VVVV.UtilsIL.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="About.cs" />

diff --git a/deploy/Notuiv/nodes/plugins/Sift (Notui.Element String) help.v4p b/deploy/Notuiv/nodes/plugins/Sift (Notui.Element String) help.v4p
@@ -375,6 +375,8 @@
    </PIN>
    <PIN pinname="Output" visible="1">
    </PIN>
+   <PIN pinname="Element" visible="1">
+   </PIN>
    </NODE>
    <LINK srcnodeid="56" srcpinname="Element Id" dstnodeid="57" dstpinname="Query">
    </LINK>
@@ -399,6 +401,12 @@
    </PIN>
    <PIN pinname="Contains" visible="1">
    </PIN>
+   <PIN pinname="Element" visible="1">
+   </PIN>
+   <PIN pinname="Output Bin Size" visible="1">
+   </PIN>
+   <PIN pinname="Exclude" slicecount="1" values="0">
+   </PIN>
    </NODE>
    <LINK srcnodeid="50" srcpinname="Y Output Value" dstnodeid="51" dstpinname="Use Name">
    </LINK>
@@ -434,4 +442,22 @@
    </NODE>
    <LINK srcnodeid="65" srcpinname="Hierarchical Elements" dstnodeid="71" dstpinname="Input Node">
    </LINK>
+   <LINK srcnodeid="65" srcpinname="Hierarchical Elements" dstnodeid="57" dstpinname="Element">
+   </LINK>
+   <LINK srcnodeid="65" srcpinname="Hierarchical Elements" dstnodeid="51" dstpinname="Element">
+   </LINK>
+   <NODE nodename="IOBox (Value Advanced)" componentmode="InABox" id="72">
+   <BOUNDS type="Box" left="10350" top="5850" width="795" height="240">
+   </BOUNDS>
+   <BOUNDS type="Node" left="10350" top="5850" width="0" height="0">
+   </BOUNDS>
+   <PIN pinname="Units" slicecount="1" values="||">
+   </PIN>
+   <PIN pinname="Precision" slicecount="1" values="4">
+   </PIN>
+   <PIN pinname="Value Type" slicecount="1" values="Integer">
+   </PIN>
+   </NODE>
+   <LINK srcnodeid="51" srcpinname="Output Bin Size" dstnodeid="72" dstpinname="Y Input Value">
+   </LINK>
    </PATCH>
diff --git a/packages.config b/packages.config
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="LZMA-SDK" version="9.20" targetFramework="net461" />
-  <package id="md-stdl" version="0.2.6-beta" targetFramework="net47" />
-  <package id="mp.pddn" version="1.1.34" targetFramework="net47" />
-  <package id="Notui" version="0.2.2-beta" targetFramework="net47" />
+  <package id="md-stdl" version="0.3.2" targetFramework="net47" />
+  <package id="mp.pddn" version="1.2.0" targetFramework="net47" />
+  <package id="Notui" version="0.3.0" targetFramework="net47" />
   <package id="SharpDX" version="4.0.1" targetFramework="net461" />
   <package id="SharpDX.RawInput" version="4.0.1" targetFramework="net461" />
   <package id="SimMetrics.Net" version="1.0.4" targetFramework="net461" />
-  <package id="System.Buffers" version="4.4.0" targetFramework="net47" />
   <package id="System.Interactive" version="3.1.1" targetFramework="net461" />
-  <package id="System.Memory" version="4.5.1" targetFramework="net47" />
   <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
-  <package id="System.Reactive" version="4.0.0-preview00001" targetFramework="net461" />
-  <package id="System.Reactive.Core" version="4.0.0-preview00001" targetFramework="net461" />
-  <package id="System.Reactive.Interfaces" version="4.0.0-preview00001" targetFramework="net461" />
-  <package id="System.Reactive.Linq" version="4.0.0-preview00001" targetFramework="net461" />
-  <package id="System.Reactive.PlatformServices" version="4.0.0-preview00001" targetFramework="net461" />
+  <package id="System.Reactive" version="4.0.0" targetFramework="net47" />
+  <package id="System.Reactive.Core" version="4.0.0" targetFramework="net47" />
+  <package id="System.Reactive.Interfaces" version="4.0.0" targetFramework="net47" />
+  <package id="System.Reactive.Linq" version="4.0.0" targetFramework="net47" />
+  <package id="System.Reactive.PlatformServices" version="4.0.0" targetFramework="net47" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net47" />
 </packages>