From 928b01441a6a71c610a6216bff6633a8f3bab82b Mon Sep 17 00:00:00 2001
From: Sinan <sbarut@techfak.uni-bielefeld.de>
Date: Mon, 24 Sep 2018 12:13:33 +0200
Subject: [PATCH 1/4] Update the projects

Change to newer .Net Framework target version
Remove missing packages.conf file as it is not neccessary
Add the .vs directory to the .gitignore
Add the connection configuration as static variables to make the test
easier to adapt.
Change the sleep statement to a user interaction.
---
 .gitignore                       |  1 +
 rsb-cil-test/Program.cs          | 13 ++++++++-----
 rsb-cil-test/rsb-cil-test.csproj | 11 +++++------
 rsb-cil/rsb-cil.csproj           | 17 +++++------------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0ef19f..4538713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /rsb-cil-test/obj
 /rsb-cil-test/bin
 /packages
+/.vs
diff --git a/rsb-cil-test/Program.cs b/rsb-cil-test/Program.cs
index 01f217e..313e9cd 100644
--- a/rsb-cil-test/Program.cs
+++ b/rsb-cil-test/Program.cs
@@ -19,8 +19,10 @@ namespace rsbciltest
 {
 	class MainClass
 	{
+        static readonly string host = "localhost";
+        static readonly int port = 30010;
 
-		public static void PrintEvent(Event theEvent)
+        public static void PrintEvent(Event theEvent)
 		{
 			Console.WriteLine("Received new event: " + theEvent);
 			Console.WriteLine("  Data: " + theEvent.Data);
@@ -38,7 +40,8 @@ namespace rsbciltest
 
 		static void Main(String[] args)
 		{
-			BasicConfigurator.Configure();
+
+            BasicConfigurator.Configure();
 
 			var inConverters = buildConverterSelection(new List<Tuple<String, IConverter>> { 
 				new Tuple<string, IConverter>("bool",                                new BoolConverter()                                ),
@@ -50,11 +53,11 @@ namespace rsbciltest
 				new Tuple<Type, IConverter>(typeof(JointAngles), new ProtocolBufferConverter(JointAngles.Descriptor))
 			});
 
-			var listener = new Listener(new InPushConnector(new BusClientConnection("localhost", 55555), new Scope("/"), inConverters));
+			var listener = new Listener(new InPushConnector(new BusClientConnection(host, port), new Scope("/"), inConverters));
 			listener.EventReceived += new NewEventHandler(PrintEvent);
 			listener.Activate();
 
-			var informer = new Informer("/test/narf", new OutConnector(new BusClientConnection("localhost", 55555),
+			var informer = new Informer("/test/narf", new OutConnector(new BusClientConnection(host, port),
 																				  outConverters));
 			Console.WriteLine(informer.Scope);
 			informer.Activate();
@@ -72,7 +75,7 @@ namespace rsbciltest
 
 			informer.Deactivate();
 
-			Thread.Sleep(20000000);
+            Console.ReadKey();
 
 			listener.Deactivate();
 
diff --git a/rsb-cil-test/rsb-cil-test.csproj b/rsb-cil-test/rsb-cil-test.csproj
index cbeb284..1c0c4c1 100644
--- a/rsb-cil-test/rsb-cil-test.csproj
+++ b/rsb-cil-test/rsb-cil-test.csproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,8 @@
     <RootNamespace>rsbciltest</RootNamespace>
     <AssemblyName>rsb-cil-test</AssemblyName>
     <StartupObject>rsbciltest.MainClass</StartupObject>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,7 +56,5 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Rst\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/rsb-cil/rsb-cil.csproj b/rsb-cil/rsb-cil.csproj
index 977f705..041d042 100644
--- a/rsb-cil/rsb-cil.csproj
+++ b/rsb-cil/rsb-cil.csproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -7,7 +7,8 @@
     <OutputType>Library</OutputType>
     <RootNamespace>rsbcil</RootNamespace>
     <AssemblyName>rsb-cil</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,13 +66,5 @@
     <Compile Include="Rsb\Listener.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="Rsb\Transport\" />
-    <Folder Include="Rsb\Transport\Socket\" />
-    <Folder Include="Rsb\Util\" />
-    <Folder Include="Rsb\Converter\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file
-- 
2.14.2.windows.1