Initial flip over to .Net 3.5

ivanpointer · ivanpointer · commit 68d6fbd2822a · 2017-01-28T21:39:29.000-08:00
diff --git a/Take2/NuLog.CLI.PerfTune/NuLog.CLI.PerfTune.csproj b/Take2/NuLog.CLI.PerfTune/NuLog.CLI.PerfTune.csproj
@@ -32,6 +32,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-3.5|AnyCPU'">
+    <OutputPath>bin\Release-3.5\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Take2/NuLog.Tests/NuLog.Tests.csproj b/Take2/NuLog.Tests/NuLog.Tests.csproj
@@ -32,6 +32,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-3.5|AnyCPU'">
+    <OutputPath>bin\Release-3.5\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FakeItEasy, Version=2.3.2.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
       <HintPath>..\packages\FakeItEasy.2.3.2\lib\net40\FakeItEasy.dll</HintPath>
diff --git a/Take2/NuLog.sln b/Take2/NuLog.sln
@@ -16,20 +16,27 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Release-3.5|Any CPU = Release-3.5|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{100467BE-E1B1-4D5A-A40B-CA633015EC42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{100467BE-E1B1-4D5A-A40B-CA633015EC42}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{100467BE-E1B1-4D5A-A40B-CA633015EC42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{100467BE-E1B1-4D5A-A40B-CA633015EC42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{100467BE-E1B1-4D5A-A40B-CA633015EC42}.Release-3.5|Any CPU.ActiveCfg = Release-3.5|Any CPU
+		{100467BE-E1B1-4D5A-A40B-CA633015EC42}.Release-3.5|Any CPU.Build.0 = Release-3.5|Any CPU
 		{ED0E44F6-7945-4B80-BD29-168065AD01D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED0E44F6-7945-4B80-BD29-168065AD01D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED0E44F6-7945-4B80-BD29-168065AD01D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED0E44F6-7945-4B80-BD29-168065AD01D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED0E44F6-7945-4B80-BD29-168065AD01D5}.Release-3.5|Any CPU.ActiveCfg = Release-3.5|Any CPU
+		{ED0E44F6-7945-4B80-BD29-168065AD01D5}.Release-3.5|Any CPU.Build.0 = Release-3.5|Any CPU
 		{40A62D51-DE30-4C8A-BD5F-157189E0C8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40A62D51-DE30-4C8A-BD5F-157189E0C8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40A62D51-DE30-4C8A-BD5F-157189E0C8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40A62D51-DE30-4C8A-BD5F-157189E0C8B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40A62D51-DE30-4C8A-BD5F-157189E0C8B5}.Release-3.5|Any CPU.ActiveCfg = Release-3.5|Any CPU
+		{40A62D51-DE30-4C8A-BD5F-157189E0C8B5}.Release-3.5|Any CPU.Build.0 = Release-3.5|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Take2/NuLog/Dispatchers/StandardDispatcher.cs b/Take2/NuLog/Dispatchers/StandardDispatcher.cs
@@ -5,7 +5,8 @@
 using NuLog.Dispatchers.TagRouters;
 using NuLog.Loggers;
 using System;
-using System.Collections.Concurrent;
+
+//TODO: using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -36,7 +37,8 @@ public class StandardDispatcher : IDispatcher
         /// <summary>
         /// A queue for storing log events to be dispatched.
         /// </summary>
-        private readonly ConcurrentQueue<ILogEvent> logEventQueue;
+        //TODO: private readonly ConcurrentQueue<ILogEvent> logEventQueue;
+        private readonly Queue<ILogEvent> logEventQueue;
 
         /// <summary>
         /// The timer for processing the log queue.
@@ -60,7 +62,8 @@ public StandardDispatcher(IEnumerable<ITarget> targets, ITagRouter tagRouter, IF
 
             this.fallbackLogger = fallbackLogger;
 
-            this.logEventQueue = new ConcurrentQueue<ILogEvent>();
+            //TODO: this.logEventQueue = new ConcurrentQueue<ILogEvent>();
+            this.logEventQueue = new Queue<ILogEvent>();
 
             this.logEventQueueTimer = new Timer(OnLogQueueTimerElapsed, this, 200, 200);
         }
@@ -189,9 +192,14 @@ private static void OnLogQueueTimerElapsed(object dispatcherInstance)
         /// </summary>
         protected void ProcessLogQueue()
         {
-            ILogEvent logEvent;
-            while (this.logEventQueue.TryDequeue(out logEvent))
+            //TODO: ILogEvent logEvent;
+            //while (this.logEventQueue.TryDequeue(out logEvent))
+            //{
+            //    DispatchNow(logEvent);
+            //}
+            while (this.logEventQueue.Count > 0)
             {
+                var logEvent = this.logEventQueue.Dequeue();
                 DispatchNow(logEvent);
             }
         }
diff --git a/Take2/NuLog/Factories/StandardLoggerFactory.cs b/Take2/NuLog/Factories/StandardLoggerFactory.cs
@@ -14,7 +14,6 @@
 using NuLog.Targets;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 
 namespace NuLog.Factories
 {
@@ -119,7 +118,8 @@ protected IDictionary<string, object> DefaultMetaData
                     {
                         if (_defaultMetaData == null)
                         {
-                            _defaultMetaData = new ReadOnlyDictionary<string, object>(ToMetaData(Config.MetaData));
+                            //TODO: _defaultMetaData = new ReadOnlyDictionary<string, object>(ToMetaData(Config.MetaData));
+                            _defaultMetaData = new Dictionary<string, object>(ToMetaData(Config.MetaData));
                         }
                     }
                 }
diff --git a/Take2/NuLog/FallbackLoggers/StandardFallbackLoggerBase.cs b/Take2/NuLog/FallbackLoggers/StandardFallbackLoggerBase.cs
@@ -5,6 +5,7 @@
 using NuLog.Dispatchers;
 using NuLog.LogEvents;
 using System;
+using System.Linq;
 
 namespace NuLog.FallbackLoggers
 {
@@ -35,7 +36,8 @@ private static string GetMessage(ILogEvent logEvent)
 
         private static string JoinTags(ILogEvent logEvent)
         {
-            return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;
+            //TODO: return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;
+            return logEvent.Tags != null ? string.Join(",", logEvent.Tags.ToArray()) : string.Empty;
         }
 
         private static string GetExceptionMessage(ILogEvent logEvent)
diff --git a/Take2/NuLog/ILogEvent.cs b/Take2/NuLog/ILogEvent.cs
@@ -15,7 +15,7 @@ public interface ILogEvent : IDisposable
         /// <summary>
         /// The list of tags associated with the log event
         /// </summary>
-        IEnumerable<string> Tags { get; set; }
+        ICollection<string> Tags { get; set; }
 
         /// <summary>
         /// the log event is to write itself to the given target.
diff --git a/Take2/NuLog/Layouts/StandardLayout.cs b/Take2/NuLog/Layouts/StandardLayout.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace NuLog.Layouts
@@ -127,7 +128,8 @@ protected virtual object GetSpecialParameter(LogEvent logEvent, LayoutParameter
             switch (parameter.Path)
             {
                 case "Tags":
-                    return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;
+                    //TODO: return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;
+                    return logEvent.Tags != null ? string.Join(",", logEvent.Tags.ToArray()) : string.Empty;
 
                 case "Exception":
                     return FormatException(logEvent.Exception);
@@ -177,7 +179,7 @@ private static string GetFormattedValue(object value, string format)
             }
 
             // If we have a string format, use that.
-            if (string.IsNullOrWhiteSpace(format) == false)
+            if (string.IsNullOrEmpty(format) == false)
             {
                 return string.Format(format, value);
             }
@@ -202,12 +204,16 @@ private static string GetFormattedValue(object value, string format)
         /// <summary>
         /// Enumerates the values in the given enumerable value.
         /// </summary>
-        private static IEnumerable<string> EnumerateValues(IEnumerable items)
+        private static string[] EnumerateValues(IEnumerable items)
         {
+            var list = new List<string>();
+
             foreach (var item in items)
             {
-                yield return Convert.ToString(item);
+                list.Add(Convert.ToString(item));
             }
+
+            return list.ToArray();
         }
     }
 }
diff --git a/Take2/NuLog/LogEvents/LogEvent.cs b/Take2/NuLog/LogEvents/LogEvent.cs
@@ -41,7 +41,7 @@ public class LogEvent : ILogEvent
         /// <summary>
         /// The list of tags associated with the log event
         /// </summary>
-        public IEnumerable<string> Tags { get; set; }
+        public ICollection<string> Tags { get; set; }
 
         /// <summary>
         /// The exception (if any) associated with the log event
diff --git a/Take2/NuLog/Loggers/ITagNormalizer.cs b/Take2/NuLog/Loggers/ITagNormalizer.cs
@@ -23,6 +23,6 @@ public interface ITagNormalizer
         /// <summary>
         /// Normalizes and validates a list of tags. Expected to use the same logic as for a single tag.
         /// </summary>
-        IEnumerable<string> NormalizeTags(IEnumerable<string> tags);
+        ICollection<string> NormalizeTags(IEnumerable<string> tags);
     }
 }
diff --git a/Take2/NuLog/Loggers/StandardLogger.cs b/Take2/NuLog/Loggers/StandardLogger.cs
@@ -39,7 +39,7 @@ public class StandardLogger : ILogger
         /// <summary>
         /// Default tags to add to every log event originating from this logger.
         /// </summary>
-        protected readonly IEnumerable<string> DefaultTags;
+        protected readonly ICollection<string> DefaultTags;
 
         /// <summary>
         /// Default meta data to add to every log event originating from this logger.
@@ -129,35 +129,47 @@ protected virtual LogEvent BuildLogEvent(string message, Exception exception, Di
         /// <summary>
         /// Mixes the given tags, with the default tags for this logger, and returns the mix.
         /// </summary>
-        protected virtual IEnumerable<string> GetTags(IEnumerable<string> givenTags, bool hasException)
+        protected virtual ICollection<string> GetTags(ICollection<string> givenTags, bool hasException)
         {
             // Check if we need to tack on an exception tag
-            IEnumerable<string> tags;
+            ICollection<string> tags;
 
             // Figure out/calculate the tags to return. Call the normalizer for any tags that haven't
             // been run through yet.
             if (!HasTags(givenTags) && !HasTags(DefaultTags))
             {
-                tags = new string[] { };
+                tags = new List<string>();
             }
             else if (!HasTags(DefaultTags))
             {
                 tags = TagNormalizer.NormalizeTags(givenTags);
             }
             else if (!HasTags(givenTags))
             {
-                tags = DefaultTags;
+                tags = new List<string>();
+                foreach (var tag in DefaultTags)
+                {
+                    tags.Add(tag);
+                }
             }
             else
             {
-                tags = DefaultTags.Concat(givenTags);
+                tags = new List<string>();
+                foreach (var tag in DefaultTags)
+                {
+                    tags.Add(tag);
+                }
+                foreach (var tag in givenTags)
+                {
+                    tags.Add(tag);
+                }
                 tags = TagNormalizer.NormalizeTags(tags);
             }
 
             // If we've got an exception, add on the exception tag
             if (hasException)
             {
-                tags = tags.Concat(new string[] { exceptionTag });
+                tags.Add(exceptionTag);
             }
 
             // Return the tags
diff --git a/Take2/NuLog/Loggers/TagNormalizers/StandardTagNormalizer.cs b/Take2/NuLog/Loggers/TagNormalizers/StandardTagNormalizer.cs
@@ -21,7 +21,7 @@ public class StandardTagNormalizer : ITagNormalizer
         public string NormalizeTag(string tag)
         {
             // Null or empty tags are not allowed
-            if (string.IsNullOrWhiteSpace(tag))
+            if (string.IsNullOrEmpty(tag))
                 throw new InvalidOperationException("Tags cannot be null or white space (empty).  One such tag was given.");
 
             // Trim white space off the tag
@@ -37,7 +37,7 @@ public string NormalizeTag(string tag)
             return normalized;
         }
 
-        public IEnumerable<string> NormalizeTags(IEnumerable<string> tags)
+        public ICollection<string> NormalizeTags(IEnumerable<string> tags)
         {
             var hashSet = new HashSet<string>();
 
diff --git a/Take2/NuLog/NuLog.csproj b/Take2/NuLog/NuLog.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NuLog</RootNamespace>
     <AssemblyName>NuLog</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,6 +30,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-3.5|AnyCPU'">
+    <OutputPath>bin\Release-3.5\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/Take2/NuLog/Targets/EventLogTarget.cs b/Take2/NuLog/Targets/EventLogTarget.cs
@@ -62,10 +62,18 @@ public override void Configure(TargetConfig config)
 
             // Parse out the entry type
             var entryTypeRaw = GetProperty<string>(config, "entryType");
-            EventLogEntryType entryType;
-            if (Enum.TryParse(entryTypeRaw, out entryType))
+            //EventLogEntryType entryType;
+            //TODO: if (Enum.TryParse(entryTypeRaw, out entryType))
+            //{
+            //    this.entryType = entryType;
+            //}
+            //else
+            //{
+            //    this.entryType = EventLogEntryType.Information;
+            //}
+            if (string.IsNullOrEmpty(entryTypeRaw) == false)
             {
-                this.entryType = entryType;
+                this.entryType = (EventLogEntryType)Enum.Parse(EventLogEntryTypeType, entryTypeRaw);
             }
             else
             {
diff --git a/Take2/NuLog/Targets/SmtpClientShim.cs b/Take2/NuLog/Targets/SmtpClientShim.cs
@@ -24,7 +24,7 @@ public SmtpClientShim()
 
         public void Dispose()
         {
-            this.smtpClient.Dispose();
+            //TODO: this.smtpClient.Dispose();
         }
 
         public void Send(MailMessage mailMessage)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`using NuLog.Targets;`
`15`	`15`	`using System;`
`16`	`16`	`using System.Collections.Generic;`
`17`		`-using System.Collections.ObjectModel;`
`18`	`17`
`19`	`18`	`namespace NuLog.Factories`
`20`	`19`	`{`
`@@ -119,7 +118,8 @@ protected IDictionary<string, object> DefaultMetaData`
`119`	`118`	`{`
`120`	`119`	`if (_defaultMetaData == null)`
`121`	`120`	`{`
`122`		`- _defaultMetaData = new ReadOnlyDictionary<string, object>(ToMetaData(Config.MetaData));`
	`121`	`+ //TODO: _defaultMetaData = new ReadOnlyDictionary<string, object>(ToMetaData(Config.MetaData));`
	`122`	`+ _defaultMetaData = new Dictionary<string, object>(ToMetaData(Config.MetaData));`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using NuLog.Dispatchers;`
`6`	`6`	`using NuLog.LogEvents;`
`7`	`7`	`using System;`
	`8`	`+using System.Linq;`
`8`	`9`
`9`	`10`	`namespace NuLog.FallbackLoggers`
`10`	`11`	`{`
`@@ -35,7 +36,8 @@ private static string GetMessage(ILogEvent logEvent)`
`35`	`36`
`36`	`37`	`private static string JoinTags(ILogEvent logEvent)`
`37`	`38`	`{`
`38`		`- return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;`
	`39`	`+ //TODO: return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;`
	`40`	`+ return logEvent.Tags != null ? string.Join(",", logEvent.Tags.ToArray()) : string.Empty;`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`private static string GetExceptionMessage(ILogEvent logEvent)`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System;`
`8`	`8`	`using System.Collections;`
`9`	`9`	`using System.Collections.Generic;`
	`10`	`+using System.Linq;`
`10`	`11`	`using System.Text;`
`11`	`12`
`12`	`13`	`namespace NuLog.Layouts`
`@@ -127,7 +128,8 @@ protected virtual object GetSpecialParameter(LogEvent logEvent, LayoutParameter`
`127`	`128`	`switch (parameter.Path)`
`128`	`129`	`{`
`129`	`130`	`case "Tags":`
`130`		`- return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;`
	`131`	`+ //TODO: return logEvent.Tags != null ? string.Join(",", logEvent.Tags) : string.Empty;`
	`132`	`+ return logEvent.Tags != null ? string.Join(",", logEvent.Tags.ToArray()) : string.Empty;`
`131`	`133`
`132`	`134`	`case "Exception":`
`133`	`135`	`return FormatException(logEvent.Exception);`
`@@ -177,7 +179,7 @@ private static string GetFormattedValue(object value, string format)`
`177`	`179`	`}`
`178`	`180`
`179`	`181`	`// If we have a string format, use that.`
`180`		`- if (string.IsNullOrWhiteSpace(format) == false)`
	`182`	`+ if (string.IsNullOrEmpty(format) == false)`
`181`	`183`	`{`
`182`	`184`	`return string.Format(format, value);`
`183`	`185`	`}`
`@@ -202,12 +204,16 @@ private static string GetFormattedValue(object value, string format)`
`202`	`204`	`/// <summary>`
`203`	`205`	`/// Enumerates the values in the given enumerable value.`
`204`	`206`	`/// </summary>`
`205`		`- private static IEnumerable<string> EnumerateValues(IEnumerable items)`
	`207`	`+ private static string[] EnumerateValues(IEnumerable items)`
`206`	`208`	`{`
	`209`	`+ var list = new List<string>();`
	`210`	`+`
`207`	`211`	`foreach (var item in items)`
`208`	`212`	`{`
`209`		`- yield return Convert.ToString(item);`
	`213`	`+ list.Add(Convert.ToString(item));`
`210`	`214`	`}`
	`215`	`+`
	`216`	`+ return list.ToArray();`
`211`	`217`	`}`
`212`	`218`	`}`
`213`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ public interface ITagNormalizer`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// Normalizes and validates a list of tags. Expected to use the same logic as for a single tag.`
`25`	`25`	`/// </summary>`
`26`		`- IEnumerable<string> NormalizeTags(IEnumerable<string> tags);`
	`26`	`+ ICollection<string> NormalizeTags(IEnumerable<string> tags);`
`27`	`27`	`}`
`28`	`28`	`}`