Skip to content
This repository was archived by the owner on May 31, 2022. It is now read-only.

Commit 1400349

Browse files
LiorBanaiLiorBanai
committed
update nugets
1 parent 462ae56 commit 1400349

File tree

3 files changed

+41
-28
lines changed

3 files changed

+41
-28
lines changed

‎Analogy.LogViewer.VisualStudioActivityLog/Analogy.LogViewer.VisualStudioActivityLog.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2424
<PackageIcon>AnalogyVS.png</PackageIcon>
2525
<Description>Visual studio Activity log parser for Analogy Log Viewer</Description>
26-
<Version>1.1.0</Version>
26+
<Version>1.2.0</Version>
2727
<PackageReleaseNotes>Initial version</PackageReleaseNotes>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

‎Analogy.LogViewer.VisualStudioActivityLog/Managers/LogManager.cs‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,22 @@ public class LogManager : IAnalogyLogger
1010

1111
private IAnalogyLogger Logger { get; set; }
1212
public static LogManager Instance { get; } = _instance.Value;
13-
private List<(AnalogyLogLevel level, string source, string message, string memberName, int lineNumber, string filePath)> pendingMessages { get; set; }
13+
14+
private List<(AnalogyLogLevel level, string source, string message, string memberName, int lineNumber, string
15+
filePath)> PendingMessages { get; set; }
16+
1417
public LogManager()
1518
{
16-
pendingMessages = new List<(AnalogyLogLevel level, string source, string message, string memberName, int lineNumber, string filePath)>();
19+
PendingMessages =
20+
new List<(AnalogyLogLevel level, string source, string message, string memberName, int lineNumber,
21+
string filePath)>();
1722
}
1823

1924
public void SetLogger(IAnalogyLogger logger)
2025
{
2126
Logger = logger;
22-
foreach ((AnalogyLogLevel level, string source, string message, string memberName, int lineNumber, string filePath) in pendingMessages)
27+
foreach ((AnalogyLogLevel level, string source, string message, string memberName, int lineNumber,
28+
string filePath) in PendingMessages)
2329
{
2430
switch (level)
2531
{
@@ -28,8 +34,8 @@ public void SetLogger(IAnalogyLogger logger)
2834
case AnalogyLogLevel.Debug:
2935
logger.LogDebug(source, message, memberName, lineNumber, filePath);
3036
break;
31-
case AnalogyLogLevel.Event:
32-
logger.LogEvent(source, message, memberName, lineNumber, filePath);
37+
case AnalogyLogLevel.Information:
38+
logger.LogInformation(source, message, memberName, lineNumber, filePath);
3339
break;
3440
case AnalogyLogLevel.Warning:
3541
logger.LogWarning(source, message, memberName, lineNumber, filePath);
@@ -40,8 +46,8 @@ public void SetLogger(IAnalogyLogger logger)
4046
case AnalogyLogLevel.Critical:
4147
logger.LogCritical(source, message, memberName, lineNumber, filePath);
4248
break;
43-
case AnalogyLogLevel.AnalogyInformation:
44-
case AnalogyLogLevel.Disabled:
49+
case AnalogyLogLevel.Analogy:
50+
case AnalogyLogLevel.None:
4551
case AnalogyLogLevel.Trace:
4652
case AnalogyLogLevel.Verbose:
4753
default:
@@ -50,65 +56,72 @@ public void SetLogger(IAnalogyLogger logger)
5056
}
5157
}
5258

53-
public void LogEvent(string source, string message, string memberName = "", int lineNumber = 0, string filePath = "")
59+
public void LogInformation(string message, string source, string memberName = "", int lineNumber = 0,
60+
string filePath = "")
5461
{
5562
if (Logger == null)
5663
{
57-
pendingMessages.Add((AnalogyLogLevel.Event, source, message, memberName, lineNumber, filePath));
64+
PendingMessages.Add((AnalogyLogLevel.Information, source, message, memberName, lineNumber, filePath));
5865
}
5966
else
60-
Logger.LogEvent(source, message, memberName, lineNumber, filePath);
67+
Logger.LogInformation(message, source, memberName, lineNumber, filePath);
6168
}
6269

63-
public void LogWarning(string source, string message, string memberName = "", int lineNumber = 0, string filePath = "")
70+
public void LogWarning(string message, string source, string memberName = "", int lineNumber = 0,
71+
string filePath = "")
6472
{
6573
if (Logger == null)
6674
{
67-
pendingMessages.Add((AnalogyLogLevel.Warning, source, message, memberName, lineNumber, filePath));
75+
PendingMessages.Add((AnalogyLogLevel.Warning, source, message, memberName, lineNumber, filePath));
6876
}
6977
else
70-
Logger.LogWarning(source, message, memberName, lineNumber, filePath);
78+
Logger.LogWarning(message, source, memberName, lineNumber, filePath);
7179
}
7280

73-
public void LogDebug(string source, string message, string memberName = "", int lineNumber = 0, string filePath = "")
81+
public void LogDebug(string message, string source, string memberName = "", int lineNumber = 0,
82+
string filePath = "")
7483
{
7584
if (Logger == null)
7685
{
77-
pendingMessages.Add((AnalogyLogLevel.Debug, source, message, memberName, lineNumber, filePath));
86+
PendingMessages.Add((AnalogyLogLevel.Debug, source, message, memberName, lineNumber, filePath));
7887
}
7988
else
80-
Logger.LogDebug(source, message, memberName, lineNumber, filePath);
89+
Logger.LogDebug(message, source, memberName, lineNumber, filePath);
8190
}
8291

83-
public void LogError(string source, string message, string memberName = "", int lineNumber = 0, string filePath = "")
92+
public void LogError(string message, string source, string memberName = "", int lineNumber = 0,
93+
string filePath = "")
8494
{
8595
if (Logger == null)
8696
{
87-
pendingMessages.Add((AnalogyLogLevel.Error, source, message, memberName, lineNumber, filePath));
97+
PendingMessages.Add((AnalogyLogLevel.Error, source, message, memberName, lineNumber, filePath));
8898
}
8999
else
90-
Logger.LogError(source, message, memberName, lineNumber, filePath);
100+
Logger.LogError(message, source, memberName, lineNumber, filePath);
91101
}
92102

93-
public void LogCritical(string source, string message, string memberName = "", int lineNumber = 0, string filePath = "")
103+
public void LogCritical(string message, string source, string memberName = "", int lineNumber = 0,
104+
string filePath = "")
94105
{
95106
if (Logger == null)
96107
{
97-
pendingMessages.Add((AnalogyLogLevel.Critical, source, message, memberName, lineNumber, filePath));
108+
PendingMessages.Add((AnalogyLogLevel.Critical, source, message, memberName, lineNumber, filePath));
98109
}
99110
else
100-
Logger.LogCritical(source, message, memberName, lineNumber, filePath);
111+
Logger.LogCritical(message, source, memberName, lineNumber, filePath);
101112
}
102113

103-
public void LogException(Exception ex, string source, string message, string memberName = "", int lineNumber = 0,
114+
public void LogException(string message, Exception ex, string source, string memberName = "",
115+
int lineNumber = 0,
104116
string filePath = "")
105117
{
106118
if (Logger == null)
107119
{
108-
pendingMessages.Add((AnalogyLogLevel.Error, source, $"Error: {message.Length }Exception: {ex}", memberName, lineNumber, filePath));
120+
PendingMessages.Add((AnalogyLogLevel.Error, source, $"Error: {message.Length}Exception: {ex}",
121+
memberName, lineNumber, filePath));
109122
}
110123
else
111-
Logger.LogException(ex, source, message, memberName, lineNumber, filePath);
124+
Logger.LogException(message, ex, source, memberName, lineNumber, filePath);
112125
}
113126
}
114-
}
127+
}

‎Analogy.LogViewer.VisualStudioActivityLog/VSActivityLogParser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public Task<IEnumerable<AnalogyLogMessage>> Process(string fileName, Cancellatio
2626
foreach (activityEntry entry in entries.entry)
2727
{
2828
AnalogyLogLevel level = entry.type == "Information"
29-
? AnalogyLogLevel.Event
29+
? AnalogyLogLevel.Information
3030
: (entry.type == "Warning" ? AnalogyLogLevel.Warning : AnalogyLogLevel.Error);
3131
AnalogyLogMessage m = new AnalogyLogMessage(entry.description, level, AnalogyLogClass.General, "");
3232
if (DateTime.TryParse(entry.time, out var time))

0 commit comments

Comments
 (0)