diff --git a/Socket_Adapter/AdapterActions/Pull.cs b/Socket_Adapter/AdapterActions/Pull.cs index 2ed1c4f..28b6e7d 100644 --- a/Socket_Adapter/AdapterActions/Pull.cs +++ b/Socket_Adapter/AdapterActions/Pull.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -50,3 +50,4 @@ public override IEnumerable Pull(IRequest request, oM.Adapter.PullType p + diff --git a/Socket_Adapter/AdapterActions/Push.cs b/Socket_Adapter/AdapterActions/Push.cs index d785504..1ce89b9 100644 --- a/Socket_Adapter/AdapterActions/Push.cs +++ b/Socket_Adapter/AdapterActions/Push.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -41,3 +41,4 @@ public override List Push(IEnumerable objects, string tag = "", + diff --git a/Socket_Adapter/Properties/AssemblyInfo.cs b/Socket_Adapter/Properties/AssemblyInfo.cs deleted file mode 100644 index 69fc796..0000000 --- a/Socket_Adapter/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, 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 . - */ - -using System.Reflection; -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("Socket_Engine")] -[assembly: AssemblyDescription("https://github.com/BHoM/Socket_Toolkit")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Socket_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("ffef6e83-840b-41b3-94a1-7dd10550ab02")] - -// 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.0.0.0")] - - - diff --git a/Socket_Adapter/Socket_Adapter.cs b/Socket_Adapter/Socket_Adapter.cs index fbfd562..93fb814 100644 --- a/Socket_Adapter/Socket_Adapter.cs +++ b/Socket_Adapter/Socket_Adapter.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -63,3 +63,4 @@ private void M_Link_DataObservers(DataPackage package) + diff --git a/Socket_Adapter/Socket_Adapter.csproj b/Socket_Adapter/Socket_Adapter.csproj index f8a38af..1989857 100644 --- a/Socket_Adapter/Socket_Adapter.csproj +++ b/Socket_Adapter/Socket_Adapter.csproj @@ -1,34 +1,23 @@ - - - + + - Debug - AnyCPU - {FFEF6E83-840B-41B3-94A1-7DD10550AB02} - Library - Properties + netstandard2.0 + https://github.com/BHoM/Socket_Toolkit + 6.1.0.0 + 6.0.0.0 BH.Adapter.Socket - Socket_Adapter - v4.7.2 - 512 - - - true - full - false - ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Build\ - TRACE - prompt - 4 + ..\Build\ + true + + + + + + + + + C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll @@ -55,68 +44,20 @@ False False - - ..\packages\MongoDB.Bson.2.18.0\lib\net472\MongoDB.Bson.dll - - False C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll False False - - - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - - - - - - - - - - - - - - - - - {3f378f18-88db-4139-9a20-00bca576cfb1} - Socket_oM - False - - - - - - - - - xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - xcopy "$(TargetDir)MongoDB.Bson.dll" "C:\ProgramData\BHoM\Assemblies" /Y - - - - \ No newline at end of file + + diff --git a/Socket_Adapter/Tcp/DataEvent.cs b/Socket_Adapter/Tcp/DataEvent.cs index b83ed2a..5353f2c 100644 --- a/Socket_Adapter/Tcp/DataEvent.cs +++ b/Socket_Adapter/Tcp/DataEvent.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -29,3 +29,4 @@ namespace BH.Adapter.Socket + diff --git a/Socket_Adapter/Tcp/DataTransmitter.cs b/Socket_Adapter/Tcp/DataTransmitter.cs index c89d243..977f36f 100644 --- a/Socket_Adapter/Tcp/DataTransmitter.cs +++ b/Socket_Adapter/Tcp/DataTransmitter.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -141,3 +141,4 @@ protected bool SendToClient(TcpClient client, byte[] data) + diff --git a/Socket_Adapter/Tcp/Global.cs b/Socket_Adapter/Tcp/Global.cs index 71ce774..395a507 100644 --- a/Socket_Adapter/Tcp/Global.cs +++ b/Socket_Adapter/Tcp/Global.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -32,3 +32,4 @@ public static class Global + diff --git a/Socket_Adapter/Tcp/SocketLink_Tcp.cs b/Socket_Adapter/Tcp/SocketLink_Tcp.cs index 1e1c4c1..4133156 100644 --- a/Socket_Adapter/Tcp/SocketLink_Tcp.cs +++ b/Socket_Adapter/Tcp/SocketLink_Tcp.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -194,3 +194,4 @@ protected override void HandleNewData(byte[] data, TcpClient source) + diff --git a/Socket_Adapter/Tcp/SocketServer_Tcp.cs b/Socket_Adapter/Tcp/SocketServer_Tcp.cs index 6480d35..f43fd63 100644 --- a/Socket_Adapter/Tcp/SocketServer_Tcp.cs +++ b/Socket_Adapter/Tcp/SocketServer_Tcp.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -172,3 +172,4 @@ private void AcceptClient(IAsyncResult ar) + diff --git a/Socket_Adapter/Udp/MessageEvent_Udp.cs b/Socket_Adapter/Udp/MessageEvent_Udp.cs index 959bed3..af3e70a 100644 --- a/Socket_Adapter/Udp/MessageEvent_Udp.cs +++ b/Socket_Adapter/Udp/MessageEvent_Udp.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -33,3 +33,4 @@ namespace BH.Adapter.Socket } + diff --git a/Socket_Adapter/Udp/SocketLink_Udp.cs b/Socket_Adapter/Udp/SocketLink_Udp.cs index cb8341f..58d73be 100644 --- a/Socket_Adapter/Udp/SocketLink_Udp.cs +++ b/Socket_Adapter/Udp/SocketLink_Udp.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -98,3 +98,4 @@ private static bool SendAll(SS.Socket mySocket, IPEndPoint ePoint, byte[] data) + diff --git a/Socket_Adapter/Udp/SocketServer_Udp.cs b/Socket_Adapter/Udp/SocketServer_Udp.cs index 311eddd..7f9865b 100644 --- a/Socket_Adapter/Udp/SocketServer_Udp.cs +++ b/Socket_Adapter/Udp/SocketServer_Udp.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -179,3 +179,4 @@ private static int ReadInt(StateObject state) } + diff --git a/Socket_Adapter/Udp/StateObject_Udp.cs b/Socket_Adapter/Udp/StateObject_Udp.cs index fca6525..12f2a17 100644 --- a/Socket_Adapter/Udp/StateObject_Udp.cs +++ b/Socket_Adapter/Udp/StateObject_Udp.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -50,3 +50,4 @@ public class StateObject } + diff --git a/Socket_Adapter/packages.config b/Socket_Adapter/packages.config deleted file mode 100644 index fc0cc05..0000000 --- a/Socket_Adapter/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Socket_oM/DataPackage.cs b/Socket_oM/DataPackage.cs index 475cc9f..5548aa3 100644 --- a/Socket_oM/DataPackage.cs +++ b/Socket_oM/DataPackage.cs @@ -1,6 +1,6 @@ /* * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved. + * 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. @@ -45,3 +45,4 @@ public class DataPackage : IObject + diff --git a/Socket_oM/Properties/AssemblyInfo.cs b/Socket_oM/Properties/AssemblyInfo.cs deleted file mode 100644 index c14f64f..0000000 --- a/Socket_oM/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2022, 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 . - */ - -using System.Reflection; -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("Socket_oM")] -[assembly: AssemblyDescription("https://github.com/BHoM/Socket_Toolkit")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Socket_oM")] -[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("3f378f18-88db-4139-9a20-00bca576cfb1")] - -// 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.0.0.0")] - - - diff --git a/Socket_oM/Socket_oM.csproj b/Socket_oM/Socket_oM.csproj index f081fc9..14607f3 100644 --- a/Socket_oM/Socket_oM.csproj +++ b/Socket_oM/Socket_oM.csproj @@ -1,67 +1,24 @@ - - - + + - Debug - AnyCPU - {3F378F18-88DB-4139-9A20-00BCA576CFB1} - Library - Properties - BH.oM.Socket - Socket_oM - v4.7.2 - 512 - - - true - full - false - ..\Build\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\Build\ - TRACE - prompt - 4 + netstandard2.0 + https://github.com/BHoM/Socket_Toolkit + 6.1.0.0 + 6.0.0.0 + BH.oM.Adapters.Socket + ..\Build\ + C:\ProgramData\BHoM\Assemblies\BHoM.dll False False - - - - - - - - - - - - - - - - - - -xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y - - - +