Fixed up folder paths and WiX install script.

Source/Applications/openXDA/openXDA/openXDA.csproj

@@ -310,7 +310,7 @@
       <Project>{7f731255-fa83-4dbf-9e0f-c22ae4845e76}</Project>
       <Name>openHistorian.XDALink</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\openXDA.DataHub\openXDA.Hubs.csproj">
+    <ProjectReference Include="..\..\..\Libraries\openXDA.Hubs\openXDA.Hubs.csproj">
       <Project>{63e2953c-1c57-41c8-a51d-08e52780bf8a}</Project>
       <Name>openXDA.Hubs</Name>
     </ProjectReference>

Source/Applications/openXDA/openXDASetup/openXDASetup.wixproj

@@ -74,6 +74,22 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Libraries\openXDA.ArcGIS\openXDA.ArcGIS.csproj">
+      <Name>openXDA.ArcGIS</Name>
+      <Project>{a74aebc8-4a3f-49df-a95b-b992ed8f6cef}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Libraries\openXDA.EMCB\openXDA.EMCB.csproj">
+      <Name>openXDA.EMCB</Name>
+      <Project>{d755fab9-64d2-4c65-a765-9bd986cf8594}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\openXDA.PQTrendingWebReport\openXDA.PQTrendingWebReport.csproj">
       <Name>openXDA.PQTrendingWebReport</Name>
       <Project>{2635efe2-ef6f-4110-9229-8d91f02df143}</Project>
@@ -98,7 +114,7 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\openXDA.DataHub\openXDA.Hubs.csproj">
+    <ProjectReference Include="..\..\..\Libraries\openXDA.Hubs\openXDA.Hubs.csproj">
       <Name>openXDA.Hubs</Name>
       <Project>{63e2953c-1c57-41c8-a51d-08e52780bf8a}</Project>
       <Private>True</Private>

Source/Applications/openXDA/openXDASetup/openXDASetup.wxs

@@ -339,6 +339,10 @@
               </CreateFolder>
             </Component>
 
+            <Directory Id="ARCGISFOLDER" Name="ArcGISRuntime100.4">
+              <Directory Id="ARCGISCLIENTFOLDER" Name="client64" />
+            </Directory>
+
             <Directory Id="FILEWATCHERFOLDER" Name="FileWatcher" />
             <Directory Id="DEBUGFOLDER" Name="Debug" />
             <Directory Id="RESULTSFOLDER" Name="Results" />
@@ -355,6 +359,10 @@
                 <util:PermissionEx User="[SERVICENAME] Admins" CreateFile="yes" CreateChild="yes" GenericRead="yes" GenericWrite="yes" GenericExecute="yes" Delete="yes" DeleteChild="yes" />
               </CreateFolder>
             </Component>
+
+            <Directory Id="ARCGISFOLDER" Name="ArcGISRuntime100.4">
+              <Directory Id="ARCGISCLIENTFOLDER" Name="client32" />
+            </Directory>
 
             <Directory Id="FILEWATCHERFOLDER" Name="FileWatcher" />
             <Directory Id="DEBUGFOLDER" Name="Debug" />
@@ -434,6 +442,8 @@
       <ComponentRef Id="FaultAlgorithms" />
       <ComponentRef Id="FaultData" />
       <ComponentRef Id="openXDA.Adapters" />
+      <ComponentRef Id="openXDA.ArcGIS" />
+      <ComponentRef Id="openXDA.EMCB" />
       <ComponentRef Id="openHistorian.XDALink" />
       <ComponentRef Id="openXDA.Hubs" />
       <ComponentRef Id="openXDA.Model" />
@@ -446,6 +456,11 @@
 
       <!-- DotNetZip Dependencies -->
       <ComponentRef Id="Ionic.Zlib" />
+
+      <!-- ESRI.ArcGIS Dependencies -->
+      <ComponentRef Id="runtimecore" />
+      <ComponentRef Id="RuntimeCoreNet" />
+      <ComponentRef Id="Esri.ArcGISRuntime" />
 
       <!-- log4net Dependencies -->
       <ComponentRef Id="log4net" />
@@ -555,6 +570,12 @@
       <Component Id="openXDA.Adapters">
         <File Id="openXDA.Adapters.dll" Name="$(var.openXDA.Adapters.TargetFileName)" Source="$(var.openXDA.Adapters.TargetPath)" />
       </Component>
+      <Component Id="openXDA.ArcGIS">
+        <File Id="openXDA.ArcGIS.dll" Name="$(var.openXDA.ArcGIS.TargetFileName)" Source="$(var.openXDA.ArcGIS.TargetPath)" />
+      </Component>
+      <Component Id="openXDA.EMCB">
+        <File Id="openXDA.EMCB.dll" Name="$(var.openXDA.EMCB.TargetFileName)" Source="$(var.openXDA.EMCB.TargetPath)" />
+      </Component>
       <Component Id="openXDA.Hubs">
         <File Id="openXDA.Hubs.dll" Name="$(var.openXDA.Hubs.TargetFileName)" Source="$(var.openXDA.Hubs.TargetPath)" />
       </Component>
@@ -567,21 +588,15 @@
       <Component Id="openXDA.Reports">
         <File Id="openXDA.Reports.dll" Name="$(var.openXDA.Reports.TargetFileName)" Source="$(var.openXDA.Reports.TargetPath)" />
       </Component>
-
       <Component Id="openXDA.PQTrendingWebReport">
         <File Id="openXDA.PQTrendingWebReport.dll" Name="$(var.openXDA.PQTrendingWebReport.TargetFileName)" Source="$(var.openXDA.PQTrendingWebReport.TargetPath)" />
       </Component>
-
       <Component Id="openXDA.StepChangeWebReport">
         <File Id="openXDA.StepChangeWebReport.dll" Name="$(var.openXDA.StepChangeWebReport.TargetFileName)" Source="$(var.openXDA.StepChangeWebReport.TargetPath)" />
       </Component>
-
-
-
       <Component Id="PQMark.DataAggregator">
         <File Id="PQMark.DataAggregator.dll" Name="$(var.PQMark.DataAggregator.TargetFileName)" Source="$(var.PQMark.DataAggregator.TargetPath)" />
       </Component>
-
       <Component Id="openHistorian.XDALink">
         <File Id="openHistorian.XDALink.dll" Name="$(var.openHistorian.XDALink.TargetFileName)" Source="$(var.openHistorian.XDALink.TargetPath)" />
       </Component>
@@ -591,6 +606,11 @@
         <File Id="Ionic.Zlib.dll" Name="Ionic.Zlib.dll" Source="$(var.SolutionDir)\Dependencies\DotNetZip\Ionic.Zlib.dll" />
       </Component>
 
+      <!-- ESRI.ArcGIS Dependencies -->
+      <Component Id="Esri.ArcGISRuntime">
+        <File Id="Esri.ArcGISRuntime.dll" Name="Esri.ArcGISRuntime.dll" Source="$(var.SolutionDir)\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\lib\net461\Esri.ArcGISRuntime.dll" />
+      </Component>
+
       <!-- log4net Dependencies -->
       <Component Id="log4net">
         <File Id="log4net.dll" Name="log4net.dll" Source="$(var.SolutionDir)\Dependencies\NuGet\log4net.2.0.3\lib\net40-full\log4net.dll" />
@@ -759,6 +779,25 @@
         <File Id="System.Web.WebPages.Razor.dll" Name="System.Web.WebPages.Razor.dll" Source="$(var.SolutionDir)\Dependencies\GSF\System.Web.WebPages.Razor.dll" />
       </Component>
     </ComponentGroup>
+
+    <!-- ESRI.ArcGIS Runtime Components-->
+    <ComponentGroup Id="ESRIArcGISRuntimeComponents" Directory="ARCGISCLIENTFOLDER">
+      <?if $(var.Platform) = x64 ?>
+      <Component Id="runtimecore">
+        <File Id="runtimecore.dll" Name="runtimecore.dll" Source="$(var.SolutionDir)\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\lib\net461\arcgisruntime100.4\client64\runtimecore.dll" />
+      </Component>
+      <Component Id="RuntimeCoreNet">
+        <File Id="RuntimeCoreNet.dll" Name="RuntimeCoreNet.dll" Source="$(var.SolutionDir)\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\lib\net461\arcgisruntime100.4\client64\RuntimeCoreNet.dll" />
+      </Component>
+      <?else ?>
+      <Component Id="runtimecore">
+        <File Id="runtimecore.dll" Name="runtimecore.dll" Source="$(var.SolutionDir)\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\lib\net461\arcgisruntime100.4\client32\runtimecore.dll" />
+      </Component>
+      <Component Id="RuntimeCoreNet">
+        <File Id="RuntimeCoreNet.dll" Name="RuntimeCoreNet.dll" Source="$(var.SolutionDir)\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\lib\net461\arcgisruntime100.4\client32\RuntimeCoreNet.dll" />
+      </Component>
+      <?endif ?>
+    </ComponentGroup>
 
     <!-- File Watcher Service Components -->
     <ComponentGroup Id="FileWatcherServiceComponents" Directory="FILEWATCHERFOLDER">

Source/Libraries/openXDA.ArcGIS/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Resources;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -34,3 +35,4 @@
 // [assembly: AssemblyVersion("2.4.0.1")]
 [assembly: AssemblyVersion("2.4.0.1")]
 [assembly: AssemblyFileVersion("2.4.0.1")]
+

Source/Libraries/openXDA.ArcGIS/openXDA.ArcGIS.csproj

@@ -10,6 +10,7 @@
     <RootNamespace>openXDA.ArcGIS</RootNamespace>
     <AssemblyName>openXDA.ArcGIS</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <SupportedCultures>en-US</SupportedCultures>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
@@ -19,22 +20,23 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\Build\Output\Debug\Libraries\openXDA.ArcGIS\</OutputPath>
+    <OutputPath>..\..\..\Build\Output\Debug\Libraries\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\Build\Output\Release\Libraries\openXDA.ArcGIS\</OutputPath>
+    <OutputPath>..\..\..\Build\Output\Release\Libraries\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Esri.ArcGISRuntime, Version=100.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <HintPath>..\..\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\lib\net461\Esri.ArcGISRuntime.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="GSF.Core">
       <HintPath>..\..\Dependencies\GSF\GSF.Core.dll</HintPath>
@@ -58,6 +60,23 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <PropertyGroup>
+    <ArcGISDependencyFolder>$(SolutionDir)\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\lib\net461</ArcGISDependencyFolder>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="$(ArcGISDependencyFolder)\Esri.ArcGISRuntime.dll" Visible="false">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(ArcGISDependencyFolder)\**\runtimecore.dll" Visible="false">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(ArcGISDependencyFolder)\**\RuntimeCoreNet.dll" Visible="false">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FaultData\FaultData.csproj">
       <Project>{11ae594d-2b2b-473c-8550-6bf62914c3e2}</Project>
@@ -70,6 +89,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\build\net461\Esri.ArcGISRuntime.WPF.targets" Condition="Exists('..\..\Dependencies\NuGet\Esri.ArcGISRuntime.WPF.100.4.0\build\net461\Esri.ArcGISRuntime.WPF.targets')" />
+  <ItemGroup>
+    <Content Update="$(ArcGISDependencyFolder)\**\*.cso">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

Source/Libraries/XDA.EMCB/IntervalDataReader.cs → Source/Libraries/openXDA.EMCB/IntervalDataReader.cs

@@ -33,7 +33,7 @@
 using Newtonsoft.Json.Linq;
 using openXDA.Model;
 
-namespace XDA.EMCB
+namespace openXDA.EMCB
 {
     public class IntervalDataReader : IDataReader
     {

Source/Libraries/XDA.EMCB/Properties/AssemblyInfo.cs → Source/Libraries/openXDA.EMCB/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("XDA.EMCB")]
+[assembly: AssemblyTitle("openXDA.EMCB")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XDA.EMCB")]
+[assembly: AssemblyProduct("openXDA.EMCB")]
 [assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Source/Libraries/XDA.EMCB/WaveformReader.cs → Source/Libraries/openXDA.EMCB/WaveformReader.cs

@@ -33,7 +33,7 @@
 using Newtonsoft.Json.Linq;
 using openXDA.Model;
 
-namespace XDA.EMCB
+namespace openXDA.EMCB
 {
     public class WaveformReader : IDataReader
     {

Source/Libraries/XDA.EMCB/XDA.EMCB.csproj → Source/Libraries/openXDA.EMCB/openXDA.EMCB.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{D755FAB9-64D2-4C65-A765-9BD986CF8594}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XDA.EMCB</RootNamespace>
-    <AssemblyName>XDA.EMCB</AssemblyName>
+    <RootNamespace>openXDA.EMCB</RootNamespace>
+    <AssemblyName>openXDA.EMCB</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>

Source/openXDA.sln

@@ -112,7 +112,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.Adapters", "Librari
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.Model", "Libraries\openXDA.Model\openXDA.Model.csproj", "{A1A0BC13-50ED-4DC9-8C1E-3293B0B69281}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.Hubs", "Libraries\openXDA.DataHub\openXDA.Hubs.csproj", "{63E2953C-1C57-41C8-A51D-08E52780BF8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.Hubs", "Libraries\openXDA.Hubs\openXDA.Hubs.csproj", "{63E2953C-1C57-41C8-A51D-08E52780BF8A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.DataPusher", "Libraries\openXDA.DataPusher\openXDA.DataPusher.csproj", "{666EB8A6-FBA9-454C-8537-9113C2EE68D4}"
 EndProject
@@ -130,7 +130,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.PQTrendingWebReport
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.StepChangeWebReport", "Libraries\openXDA.StepChangeWebReport\openXDA.StepChangeWebReport.csproj", "{1F3B639C-6C49-480D-A184-AED1C86AD97B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDA.EMCB", "Libraries\XDA.EMCB\XDA.EMCB.csproj", "{D755FAB9-64D2-4C65-A765-9BD986CF8594}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.EMCB", "Libraries\openXDA.EMCB\openXDA.EMCB.csproj", "{D755FAB9-64D2-4C65-A765-9BD986CF8594}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openXDA.ArcGIS", "Libraries\openXDA.ArcGIS\openXDA.ArcGIS.csproj", "{A74AEBC8-4A3F-49DF-A95B-B992ED8F6CEF}"
 EndProject