Bump Newtonsoft.Json from 12.0.2 to 13.0.2 in /DeviceSQL.Service

DeviceSQL.ChannelManager/DeviceSQL.ChannelManager.sqlproj

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Name>DeviceSQL.ChannelManager</Name>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectVersion>4.1</ProjectVersion>
+    <ProjectGuid>{6393a621-3002-48ab-8de0-74a03ffc4afb}</ProjectGuid>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql140DatabaseSchemaProvider</DSP>
+    <OutputType>Database</OutputType>
+    <RootPath>
+    </RootPath>
+    <RootNamespace>DeviceSQL.ChannelManager</RootNamespace>
+    <AssemblyName>DeviceSQL.ChannelManager</AssemblyName>
+    <ModelCollation>1033, CI</ModelCollation>
+    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
+    <DeployToDatabase>True</DeployToDatabase>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetLanguage>CS</TargetLanguage>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SqlServerVerification>False</SqlServerVerification>
+    <IncludeCompositeObjects>True</IncludeCompositeObjects>
+    <TargetDatabaseSet>True</TargetDatabaseSet>
+    <DefaultSchema>ChannelManager</DefaultSchema>
+    <PermissionSet>UNSAFE</PermissionSet>
+    <SignAssembly>False</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\DeviceSQL-Key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
+    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
+    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <ItemGroup>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+</Project>

DeviceSQL.ChannelManager/Properties/AssemblyInfo.cs

@@ -0,0 +1,24 @@
+using System.Reflection;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with the SQLCLR assembly.
+[assembly: AssemblyTitle("DeviceSQL.ChannelManager")]
+[assembly: AssemblyDescription("DeviceSQL.ChannelManager")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("CloudSonix")]
+[assembly: AssemblyProduct("DeviceSQL")]
+[assembly: AssemblyCopyright("© CloudSonix. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyKeyFileAttribute("../DeviceSQL-Key.snk")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DeviceSQL.DeviceManager/DeviceSQL.DeviceManager.sqlproj

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Name>DeviceSQL.DeviceManager</Name>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectVersion>4.1</ProjectVersion>
+    <ProjectGuid>{0186afd4-f3e0-42c0-a6ba-58f704804c31}</ProjectGuid>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql140DatabaseSchemaProvider</DSP>
+    <OutputType>Database</OutputType>
+    <RootPath>
+    </RootPath>
+    <RootNamespace>DeviceSQL.DeviceManager</RootNamespace>
+    <AssemblyName>DeviceSQL.DeviceManager</AssemblyName>
+    <ModelCollation>1033, CI</ModelCollation>
+    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
+    <DeployToDatabase>True</DeployToDatabase>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetLanguage>CS</TargetLanguage>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SqlServerVerification>False</SqlServerVerification>
+    <IncludeCompositeObjects>True</IncludeCompositeObjects>
+    <TargetDatabaseSet>True</TargetDatabaseSet>
+    <DefaultSchema>DeviceManager</DefaultSchema>
+    <TargetFrameworkProfile />
+    <PermissionSet>UNSAFE</PermissionSet>
+    <SignAssembly>False</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\DeviceSQL-Key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
+    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
+    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <ItemGroup>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+</Project>

DeviceSQL.DeviceManager/Properties/AssemblyInfo.cs

@@ -0,0 +1,24 @@
+using System.Reflection;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with the SQLCLR assembly.
+[assembly: AssemblyTitle("DeviceSQL.DeviceManager")]
+[assembly: AssemblyDescription("DeviceSQL.DeviceManager")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("CloudSonix")]
+[assembly: AssemblyProduct("DeviceSQL")]
+[assembly: AssemblyCopyright("© CloudSonix. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyKeyFileAttribute("../DeviceSQL-Key.snk")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DeviceSQL.Utilities.DeploymentScriptFormatter/DeviceSQL.Utilities.DeploymentScriptFormatter.csproj → DeviceSQL.Devices.Common/DeviceSQL.Devices.Common.csproj

@@ -4,16 +4,16 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0EA05DA7-635F-4018-9F33-0D3419374C9F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DeviceSQL.Utilities.DeploymentScriptFormatter</RootNamespace>
-    <AssemblyName>DeviceSQL.Utilities.DeploymentScriptFormatter</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <ProjectGuid>{5DEADADF-BE60-4774-80C6-97B3A83FA289}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DeviceSQL.Devices.Common</RootNamespace>
+    <AssemblyName>DeviceSQL.Devices.Common</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -23,15 +23,24 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -42,11 +51,23 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Program.cs" />
+    <Compile Include="Device\IMaster.cs" />
+    <Compile Include="Device\IMessage.cs" />
+    <Compile Include="IO\Channels\ChannelTraceEventArgs.cs" />
+    <Compile Include="IO\Channels\ChannelTraceListener.cs" />
+    <Compile Include="IO\Channels\HexConverter.cs" />
+    <Compile Include="IO\Channels\IChannel.cs" />
+    <Compile Include="IO\Channels\IMuxChannel.cs" />
+    <Compile Include="IO\Channels\SerialPortChannel.cs" />
+    <Compile Include="IO\Channels\SerialPortMuxChannel.cs" />
+    <Compile Include="IO\Channels\TcpChannel.cs" />
+    <Compile Include="IO\Channels\TcpMuxChannel.cs" />
+    <Compile Include="IO\Channels\TimedThreadBlocker.cs" />
+    <Compile Include="IO\Channels\Transport\ITransport.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

DeviceSQL.Devices.Common/IO/Channels/ChannelTraceEventArgs.cs

@@ -0,0 +1,23 @@
+#region Imported Types
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#endregion
+
+namespace DeviceSQL.IO.Channels
+{
+    public class ChannelTraceEventArgs : EventArgs
+    {
+        public DateTime MessageDateTimeStamp { get; set; }
+        public string Name { get; set; }
+        public DateTime StartTime { get; set; }
+        public string Operation { get; set; }
+        public double Duration { get; set; }
+        public int Sequence { get; set; }
+        public int Count { get; set; }
+        public string Data { get; set; }
+        public string ChannelType { get; set; }
+    }
+}

DeviceSQL/IO/Channels/ChannelTraceListener.cs → DeviceSQL.Devices.Common/IO/Channels/ChannelTraceListener.cs

@@ -8,12 +8,12 @@
 namespace DeviceSQL.IO.Channels
 {
 
-    internal class ChannelTraceListener : TraceListener
+    public class ChannelTraceListener : TraceListener
     {
 
         #region Events
 
-        internal event EventHandler<ChannelTraceEventArgs> ChannelTraceMessageReceived;
+        public event EventHandler<ChannelTraceEventArgs> ChannelTraceMessageReceived;
 
         #endregion
 
@@ -29,7 +29,7 @@ internal class ChannelTraceListener : TraceListener
 
         #endregion
 
-        internal ChannelTraceListener()
+        public ChannelTraceListener()
         {
             try
             {

DeviceSQL/IO/Channels/HexConverter.cs → DeviceSQL.Devices.Common/IO/Channels/HexConverter.cs

@@ -4,7 +4,12 @@
 
 #endregion
 
+
+#if SQLTYPES
+namespace DeviceSQL.SQLTypes.ROC.IO.Channels
+#else
 namespace DeviceSQL.IO.Channels
+#endif
 {
     public static class HexConverter
     {

DeviceSQL/IO/Channels/IChannel.cs → DeviceSQL.Devices.Common/IO/Channels/IChannel.cs

@@ -1,5 +1,6 @@
 #region Imported Types
 
+using Newtonsoft.Json;
 using System;
 
 #endregion
@@ -8,6 +9,7 @@ namespace DeviceSQL.IO.Channels
 {
     public interface IChannel : IDisposable
     {
+        [JsonIgnore]
         object LockObject { get; }
         string Name { get; set; }
         bool TracingEnabled { get; set; }

DeviceSQL/IO/Channels/IMuxChannel.cs → DeviceSQL.Devices.Common/IO/Channels/IMuxChannel.cs

@@ -2,8 +2,7 @@ namespace DeviceSQL.IO.Channels
 {
     public interface IMuxChannel : IChannel
     {
-        string SourceChannelName { get; set; }
-        IChannel SourceChannel { get; }
+        IChannel SourceChannel { get; set; }
         int RequestDelay { get; set; }
         int ResponseDelay { get; set; }
         int ResponseTimeout { get; set; }

DeviceSQL/IO/Channels/SerialPortChannel.cs → DeviceSQL.Devices.Common/IO/Channels/SerialPortChannel.cs

@@ -57,6 +57,7 @@ public bool TracingEnabled
         public SerialPort SerialPort
         {
             get { return serialPort; }
+            set { serialPort = value; }
         }
 
         public int ReadTimeout