diff --git a/tools/StaticAnalysis/Properties/AssemblyInfo.cs b/tools/StaticAnalysis/Properties/AssemblyInfo.cs index ec32a114a2e4..eb6a6d39a93b 100644 --- a/tools/StaticAnalysis/Properties/AssemblyInfo.cs +++ b/tools/StaticAnalysis/Properties/AssemblyInfo.cs @@ -13,7 +13,6 @@ // ---------------------------------------------------------------------------------- using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -22,9 +21,9 @@ [assembly: AssemblyTitle("DependencyChecker")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Microsoft Corporation")] [assembly: AssemblyProduct("DependencyChecker")] -[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -48,5 +47,3 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config", Watch = true)] - diff --git a/tools/Tools.Common/Loggers/AnalysisLogger.cs b/tools/Tools.Common/Loggers/AnalysisLogger.cs index 35aadca63833..a2bdda7c257c 100644 --- a/tools/Tools.Common/Loggers/AnalysisLogger.cs +++ b/tools/Tools.Common/Loggers/AnalysisLogger.cs @@ -31,9 +31,6 @@ public class AnalysisLogger private readonly string _exceptionsDirectory; private static string _defaultLogName; private static Dictionary _logDictionary; - - private log4net.ILog Log4NetLogger { get; set; } - private static Dictionary LogDictionary { get { return _logDictionary ?? (_logDictionary = new Dictionary()); } @@ -77,12 +74,6 @@ public AnalysisLogger(string baseDirectory, string exceptionsDirectory) var assembly = Assembly.GetExecutingAssembly(); var assemblyType = assembly.GetType(); _defaultLogName = assembly.GetName().Name; -// TODO: Remove IfDef -#if NETSTANDARD - Log4NetLogger = log4net.LogManager.GetLogger(assemblyType); -#else - Log4NetLogger = log4net.LogManager.GetLogger(_defaultLogName); -#endif } /// @@ -235,7 +226,7 @@ public virtual void WriteWarning(string format, params object[] args) #region Info methods public void Info(string info) { - Log4NetLogger.Info(info); + Console.WriteLine(info); } public void Info(string info, IEnumerable infoCollection) @@ -268,19 +259,28 @@ public void Info(string info, string infoFormat, IEnumerable infoCollectio private void Error(string errorInfo) { - Log4NetLogger.Error(errorInfo); + ConsoleColor previousColor = Console.ForegroundColor; + Console.ForegroundColor = ConsoleColor.Red; + Console.WriteLine(errorInfo); + Console.ForegroundColor = previousColor; } public void DebugInfo(string debugInfo) { - Log4NetLogger.Debug(debugInfo); + ConsoleColor previousColor = Console.ForegroundColor; + Console.ForegroundColor = ConsoleColor.Gray; + Console.WriteLine(debugInfo); + Console.ForegroundColor = previousColor; } private void Warning(string warningInfo) { - Log4NetLogger.Warn(warningInfo); + ConsoleColor previousColor = Console.ForegroundColor; + Console.ForegroundColor = ConsoleColor.Yellow; + Console.WriteLine(warningInfo); + Console.ForegroundColor = previousColor; } #endregion } -} +} \ No newline at end of file diff --git a/tools/Tools.Common/Properties/AssemblyInfo.cs b/tools/Tools.Common/Properties/AssemblyInfo.cs index ccf4cd29de0d..dfd4e55f9c4b 100644 --- a/tools/Tools.Common/Properties/AssemblyInfo.cs +++ b/tools/Tools.Common/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -8,9 +7,9 @@ [assembly: AssemblyTitle("Tools.Common")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Microsoft Corporation")] [assembly: AssemblyProduct("Tools.Common")] -[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/tools/Tools.Common/Tools.Common.Netcore.csproj b/tools/Tools.Common/Tools.Common.Netcore.csproj index 58602376203b..d5aecdc781b5 100644 --- a/tools/Tools.Common/Tools.Common.Netcore.csproj +++ b/tools/Tools.Common/Tools.Common.Netcore.csproj @@ -18,7 +18,6 @@ -