From 5134e66249249787e2d063610d2f01f9fb7acc5c Mon Sep 17 00:00:00 2001 From: adecler Date: Mon, 23 Sep 2019 16:06:42 +0100 Subject: [PATCH] Update file assembly version and set BHoM dependencies to not copy local --- Socket_Adapter/Properties/AssemblyInfo.cs | 2 +- Socket_Adapter/Socket_Adapter.csproj | 6 ++ Socket_Test/App.config | 6 -- Socket_Test/Program.cs | 121 ---------------------- Socket_Test/Properties/AssemblyInfo.cs | 57 ---------- Socket_Test/Socket_Test.csproj | 76 -------------- Socket_Toolkit.sln | 13 +-- Socket_oM/Properties/AssemblyInfo.cs | 2 +- Socket_oM/Socket_oM.csproj | 2 + 9 files changed, 15 insertions(+), 270 deletions(-) delete mode 100644 Socket_Test/App.config delete mode 100644 Socket_Test/Program.cs delete mode 100644 Socket_Test/Properties/AssemblyInfo.cs delete mode 100644 Socket_Test/Socket_Test.csproj diff --git a/Socket_Adapter/Properties/AssemblyInfo.cs b/Socket_Adapter/Properties/AssemblyInfo.cs index c73958f..53409d1 100644 --- a/Socket_Adapter/Properties/AssemblyInfo.cs +++ b/Socket_Adapter/Properties/AssemblyInfo.cs @@ -54,4 +54,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.3.0.0")] +[assembly: AssemblyFileVersion("2.4.0.0")] diff --git a/Socket_Adapter/Socket_Adapter.csproj b/Socket_Adapter/Socket_Adapter.csproj index 23ccc81..68157ad 100644 --- a/Socket_Adapter/Socket_Adapter.csproj +++ b/Socket_Adapter/Socket_Adapter.csproj @@ -32,12 +32,15 @@ ..\..\BHoM\Build\BHoM.dll + False ..\..\BHoM_Adapter\Build\BHoM_Adapter.dll + False ..\..\BHoM\Build\Data_oM.dll + False ..\packages\MongoDB.Bson.2.4.4\lib\net45\MongoDB.Bson.dll @@ -46,9 +49,11 @@ False ..\..\BHoM_Engine\Build\Reflection_Engine.dll + False ..\..\BHoM_Engine\Build\Serialiser_Engine.dll + False @@ -84,6 +89,7 @@ {3f378f18-88db-4139-9a20-00bca576cfb1} Socket_oM + False diff --git a/Socket_Test/App.config b/Socket_Test/App.config deleted file mode 100644 index 88fa402..0000000 --- a/Socket_Test/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Socket_Test/Program.cs b/Socket_Test/Program.cs deleted file mode 100644 index b7803c6..0000000 --- a/Socket_Test/Program.cs +++ /dev/null @@ -1,121 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2018, 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 BH.Adapter.Socket; -using BH.oM.Base; -using BH.oM.Geometry; -using BH.oM.Socket; -using System; -using System.Collections.Generic; -using System.Threading; - -namespace Socket_Test -{ - class A - { - - public A(double gVal = 0, double pVal = 0) - { - getProp = gVal; - privateField = pVal; - } - - public double a { get; set; } - public double publicField; - private double privateField; - public double getProp { get; private set; } - } - class B : A { public double b { get; set; } } - class C : A { public double c { get; set; } } - class D : B { public double d { get; set; } } - class E : C { public double e { get; set; } } - - - class Program - { - static void Main(string[] args) - { - TestTcpSocket(); - - Console.ReadLine(); - } - - - static void TestTcpSocket() - { - List items = new List - { - new A (-6, -7) { a = 1, publicField = -4 }, - new B { a = 2, b = 45 }, - new C { a = 3, c = 56 }, - new D { a = 4, b = 67, d = 123 }, - new E { a = 5, c = 78, e = 456 }, - new Dictionary { - { "A", new A { a = 1 } }, - { "C", new C { a = 3, c = 56 } }, - { "E", new E { a = 5, c = 78, e = 456 } } - } - }; - - int port = 8888; - int nbLinks = 3; - List links = new List(); - for (int i = 0; i < nbLinks; i++) - { - Thread.Sleep(200); - SocketLink_Tcp link = new SocketLink_Tcp(port); - link.DataObservers += ReceivedData; - links.Add(link); - } - - Console.WriteLine("Sending data..."); - int nbSenders = 3; - for (int i = 0; i < nbSenders; i++) - { - Thread.Sleep(200); - links[i].SendData(items, i.ToString()); - } - - - /*Thread.Sleep(1000); - - for (int i = 0; i < 10000; i++) - items.Add(new Node { Position = new Point { X = 1, Y = 2, Z = 3 }, Name = ("X" + i) }); - Console.WriteLine("Sending data..."); - client.SendData(items); - - while(true) - { - string userMessage = Console.ReadLine(); - if (userMessage.Length == 0) - break; - else - client.SendData(new List { userMessage }); - }*/ - } - - static void ReceivedData(DataPackage package) - { - Console.WriteLine("Link received " + package.Data.Count + " objects with the tag " + package.Tag); - } - } -} diff --git a/Socket_Test/Properties/AssemblyInfo.cs b/Socket_Test/Properties/AssemblyInfo.cs deleted file mode 100644 index ac94da4..0000000 --- a/Socket_Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the Buildings and Habitats object Model (BHoM) - * Copyright (c) 2015 - 2018, 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_Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Socket_Test")] -[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("d5580b47-e61e-41bc-9b05-e6ac8328f099")] - -// 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("2.0.0.0")] -[assembly: AssemblyFileVersion("2.3.0.0")] diff --git a/Socket_Test/Socket_Test.csproj b/Socket_Test/Socket_Test.csproj deleted file mode 100644 index a944a4d..0000000 --- a/Socket_Test/Socket_Test.csproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - Debug - AnyCPU - {D5580B47-E61E-41BC-9B05-E6AC8328F099} - Exe - Properties - Socket_Test - Socket_Test - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\BHoM\Build\BHoM.dll - - - ..\..\BHoM\Build\Geometry_oM.dll - - - - - - - - - - - - - - - - - - - - {ffef6e83-840b-41b3-94a1-7dd10550ab02} - Socket_Engine - - - {3f378f18-88db-4139-9a20-00bca576cfb1} - Socket_oM - - - - - \ No newline at end of file diff --git a/Socket_Toolkit.sln b/Socket_Toolkit.sln index 396aae7..f0a59c1 100644 --- a/Socket_Toolkit.sln +++ b/Socket_Toolkit.sln @@ -1,12 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.757 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Socket_Adapter", "Socket_Adapter\Socket_Adapter.csproj", "{FFEF6E83-840B-41B3-94A1-7DD10550AB02}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Socket_Test", "Socket_Test\Socket_Test.csproj", "{D5580B47-E61E-41BC-9B05-E6AC8328F099}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Socket_oM", "Socket_oM\Socket_oM.csproj", "{3F378F18-88DB-4139-9A20-00BCA576CFB1}" EndProject Global @@ -19,10 +17,6 @@ Global {FFEF6E83-840B-41B3-94A1-7DD10550AB02}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFEF6E83-840B-41B3-94A1-7DD10550AB02}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFEF6E83-840B-41B3-94A1-7DD10550AB02}.Release|Any CPU.Build.0 = Release|Any CPU - {D5580B47-E61E-41BC-9B05-E6AC8328F099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5580B47-E61E-41BC-9B05-E6AC8328F099}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5580B47-E61E-41BC-9B05-E6AC8328F099}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5580B47-E61E-41BC-9B05-E6AC8328F099}.Release|Any CPU.Build.0 = Release|Any CPU {3F378F18-88DB-4139-9A20-00BCA576CFB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F378F18-88DB-4139-9A20-00BCA576CFB1}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F378F18-88DB-4139-9A20-00BCA576CFB1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -31,4 +25,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {847DA225-19CE-416C-8EC8-863B1794C36F} + EndGlobalSection EndGlobal diff --git a/Socket_oM/Properties/AssemblyInfo.cs b/Socket_oM/Properties/AssemblyInfo.cs index cac627e..4fb58af 100644 --- a/Socket_oM/Properties/AssemblyInfo.cs +++ b/Socket_oM/Properties/AssemblyInfo.cs @@ -54,4 +54,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.3.0.0")] +[assembly: AssemblyFileVersion("2.4.0.0")] diff --git a/Socket_oM/Socket_oM.csproj b/Socket_oM/Socket_oM.csproj index e748f22..713c640 100644 --- a/Socket_oM/Socket_oM.csproj +++ b/Socket_oM/Socket_oM.csproj @@ -32,9 +32,11 @@ ..\..\BHoM\Build\BHoM.dll + False ..\..\BHoM\Build\Reflection_oM.dll + False