From a3ccd8ec0f16fec6714ebdddc6b3a9ba348cd0c2 Mon Sep 17 00:00:00 2001
From: Stan Lagun <slagun@mirantis.com>
Date: Tue, 10 Sep 2013 01:45:49 +0400
Subject: [PATCH] Project retargeted to .NET 4.0CP. Fixed incorrect warning
 message in logs

Change-Id: I2a2915434f1fbb4f79c8d843a431fd75f4bfb911
---
 WindowsAgent/App.config          | 14 ++++++--------
 WindowsAgent/PlanExecutor.cs     |  5 +++--
 WindowsAgent/Program.cs          |  2 +-
 WindowsAgent/WindowsAgent.csproj |  7 +++++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/WindowsAgent/App.config b/WindowsAgent/App.config
index 7a2641c7..85d96b37 100644
--- a/WindowsAgent/App.config
+++ b/WindowsAgent/App.config
@@ -1,20 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0"?>
 <configuration>
 	<configSections>
 		<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
 	</configSections>
 	<startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
     </startup>
-	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<targets>
-			<target name="file" xsi:type="File" fileName="${basedir}/log.txt"
-					layout="${date} ${level}: &lt;${logger:shortName=true}&gt; ${message} ${exception:format=tostring}"/>
+			<target name="file" xsi:type="File" fileName="${basedir}/log.txt" layout="${date} ${level}: &lt;${logger:shortName=true}&gt; ${message} ${exception:format=tostring}"/>
 		</targets>
 
 		<rules>
-			<logger name="*" minlevel="Debug" writeTo="file" />
+			<logger name="*" minlevel="Debug" writeTo="file"/>
 		</rules>
 	</nlog>
 	<appSettings>
@@ -27,4 +25,4 @@
 		<add key="rabbitmq.durableMessages" value="true"/>
 
 	</appSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/WindowsAgent/PlanExecutor.cs b/WindowsAgent/PlanExecutor.cs
index 17f6c99a..628eeb4d 100644
--- a/WindowsAgent/PlanExecutor.cs
+++ b/WindowsAgent/PlanExecutor.cs
@@ -42,7 +42,9 @@ namespace Mirantis.Murano.WindowsAgent
 				List<ExecutionResult> currentResults = null;
 				try
 				{
-					currentResults = JsonConvert.DeserializeObject<List<ExecutionResult>>(File.ReadAllText(resultPath));
+					currentResults = File.Exists(resultPath) ? 
+						JsonConvert.DeserializeObject<List<ExecutionResult>>(File.ReadAllText(resultPath)) : 
+						new List<ExecutionResult>();
 				}
 				catch(Exception exception)
 				{
@@ -50,7 +52,6 @@ namespace Mirantis.Murano.WindowsAgent
 					currentResults = new List<ExecutionResult>();
 				}
 
-
 				runSpace = RunspaceFactory.CreateRunspace();
 				runSpace.Open();
 
diff --git a/WindowsAgent/Program.cs b/WindowsAgent/Program.cs
index 007f419e..5aeba8a8 100644
--- a/WindowsAgent/Program.cs
+++ b/WindowsAgent/Program.cs
@@ -30,7 +30,7 @@ namespace Mirantis.Murano.WindowsAgent
 		{
 			base.OnStart(args);
 
-			Log.Info("Version 0.5.2");
+			Log.Info("Version 0.5.3");
 
 			this.rabbitMqClient = new RabbitMqClient();
 
diff --git a/WindowsAgent/WindowsAgent.csproj b/WindowsAgent/WindowsAgent.csproj
index f6c714b5..bf9aba9a 100644
--- a/WindowsAgent/WindowsAgent.csproj
+++ b/WindowsAgent/WindowsAgent.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Mirantis.Murano.WindowsAgent</RootNamespace>
     <AssemblyName>WindowsAgent</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -62,7 +63,9 @@
     <Compile Include="ExecutionPlan.cs" />
     <Compile Include="MqMessage.cs" />
     <Compile Include="PlanExecutor.cs" />
-    <Compile Include="Program.cs" />
+    <Compile Include="Program.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RabbitMqClient.cs" />
     <Compile Include="ServiceManager.cs" />