Update GTK RemoteAgents

diff --git a/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj b/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj
index edf4071..fd0a975 100644 (file)
--- a/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj
+++ b/Mono/RemoteAgents/GTKLinux/GTKLinux.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F58086C1-1E2F-459C-B8BE-269A245C09A2}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>GTKLinux</RootNamespace>
@@ -53,20 +51,17 @@ through JSON API.</Description>
     <Reference Include="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Mono.Posix" />
     <Reference Include="jsonrpc4net">
       <HintPath>..\..\..\jsonrpc4net\jsonrpc4net\bin\Debug\jsonrpc4net.dll</HintPath>
     </Reference>
-    <Reference Include="NLog">
-      <HintPath>..\..\..\ThirdParty\Libs\NLog\net45\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=c7439020c8fedf87">
       <Package>monodevelop</Package>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Net.Http">
-      <HintPath>..\..\..\..\..\..\..\usr\mymono\lib\mono\4.5\System.Net.Http.dll</HintPath>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Posix" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -97,5 +92,6 @@ through JSON API.</Description>
     <None Include="NLog.xsd">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>

diff --git a/Mono/RemoteAgents/GTKLinux/MainWindow.cs b/Mono/RemoteAgents/GTKLinux/MainWindow.cs
index bc9d341..0cd70c4 100644 (file)
--- a/Mono/RemoteAgents/GTKLinux/MainWindow.cs
+++ b/Mono/RemoteAgents/GTKLinux/MainWindow.cs
@@ -1,6 +1,5 @@
 using System;
 using Gtk;
-using System.Threading.Tasks;
 using Example.RemoteAgents.GTKLinux.View;
 using NLog;
 
@@ -32,7 +31,7 @@ namespace Example.RemoteAgents.GTKLinux
             }
             catch (Exception exception)
             {
-                logger.ErrorException("ButtonGetDateClicked error: ", exception);
+                logger.Error("ButtonGetDateClicked error: ", exception);
             }
         }
 
@@ -44,7 +43,7 @@ namespace Example.RemoteAgents.GTKLinux
             }
             catch (Exception exception)
             {
-                logger.ErrorException("SendDataButtonClicked error: ", exception);
+                logger.Error("SendDataButtonClicked error: ", exception);
             }
         }
     }

diff --git a/Mono/RemoteAgents/GTKLinux/View/View.cs b/Mono/RemoteAgents/GTKLinux/View/View.cs
index dcfcc09..6e1009c 100644 (file)
--- a/Mono/RemoteAgents/GTKLinux/View/View.cs
+++ b/Mono/RemoteAgents/GTKLinux/View/View.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Example.RemoteAgents.GTKLinux.ViewModel;
 
 

diff --git a/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs b/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs
index 497c086..dfca7db 100644 (file)
--- a/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs
+++ b/Mono/RemoteAgents/GTKLinux/ViewModel/ViewModel.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using GumartinM.JsonRPC4NET;
-using System.ComponentModel;
 
 namespace Example.RemoteAgents.GTKLinux.ViewModel
 {

diff --git a/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs b/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs
index 6d358d3..86c8e07 100644 (file)
--- a/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs
+++ b/Mono/RemoteAgents/GTKLinux/gtk-gui/Example.RemoteAgents.GTKLinux.MainWindow.cs
@@ -5,13 +5,21 @@ namespace Example.RemoteAgents.GTKLinux
        public partial class MainWindow
        {
                private global::Gtk.VBox vbox3;
+
                private global::Gtk.TextView RemoteDate;
+
                private global::Gtk.HBox hbox1;
+
                private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
                private global::Gtk.TextView TextToSend;
+
                private global::Gtk.SpinButton SpinButtonNumbers;
+
                private global::Gtk.HBox hbox2;
+
                private global::Gtk.Button ButtonGetDate;
+
                private global::Gtk.Button SendDataButton;
 
                protected virtual void Build ()

diff --git a/Mono/RemoteAgents/GTKLinux/packages.config b/Mono/RemoteAgents/GTKLinux/packages.config
new file mode 100644 (file)
index 0000000..91befb6
--- /dev/null
+++ b/Mono/RemoteAgents/GTKLinux/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="3.1.0.0" targetFramework="net45" />
+</packages>
\ No newline at end of file