From 918b4133c7be936d9a5606a55afd16840c59d1f2 Mon Sep 17 00:00:00 2001
From: Eric Fontana <efontana@vistaprint.com>
Date: Thu, 14 Aug 2014 10:37:37 -0400
Subject: [PATCH] Last changes for .NET 4.0

---
 .../TimberWinR.ServiceHost.csproj             | 10 ++++----
 TimberWinR.ServiceHost/packages.config        |  4 ++--
 TimberWinR/TimberWinR.csproj                  |  1 -
 TimberWinR/TimberWinR.nuspec                  | 24 -------------------
 4 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 TimberWinR/TimberWinR.nuspec

diff --git a/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj b/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
index d0d96a6..f65fe9f 100644
--- a/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
+++ b/TimberWinR.ServiceHost/TimberWinR.ServiceHost.csproj
@@ -33,7 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RapidRegex.Core">
+    <Reference Include="RapidRegex.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\RapidRegex.Core.1.0.0.2\lib\net40\RapidRegex.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -45,7 +46,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Topshelf">
+    <Reference Include="Topshelf, Version=3.1.122.0, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Topshelf.3.1.3\lib\net40-full\Topshelf.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -71,9 +73,7 @@
     <None Include="loopback.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
     <None Include="TimberWinR.ServiceHost.nuspec" />
   </ItemGroup>
   <ItemGroup>
diff --git a/TimberWinR.ServiceHost/packages.config b/TimberWinR.ServiceHost/packages.config
index d59c88d..baeabe2 100644
--- a/TimberWinR.ServiceHost/packages.config
+++ b/TimberWinR.ServiceHost/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RapidRegex.Core" version="1.0.0.2" targetFramework="net45" />
-  <package id="Topshelf" version="3.1.3" targetFramework="net45" />
+  <package id="RapidRegex.Core" version="1.0.0.2" targetFramework="net40" />
+  <package id="Topshelf" version="3.1.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/TimberWinR/TimberWinR.csproj b/TimberWinR/TimberWinR.csproj
index 1120911..e52ba51 100644
--- a/TimberWinR/TimberWinR.csproj
+++ b/TimberWinR/TimberWinR.csproj
@@ -114,7 +114,6 @@
     <None Include="mdocs\IISW3CInput.md" />
     <None Include="mdocs\WindowsEvents.md" />
     <None Include="packages.config" />
-    <None Include="TimberWinR.nuspec" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
diff --git a/TimberWinR/TimberWinR.nuspec b/TimberWinR/TimberWinR.nuspec
deleted file mode 100644
index f420f15..0000000
--- a/TimberWinR/TimberWinR.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>TimberWinR</id>
-        <version>1.0.0.1</version>
-        <title>TimberWinR</title>
-        <authors>efontana</authors>
-        <owners>efontana</owners>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Native .NET Windows Logging to Redis agent</description>
-        <copyright>Copyright © 2014</copyright>
-        <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
-        <dependencies>
-            <dependency id="csredis" version="1.4.7.1" />
-            <dependency id="Newtonsoft.Json" version="6.0.3" />
-            <dependency id="NLog" version="3.1.0.0" />
-            <dependency id="RapidRegex.Core" version="1.0.0.2" />
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="lib\net40\Interop.MSUtil.dll" target="lib\net40\Interop.MSUtil.dll" />
-        <file src="lib\net40\TimberWinR.dll" target="lib\net40\TimberWinR.dll" />
-    </files>
-</package>
\ No newline at end of file