BHoM · FraserGreenroyd · Mar 21, 2023 · Mar 21, 2023 · Mar 21, 2023 · Mar 21, 2023
diff --git a/SQL_Adapter/Properties/AssemblyInfo.cs b/SQL_Adapter/Properties/AssemblyInfo.cs
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *                                           
+ *                                                                              
+ * The BHoM is free software: you can redistribute it and/or modify         
+ * it under the terms of the GNU Lesser General Public License as published by  
+ * the Free Software Foundation, either version 3.0 of the License, or          
+ * (at your option) any later version.                                          
+ *                                                                              
+ * The BHoM is distributed in the hope that it will be useful,              
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 
+ * GNU Lesser General Public License for more details.                          
+ *                                                                            
+ * You should have received a copy of the GNU Lesser General Public License     
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
+ */
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("SQL_Adapter")]
+[assembly: AssemblyDescription("https://github.com/BHoM/SQL_Toolkit")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SQL_Adapter")]
+[assembly: AssemblyCopyright("Copyright © https://github.com/BHoM")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("4d861e16-ceec-4953-8f6a-1708d8167329")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.1.0.0")]
+
+
diff --git a/SQL_Adapter/SQL_Adapter.csproj b/SQL_Adapter/SQL_Adapter.csproj
@@ -1,29 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTarget="" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Description>https://github.com/BHoM/SQL_Toolkit</Description>
-    <FileVersion>6.1.0.0</FileVersion>
-    <AssemblyVersion>6.0.0.0</AssemblyVersion>
-    <Authors>BHoM</Authors>
-    <Copyright>Copyright © https://github.com/BHoM</Copyright>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4D861E16-CEEC-4953-8F6A-1708D8167329}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BH.Adapter.SQL</RootNamespace>
+    <AssemblyName>SQL_Adapter</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
     <OutputPath>..\Build\</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\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\SQL_Engine\SQL_Engine.csproj" />
-    <ProjectReference Include="..\SQL_oM\SQL_oM.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Adapter_oM">
       <HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
@@ -50,10 +56,36 @@
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot;  &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y" />
-  </Target>
-
+  <ItemGroup>
+    <Compile Include="AdapterActions\Execute.cs" />
+    <Compile Include="AdapterActions\Pull.cs" />
+    <Compile Include="AdapterActions\Push.cs" />
+    <Compile Include="AdapterActions\Remove.cs" />
+    <Compile Include="Convert\ToDictionary.cs" />
+    <Compile Include="SqlAdapter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SQL_Engine\SQL_Engine.csproj">
+      <Project>{089e0c4a-e022-4dae-868d-b46f0de06074}</Project>
+      <Name>SQL_Engine</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SQL_oM\SQL_oM.csproj">
+      <Project>{0a6a3dbf-220b-4c64-8ce5-3e0ddc479404}</Project>
+      <Name>SQL_oM</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)"  "C:\ProgramData\BHoM\Assemblies" /Y</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/SQL_Engine/Properties/AssemblyInfo.cs b/SQL_Engine/Properties/AssemblyInfo.cs
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *                                           
+ *                                                                              
+ * The BHoM is free software: you can redistribute it and/or modify         
+ * it under the terms of the GNU Lesser General Public License as published by  
+ * the Free Software Foundation, either version 3.0 of the License, or          
+ * (at your option) any later version.                                          
+ *                                                                              
+ * The BHoM is distributed in the hope that it will be useful,              
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 
+ * GNU Lesser General Public License for more details.                          
+ *                                                                            
+ * You should have received a copy of the GNU Lesser General Public License     
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
+ */
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("SQL_Engine")]
+[assembly: AssemblyDescription("https://github.com/BHoM/SQL_Toolkit")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SQL_Engine")]
+[assembly: AssemblyCopyright("Copyright © https://github.com/BHoM")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("089e0c4a-e022-4dae-868d-b46f0de06074")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.1.0.0")]
+
+
diff --git a/SQL_Engine/SQL_Engine.csproj b/SQL_Engine/SQL_Engine.csproj
@@ -1,33 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTarget="" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Description>https://github.com/BHoM/SQL_Toolkit</Description>
-    <FileVersion>6.1.0.0</FileVersion>
-    <AssemblyVersion>6.0.0.0</AssemblyVersion>
-    <Authors>BHoM</Authors>
-    <Copyright>Copyright © https://github.com/BHoM</Copyright>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{089E0C4A-E022-4DAE-868D-B46F0DE06074}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BH.Engine.SQL</RootNamespace>
+    <AssemblyName>SQL_Engine</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
     <OutputPath>..\Build\</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\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\SQL_oM\SQL_oM.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Adapter_oM">
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+      <HintPath>C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll</HintPath>
     </Reference>
     <Reference Include="BHoM">
       <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
@@ -44,10 +51,30 @@
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Compute\NewTableCommand.cs" />
+    <Compile Include="Convert\ToSqlTypeString.cs" />
+    <Compile Include="Convert\ToSqlCommand.cs" />
+    <Compile Include="Convert\FromDictionary.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot;  &quot;C:\ProgramData\BHoM\Assemblies&quot; /Y" />
-  </Target>
-
+  <ItemGroup>
+    <ProjectReference Include="..\SQL_oM\SQL_oM.csproj">
+      <Project>{0a6a3dbf-220b-4c64-8ce5-3e0ddc479404}</Project>
+      <Name>SQL_oM</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)"  "C:\ProgramData\BHoM\Assemblies" /Y</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/SQL_Toolkit.sln b/SQL_Toolkit.sln
@@ -1,32 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33403.182
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1382
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_oM", "SQL_oM\SQL_oM.csproj", "{7187B692-350F-4DB6-BCFC-8FAEEF13A607}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Adapter", "SQL_Adapter\SQL_Adapter.csproj", "{4D861E16-CEEC-4953-8F6A-1708D8167329}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Engine", "SQL_Engine\SQL_Engine.csproj", "{5882A976-3E46-41D5-9632-29E0E7500C87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_oM", "SQL_oM\SQL_oM.csproj", "{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Adapter", "SQL_Adapter\SQL_Adapter.csproj", "{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL_Engine", "SQL_Engine\SQL_Engine.csproj", "{089E0C4A-E022-4DAE-868D-B46F0DE06074}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7187B692-350F-4DB6-BCFC-8FAEEF13A607}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5882A976-3E46-41D5-9632-29E0E7500C87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5882A976-3E46-41D5-9632-29E0E7500C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5882A976-3E46-41D5-9632-29E0E7500C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5882A976-3E46-41D5-9632-29E0E7500C87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9FA48E87-F6B8-4E11-8F07-F2424A1F078A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D861E16-CEEC-4953-8F6A-1708D8167329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D861E16-CEEC-4953-8F6A-1708D8167329}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D861E16-CEEC-4953-8F6A-1708D8167329}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D861E16-CEEC-4953-8F6A-1708D8167329}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A6A3DBF-220B-4C64-8CE5-3E0DDC479404}.Release|Any CPU.Build.0 = Release|Any CPU
+		{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{089E0C4A-E022-4DAE-868D-B46F0DE06074}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE