Updated build script to only build 4.5 solution.

Updated README and CHANGES for supporting documentation for changes. Updated Nuspec file to only include 4.5 lib.
reflectsoftware · May 2, 2016 · 9d80ef3 · 9d80ef3
1 parent 95ff0f9
commit 9d80ef3
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 53 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -1,6 +1,6 @@
 param(
-    [String] $majorMinor = "5.5",  # 5.5
-    [String] $patch = "2",         # $env:APPVEYOR_BUILD_VERSION
+    [String] $majorMinor = "5.6",  # 5.6
+    [String] $patch = "0",         # $env:APPVEYOR_BUILD_VERSION
     [String] $customLogger = "",   # C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll
     [Switch] $notouch,
     [String] $project = "ReflectSoftware.Insight.Extensions.Log4Net"
@@ -48,7 +48,7 @@ function Invoke-NuGetPack($version)
     #ls src/**/*.csproj |
     #    Where-Object { -not ($_.Name -like "*net40*") } |
     #    ForEach-Object { Invoke-NuGetPackProj $_ }
-		
+
 		ls src/**/*.csproj |
         Where-Object { -not ($_.Name -like "*net40*") } |
         ForEach-Object { Invoke-NuGetPackProj $_ }
@@ -60,10 +60,10 @@ function Invoke-NuGetPack($version)
 
 function Invoke-Build($project, $majorMinor, $patch, $customLogger, $notouch)
 {
-    $solution2 = "$project 2.0.sln" 
-    $solution4 = "$project 4.0.sln" 
-    $solution45 = "$project 4.5.sln" 
-	
+    #$solution2 = "$project 2.0.sln"
+    #$solution4 = "$project 4.0.sln"
+    $solution45 = "$project 4.5.sln"
+
     $package="$majorMinor.$patch"
 
     Write-Output "$project $package"
@@ -76,14 +76,14 @@ function Invoke-Build($project, $majorMinor, $patch, $customLogger, $notouch)
         Set-AssemblyVersions $package $assembly
     }
 
-    Install-NuGetPackages $solution45    
+    Install-NuGetPackages $solution45
     Invoke-MSBuild $solution45 $customLogger
-	
-		Install-NuGetPackages $solution4    
-    Invoke-MSBuild $solution4 $customLogger
-	
-		Install-NuGetPackages $solution2    
-    Invoke-MSBuild $solution2 $customLogger
+
+	#Install-NuGetPackages $solution4
+    #Invoke-MSBuild $solution4 $customLogger
+
+	#Install-NuGetPackages $solution2
+    #Invoke-MSBuild $solution2 $customLogger
 
     Invoke-NuGetPack $package
 }

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 ## Change Log ##
 
+#### Version 5.6.0 ####
+ * Updated extension to use ReflectInsight 5.6.0 version
+ * Dropping support for older .NET versions. As of this release, we're only deploying NuGet package for .NET 4.5. However the source code still supports older framework. 
+
 #### Version 5.5.1 ####
  * Bug fixes for packages improperly being downloaded. RabbitMQ is now a nuget dependency.
 

diff --git a/README.md b/README.md
@@ -1,11 +1,13 @@
 # ReflectInsight-Extensions-Log4Net
 
 [![Build status](https://ci.appveyor.com/api/projects/status/github/reflectsoftware/reflectinsight-extensions-log4net?svg=true)](https://ci.appveyor.com/project/reflectsoftware/reflectinsight-extensions-log4net)
+[![License](https://img.shields.io/:license-MS--PL-blue.svg)](https://github.com/reflectsoftware/reflectinsight-extensions-log4net/license.md)
 [![Release](https://img.shields.io/github/release/reflectsoftware/reflectinsight-extensions-log4net.svg)](https://github.com/reflectsoftware/reflectinsight-extensions-log4net/releases/latest)
 [![NuGet Version](http://img.shields.io/nuget/v/reflectsoftware.insight.extensions.log4net.svg?style=flat)](http://www.nuget.org/packages/ReflectSoftware.Insight.Extensions.Log4Net/)
-[![NuGet](https://img.shields.io/nuget/dt/reflectsoftware.insight.extensions.log4net.svg)](http://www.nuget.org/packages/ReflectSoftware.Insight.Extensions.Log4net/)
 [![Stars](https://img.shields.io/github/stars/reflectsoftware/reflectinsight-extensions-log4net.svg)](https://github.com/reflectsoftware/reflectinsight-extensions-log4net/stargazers)
 
+**Package** - [ReflectSoftware.Insight.Extensions.Log4Net](http://www.nuget.org/packages/ReflectSoftware.Insight.Extensions.Log4Net/) | **Platforms** - .NET 4.5
+
 ## Overview ##
 
 We've added support for the Log4net appender. This allows you to leverage your current investment in log4net, but leverage the power and flexibility that comes with the ReflectInsight viewer. You can view your log4net messages in realtime, in a rich viewer that allows you to filter out and search for what really matters to you.

diff --git a/ReflectSoftware.Insight.Extensions.Log4Net 2.0.sln b/ReflectSoftware.Insight.Extensions.Log4Net 2.0.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{42B0F2D4-228B-4E1B-B81C-685CEE15D2E4}"
 	ProjectSection(SolutionItems) = preProject
@@ -13,6 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectSoftware.Insight.Extensions.Log4net 2.0", "src\ReflectSoftware.Insight.Extensions.Log4net 2.0.csproj", "{A7A9040C-826F-4CF6-8D70-288DFF88ADE1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E7BF9457-FF0B-42B7-9C9F-287156EA5A16}"
+	ProjectSection(SolutionItems) = preProject
+		src\ReflectSoftware.Insight.Extensions.Log4net.nuspec = src\ReflectSoftware.Insight.Extensions.Log4net.nuspec
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,4 +32,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{E7BF9457-FF0B-42B7-9C9F-287156EA5A16} = {42B0F2D4-228B-4E1B-B81C-685CEE15D2E4}
+	EndGlobalSection
 EndGlobal
diff --git a/ReflectSoftware.Insight.Extensions.Log4Net 4.0.sln b/ReflectSoftware.Insight.Extensions.Log4Net 4.0.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{42B0F2D4-228B-4E1B-B81C-685CEE15D2E4}"
 	ProjectSection(SolutionItems) = preProject
@@ -13,6 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectSoftware.Insight.Extensions.Log4net 4.0", "src\ReflectSoftware.Insight.Extensions.Log4net 4.0.csproj", "{2CFB2E87-1C47-4E78-ADDC-99F246471FC1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{61D03BB8-80CA-465F-95E0-F7A1B2D0B821}"
+	ProjectSection(SolutionItems) = preProject
+		src\ReflectSoftware.Insight.Extensions.Log4net.nuspec = src\ReflectSoftware.Insight.Extensions.Log4net.nuspec
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,4 +32,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{61D03BB8-80CA-465F-95E0-F7A1B2D0B821} = {42B0F2D4-228B-4E1B-B81C-685CEE15D2E4}
+	EndGlobalSection
 EndGlobal
diff --git a/ReflectSoftware.Insight.Extensions.Log4Net 4.5.sln b/ReflectSoftware.Insight.Extensions.Log4Net 4.5.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectSoftware.Insight.Extensions.Log4net 4.5", "src\ReflectSoftware.Insight.Extensions.Log4net 4.5.csproj", "{2CFB2E87-1C47-4E78-ADDC-99F246471FC1}"
 EndProject
@@ -13,6 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F4B1F5B9-2992-4AF1-B675-FDA0E1A1ACF5}"
+	ProjectSection(SolutionItems) = preProject
+		src\ReflectSoftware.Insight.Extensions.Log4net.nuspec = src\ReflectSoftware.Insight.Extensions.Log4net.nuspec
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,4 +32,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F4B1F5B9-2992-4AF1-B675-FDA0E1A1ACF5} = {5083DB16-D99D-48E4-8B72-90F9AFD54F7C}
+	EndGlobalSection
 EndGlobal
diff --git a/assets/VersionInfo.cs b/assets/VersionInfo.cs
@@ -2,11 +2,11 @@
 
 [assembly: AssemblyCompany("ReflectSoftware Inc.")]
 [assembly: AssemblyProduct("ReflectSoftware.Insight.Extensions Library")]
-[assembly: AssemblyCopyright("© 2015 ReflectSoftware Inc. All rights reserved.")]
+[assembly: AssemblyCopyright("© 2016 ReflectSoftware Inc. All rights reserved.")]
 [assembly: AssemblyDescription("Provides extensions to the ReflectInsight Logging Framework")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyVersion("5.5.1.1510")]
-[assembly: AssemblyFileVersion("5.5.1.1510")]
-[assembly: AssemblyInformationalVersion("5.5.1")]
+[assembly: AssemblyVersion("5.6.0.1604")]
+[assembly: AssemblyFileVersion("5.6.0.1604")]
+[assembly: AssemblyInformationalVersion("5.6.0")]
diff --git a/src/ReflectSoftware.Insight.Extensions.Log4net 4.5.csproj b/src/ReflectSoftware.Insight.Extensions.Log4net 4.5.csproj
@@ -66,20 +66,16 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.4.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ReflectSoftware.Insight">
-      <HintPath>..\packages\ReflectSoftware.Insight.5.5.1\lib\net45\ReflectSoftware.Insight.dll</HintPath>
+    <Reference Include="ReflectSoftware.Insight, Version=5.6.0.1604, Culture=neutral, PublicKeyToken=c78ddbdaf1f32b08, processorArchitecture=MSIL">
+      <HintPath>..\packages\ReflectSoftware.Insight.5.6.0\lib\net45\ReflectSoftware.Insight.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/ReflectSoftware.Insight.Extensions.Log4net.nuspec b/src/ReflectSoftware.Insight.Extensions.Log4net.nuspec
@@ -12,27 +12,26 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>We've added support for the Log4net appender. This allows you to leverage your current investment in log4net, but leverage the power and flexibility that comes with the ReflectInsight viewer.
 
-In order to use this extension you must have the ReflectInsight Viewer installed. Download and install the ReflectInsight Viewer from this location: 
+In order to use this extension you must have the ReflectInsight Viewer installed. Download and install the ReflectInsight Viewer from this location:
 
 http://www.ReflectSoftware.com/Public/Download.aspx
 
 You can view your log4net messages in realtime, in a rich viewer that allows you to filter out and search for what really matters to you.</description>
         <summary>ReflectInsight Log4net logging extention makes it easy to integrate ReflectInsight into your existing application logging infrastructure and leverage the power of the ReflectInsight log viewer.</summary>
         <releaseNotes></releaseNotes>
-        <copyright>© 2015 ReflectSoftware Inc.</copyright>
+        <copyright>© 2016 ReflectSoftware Inc.</copyright>
         <tags>reflectinsight logging log logfiles events log4net exception handling structured tracing trace debug diagnostic</tags>
         <dependencies>
-            <dependency id="log4net" version="2.0.3" />
-            <dependency id="ReflectSoftware.Insight" version="5.5.1" />
+            <dependency id="log4net" version="2.0.5" />
+            <dependency id="ReflectSoftware.Insight" version="5.6.0" />
         </dependencies>
         <references>
             <reference file="ReflectSoftware.Insight.Extensions.Log4net.dll" />
         </references>
     </metadata>
     <files>
-        <file src="bin\release\net20\ReflectSoftware.Insight.Extensions.Log4net.dll" target="lib\net20\ReflectSoftware.Insight.Extensions.Log4net.dll" />
-        <file src="bin\release\net40\ReflectSoftware.Insight.Extensions.Log4net.dll" target="lib\net40\ReflectSoftware.Insight.Extensions.Log4net.dll" />
+        <!--<file src="bin\release\net20\ReflectSoftware.Insight.Extensions.Log4net.dll" target="lib\net20\ReflectSoftware.Insight.Extensions.Log4net.dll" />
+        <file src="bin\release\net40\ReflectSoftware.Insight.Extensions.Log4net.dll" target="lib\net40\ReflectSoftware.Insight.Extensions.Log4net.dll" />-->
         <file src="bin\release\net45\ReflectSoftware.Insight.Extensions.Log4net.dll" target="lib\net45\ReflectSoftware.Insight.Extensions.Log4net.dll" />
-        <file src="readme.txt" target="readme.txt" />
     </files>
 </package>
diff --git a/src/packages.config b/src/packages.config
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net35" />
-  <package id="log4net" version="2.0.3" targetFramework="net40" />
-  <package id="log4net" version="2.0.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="RabbitMQ.Client" version="3.4.0" targetFramework="net20" />
-  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net40" />
-  <package id="ReflectSoftware.Insight" version="5.5.1" targetFramework="net20" />
-  <package id="ReflectSoftware.Insight" version="5.5.1" targetFramework="net40" />
-  <package id="ReflectSoftware.Insight" version="5.5.1" targetFramework="net45" />
+  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="ReflectSoftware.Insight" version="5.6.0" targetFramework="net45" />
 </packages>