0001-Update-the-projects.patch

S. Barut, 09/24/2018 12:57 PM

Download (5.57 KB)

View differences:

.gitignore
4 4
/rsb-cil-test/obj
5 5
/rsb-cil-test/bin
6 6
/packages
7
/.vs
rsb-cil-test/Program.cs
19 19
{
20 20
	class MainClass
21 21
	{
22
        static readonly string host = "localhost";
23
        static readonly int port = 30010;
22 24

  
23
		public static void PrintEvent(Event theEvent)
25
        public static void PrintEvent(Event theEvent)
24 26
		{
25 27
			Console.WriteLine("Received new event: " + theEvent);
26 28
			Console.WriteLine("  Data: " + theEvent.Data);
......
38 40

  
39 41
		static void Main(String[] args)
40 42
		{
41
			BasicConfigurator.Configure();
43

  
44
            BasicConfigurator.Configure();
42 45

  
43 46
			var inConverters = buildConverterSelection(new List<Tuple<String, IConverter>> { 
44 47
				new Tuple<string, IConverter>("bool",                                new BoolConverter()                                ),
......
50 53
				new Tuple<Type, IConverter>(typeof(JointAngles), new ProtocolBufferConverter(JointAngles.Descriptor))
51 54
			});
52 55

  
53
			var listener = new Listener(new InPushConnector(new BusClientConnection("localhost", 55555), new Scope("/"), inConverters));
56
			var listener = new Listener(new InPushConnector(new BusClientConnection(host, port), new Scope("/"), inConverters));
54 57
			listener.EventReceived += new NewEventHandler(PrintEvent);
55 58
			listener.Activate();
56 59

  
57
			var informer = new Informer("/test/narf", new OutConnector(new BusClientConnection("localhost", 55555),
60
			var informer = new Informer("/test/narf", new OutConnector(new BusClientConnection(host, port),
58 61
																				  outConverters));
59 62
			Console.WriteLine(informer.Scope);
60 63
			informer.Activate();
......
72 75

  
73 76
			informer.Deactivate();
74 77

  
75
			Thread.Sleep(20000000);
78
            Console.ReadKey();
76 79

  
77 80
			listener.Deactivate();
78 81

  
rsb-cil-test/rsb-cil-test.csproj
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
  <PropertyGroup>
4 4
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 5
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
......
8 8
    <RootNamespace>rsbciltest</RootNamespace>
9 9
    <AssemblyName>rsb-cil-test</AssemblyName>
10 10
    <StartupObject>rsbciltest.MainClass</StartupObject>
11
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12
    <TargetFrameworkProfile />
12 13
  </PropertyGroup>
13 14
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 15
    <DebugSymbols>true</DebugSymbols>
......
55 56
  <ItemGroup>
56 57
    <None Include="packages.config" />
57 58
  </ItemGroup>
58
  <ItemGroup>
59
    <Folder Include="Rst\" />
60
  </ItemGroup>
59
  <ItemGroup />
61 60
</Project>
rsb-cil/rsb-cil.csproj
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
  <PropertyGroup>
4 4
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 5
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
......
7 7
    <OutputType>Library</OutputType>
8 8
    <RootNamespace>rsbcil</RootNamespace>
9 9
    <AssemblyName>rsb-cil</AssemblyName>
10
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
10
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
11
    <TargetFrameworkProfile />
11 12
  </PropertyGroup>
12 13
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
13 14
    <DebugSymbols>true</DebugSymbols>
......
65 66
    <Compile Include="Rsb\Listener.cs" />
66 67
  </ItemGroup>
67 68
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
68
  <ItemGroup>
69
    <Folder Include="Rsb\Transport\" />
70
    <Folder Include="Rsb\Transport\Socket\" />
71
    <Folder Include="Rsb\Util\" />
72
    <Folder Include="Rsb\Converter\" />
73
  </ItemGroup>
74
  <ItemGroup>
75
    <None Include="packages.config" />
76
  </ItemGroup>
69
  <ItemGroup />
77 70
</Project>
78
-