Last few fixes and updates for 0.5.3

jdunkerley · Apr 21, 2017 · 569b6cf · 569b6cf
1 parent dea451f
commit 569b6cf
Show file tree

Hide file tree

Showing 16 changed files with 287 additions and 49 deletions.
diff --git a/AlteryxAddIns.Roslyn/AlteryxAddIns.Roslyn.csproj b/AlteryxAddIns.Roslyn/AlteryxAddIns.Roslyn.csproj
@@ -50,14 +50,14 @@
       <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OmniBus.Framework, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll</HintPath>
+    <Reference Include="OmniBus.Framework, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework.GUI, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.GUI.0.5.2\lib\net45\OmniBus.Framework.GUI.dll</HintPath>
+    <Reference Include="OmniBus.Framework.GUI, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.GUI.0.5.3\lib\net45\OmniBus.Framework.GUI.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework.Shared, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
+    <Reference Include="OmniBus.Framework.Shared, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
     </Reference>
     <Reference Include="Syncfusion.Core, Version=14.2460.0.26, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/AlteryxAddIns.Roslyn/packages.config b/AlteryxAddIns.Roslyn/packages.config
@@ -3,9 +3,9 @@
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" />
-  <package id="OmniBus.Framework" version="0.5.2" targetFramework="net45" />
-  <package id="OmniBus.Framework.GUI" version="0.5.2" targetFramework="net45" />
-  <package id="OmniBus.Framework.Shared" version="0.5.2" targetFramework="net45" />
+  <package id="OmniBus.Framework" version="0.5.3" targetFramework="net45" />
+  <package id="OmniBus.Framework.GUI" version="0.5.3" targetFramework="net45" />
+  <package id="OmniBus.Framework.Shared" version="0.5.3" targetFramework="net45" />
   <package id="System.Collections" version="4.0.0" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.37" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net45" />

diff --git a/AlteryxAddIns/AlteryxAddIns.csproj b/AlteryxAddIns/AlteryxAddIns.csproj
@@ -45,14 +45,14 @@
     <Reference Include="MathNet.Numerics">
       <HintPath>..\packages\MathNet.Numerics.3.13.1\lib\net40\MathNet.Numerics.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll</HintPath>
+    <Reference Include="OmniBus.Framework, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework.GUI, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.GUI.0.5.2\lib\net45\OmniBus.Framework.GUI.dll</HintPath>
+    <Reference Include="OmniBus.Framework.GUI, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.GUI.0.5.3\lib\net45\OmniBus.Framework.GUI.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework.Shared, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
+    <Reference Include="OmniBus.Framework.Shared, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/AlteryxAddIns/packages.config b/AlteryxAddIns/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MathNet.Numerics" version="3.13.1" targetFramework="net45" />
-  <package id="OmniBus.Framework" version="0.5.2" targetFramework="net45" />
-  <package id="OmniBus.Framework.GUI" version="0.5.2" targetFramework="net45" />
-  <package id="OmniBus.Framework.Shared" version="0.5.2" targetFramework="net45" />
+  <package id="OmniBus.Framework" version="0.5.3" targetFramework="net45" />
+  <package id="OmniBus.Framework.GUI" version="0.5.3" targetFramework="net45" />
+  <package id="OmniBus.Framework.Shared" version="0.5.3" targetFramework="net45" />
 </packages>
diff --git a/CreateRelease.ps1 b/CreateRelease.ps1
@@ -49,7 +49,7 @@ Get-ChildItem .\Release\Scripts\*.bat | Move-Item -Destination .\Release
 & .\Release\Install.bat
 
 .\RunUnitTests.ps1
-if ($LASTEXITCODE -eQ 2) {
+if ($LASTEXITCODE -ne 0) {
     Pop-Location
     exit -1
 }

diff --git a/OmniBus.AddIns.sln b/OmniBus.AddIns.sln
@@ -9,6 +9,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlteryxAddIns", "AlteryxAdd
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{E56FB22E-2BB8-4451-95E2-70CA5FF532AC}"
 	ProjectSection(SolutionItems) = preProject
+		Installbin.ps1 = Installbin.ps1
+		InstallbinDebug.bat = InstallbinDebug.bat
+		InstallbinRelease.bat = InstallbinRelease.bat
 		OmniBus.ruleset = OmniBus.ruleset
 		VersionInfo.cs = VersionInfo.cs
 	EndProjectSection

diff --git a/OmniBus.DotNetEngines/OmniBus.DotNetEngines.csproj b/OmniBus.DotNetEngines/OmniBus.DotNetEngines.csproj
@@ -45,11 +45,11 @@
     <Reference Include="MathNet.Numerics, Version=3.13.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MathNet.Numerics.3.13.1\lib\net40\MathNet.Numerics.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll</HintPath>
+    <Reference Include="OmniBus.Framework, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework.Shared, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
+    <Reference Include="OmniBus.Framework.Shared, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/OmniBus.DotNetEngines/packages.config b/OmniBus.DotNetEngines/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MathNet.Numerics" version="3.13.1" targetFramework="net45" />
-  <package id="OmniBus.Framework" version="0.5.2" targetFramework="net45" />
-  <package id="OmniBus.Framework.Shared" version="0.5.2" targetFramework="net45" />
+  <package id="OmniBus.Framework" version="0.5.3" targetFramework="net45" />
+  <package id="OmniBus.Framework.Shared" version="0.5.3" targetFramework="net45" />
   <package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
 </packages>
diff --git a/OmniBus.XmlTools/OmniBus.XmlTools.csproj b/OmniBus.XmlTools/OmniBus.XmlTools.csproj
@@ -40,14 +40,14 @@
       <HintPath>C:\Program Files\Alteryx\bin\AlteryxRecordInfo.Net.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OmniBus.Framework, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll</HintPath>
+    <Reference Include="OmniBus.Framework, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework.GUI, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.GUI.0.5.2\lib\net45\OmniBus.Framework.GUI.dll</HintPath>
+    <Reference Include="OmniBus.Framework.GUI, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.GUI.0.5.3\lib\net45\OmniBus.Framework.GUI.dll</HintPath>
     </Reference>
-    <Reference Include="OmniBus.Framework.Shared, Version=0.5.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
+    <Reference Include="OmniBus.Framework.Shared, Version=0.5.3.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/OmniBus.XmlTools/XmlInputEngine.cs b/OmniBus.XmlTools/XmlInputEngine.cs
@@ -80,7 +80,13 @@ public IEnumerable<object[]> ReadNodes()
                 return null;
             }
 
-            if (!System.IO.File.Exists(this.ConfigObject.FileName))
+            var fileName = System.IO.Path.IsPathRooted(this.ConfigObject.FileName)
+                               ? this.ConfigObject.FileName
+                               : System.IO.Path.Combine(
+                                   this.Engine.GetInitVar(nameof(InitVar.DefaultDir)),
+                                   this.ConfigObject.FileName);
+
+            if (!System.IO.File.Exists(fileName))
             {
                 this.Message($"File {this.ConfigObject.FileName} could not be read.", MessageStatus.STATUS_Error);
                 return null;
@@ -90,7 +96,7 @@ public IEnumerable<object[]> ReadNodes()
 
             try
             {
-                document.Load(this.ConfigObject.FileName);
+                document.Load(fileName);
             }
             catch (XmlException ex)
             {
@@ -105,6 +111,8 @@ public IEnumerable<object[]> ReadNodes()
         /// Read All The Xml Nodes From A Node
         /// Recursive scan from input node
         /// </summary>
+        /// <param name="node">Xml node to scan</param>
+        /// <param name="path">Current path to node</param>
         /// <returns>List of nodes</returns>
         public IEnumerable<object[]> ReadNodes(XmlNode node, string path = "")
         {
@@ -115,14 +123,14 @@ public IEnumerable<object[]> ReadNodes(XmlNode node, string path = "")
 
             path = path + "/" + (node is XmlAttribute ? "@" : "") + node.Name;
 
-            var nodes = node.ChildNodes.Cast<XmlNode>();
+            var nodes = node.ChildNodes.Cast<XmlNode>().ToArray();
             var txtNodes = nodes.Where(x => x.Name == "#text").ToArray();
 
-            var txt = txtNodes.Length == 0 ? node.InnerText : null;
+            var txt = nodes.Length == 0 ? node.InnerText : null;
             if (txtNodes.Length == 1)
             {
                 txt = txtNodes[0].InnerText;
-                nodes = nodes.Where(n => n.Name != "#text");
+                nodes = nodes.Where(n => n.Name != "#text").ToArray();
             }
 
             IEnumerable<object[]> result = new[] { new object[] { path, txt, node.InnerXml } };

diff --git a/OmniBus.XmlTools/packages.config b/OmniBus.XmlTools/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OmniBus.Framework" version="0.5.2" targetFramework="net45" />
-  <package id="OmniBus.Framework.GUI" version="0.5.2" targetFramework="net45" />
-  <package id="OmniBus.Framework.Shared" version="0.5.2" targetFramework="net45" />
+  <package id="OmniBus.Framework" version="0.5.3" targetFramework="net45" />
+  <package id="OmniBus.Framework.GUI" version="0.5.3" targetFramework="net45" />
+  <package id="OmniBus.Framework.Shared" version="0.5.3" targetFramework="net45" />
 </packages>
diff --git a/RunUnitTests.ps1 b/RunUnitTests.ps1
@@ -34,4 +34,5 @@ foreach ($bin in $bins) {
     Write-Host "Unit Tests Passed."
 }
 
-Pop-Location
+Pop-Location
+exit 0