Skip to content

Commit 69658ed

Browse files
update nugets
1 parent 9b38a43 commit 69658ed

File tree

17 files changed

+77
-98
lines changed

17 files changed

+77
-98
lines changed

.github/workflows/dotnet-core-desktop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
Test_Project_Path: Analogy.LogServer.Tests\Analogy.LogServer.Tests.csproj
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v4.2.2
25+
uses: actions/checkout@v5
2626
with:
2727
fetch-depth: 0
2828

2929
# Install the .NET Core workload
3030
- name: Install .NET Core
31-
uses: actions/setup-dotnet@v4.2.0
31+
uses: actions/setup-dotnet@v5.0.0
3232
with:
3333
dotnet-version: 9.0.x
3434

Analogy.LogServer.Clients.Test.Console/Analogy.LogServer.Clients.Test.Console.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.1.0" />
11-
<PackageReference Include="System.Resources.Extensions" Version="9.0.6" />
10+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="9.0.0-rc2" />
11+
<PackageReference Include="System.Resources.Extensions" Version="9.0.10" />
1212
</ItemGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\Analogy.LogServer.Clients\Analogy.LogServer.Clients.csproj" />

Analogy.LogServer.Clients.Test.Console/Program.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Analogy.Interfaces;
2+
using Analogy.Interfaces.DataTypes;
23
using System.Collections.Generic;
34
using System.Reflection;
45
using System.Runtime.Versioning;

Analogy.LogServer.Clients/Analogy.LogServer.Clients.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net9.0;net8.0;net48</TargetFrameworks>
5+
<VersionPrefix>9.0.0</VersionPrefix>
6+
<VersionSuffix>rc1</VersionSuffix>
57
<OutputType>Library</OutputType>
68
<Authors>Lior Banai</Authors>
79
<Company>Analogy.LogViewer</Company>
810
<Description>grpc client to send messages To Analogy Log Viewer with gRPC server running</Description>
9-
<Copyright>Lior Banai 2020-2025</Copyright>
11+
<Copyright>Lior Banai 2020-2026</Copyright>
1012
<PackageIcon>Analogy.gRPC.service.png</PackageIcon>
11-
<VersionPrefix>8.1.0</VersionPrefix>
12-
<VersionSuffix></VersionSuffix>
1313
<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.gRPC</RepositoryUrl>
1414
<PackageProjectUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.gRPC</PackageProjectUrl>
1515
</PropertyGroup>
@@ -28,11 +28,11 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Analogy.Interfaces.DataTypes" Version="2.0.0" />
32-
<PackageReference Include="Google.Protobuf" Version="3.31.1" />
31+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="9.0.0-rc2" />
32+
<PackageReference Include="Google.Protobuf" Version="3.33.0" />
3333
<PackageReference Include="Grpc.Core" Version="2.46.6" />
3434
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
35-
<PackageReference Include="Grpc.Tools" Version="2.72.0">
35+
<PackageReference Include="Grpc.Tools" Version="2.76.0">
3636
<PrivateAssets>all</PrivateAssets>
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3838
</PackageReference>

Analogy.LogServer.Clients/NetCore/AnalogyMessageConsumer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ public AnalogyMessageConsumer(string address)
3232
_stream = Client.SubscribeForConsumingMessages(m);
3333
}
3434

35-
public async IAsyncEnumerable<Interfaces.AnalogyLogMessage> GetMessages()
35+
public async IAsyncEnumerable<Interfaces.DataTypes.AnalogyLogMessage> GetMessages()
3636
{
3737
_cts = new CancellationTokenSource();
3838
await foreach (var m in _stream.ResponseStream.ReadAllAsync())
3939
{
4040
var token = _cts.Token;
41-
Interfaces.AnalogyLogMessage msg = new Interfaces.AnalogyLogMessage()
41+
Interfaces.DataTypes.AnalogyLogMessage msg = new Interfaces.DataTypes.AnalogyLogMessage()
4242
{
43-
Level = (AnalogyLogLevel)m.Level,
44-
Class = (AnalogyLogClass)m.Class,
43+
Level = (Interfaces.DataTypes.AnalogyLogLevel)m.Level,
44+
Class = (Interfaces.DataTypes.AnalogyLogClass)m.Class,
4545
Date = m.Date.ToDateTimeOffset(),
4646
FileName = m.FileName,
4747
LineNumber = m.LineNumber,

Analogy.LogServer.Clients/NetCore/AnalogyMessageProducer.cs

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public AnalogyMessageProducer(string address)
4242
}
4343
}
4444

45-
public async Task Log(string text, string source, AnalogyLogLevel level, string category = "",
45+
public async Task Log(string text, string source, Interfaces.DataTypes.AnalogyLogLevel level, string category = "",
4646
string machineName = null, string userName = null, string processName = null, int processId = 0, int threadId = 0, Dictionary<string, string> additionalInformation = null, [CallerMemberName] string memberName = "", [CallerLineNumber] long lineNumber = 0, [CallerFilePath] string filePath = "")
4747
{
4848
if (!connected)
@@ -92,33 +92,22 @@ public async Task Log(string text, string source, AnalogyLogLevel level, string
9292
}
9393
}
9494

95-
private AnalogyGRPCLogLevel GetLogLevel(AnalogyLogLevel level)
95+
private AnalogyGRPCLogLevel GetLogLevel(Interfaces.DataTypes.AnalogyLogLevel level)
9696
{
97-
switch (level)
98-
{
99-
case AnalogyLogLevel.Unknown:
100-
return AnalogyGRPCLogLevel.Unknown;
101-
case AnalogyLogLevel.Trace:
102-
return AnalogyGRPCLogLevel.Trace;
103-
case AnalogyLogLevel.Verbose:
104-
return AnalogyGRPCLogLevel.Verbose;
105-
case AnalogyLogLevel.Debug:
106-
return AnalogyGRPCLogLevel.Debug;
107-
case AnalogyLogLevel.Information:
108-
return AnalogyGRPCLogLevel.Information;
109-
case AnalogyLogLevel.Warning:
110-
return AnalogyGRPCLogLevel.Warning;
111-
case AnalogyLogLevel.Error:
112-
return AnalogyGRPCLogLevel.Error;
113-
case AnalogyLogLevel.Critical:
114-
return AnalogyGRPCLogLevel.Critical;
115-
case AnalogyLogLevel.Analogy:
116-
return AnalogyGRPCLogLevel.Analogy;
117-
case AnalogyLogLevel.None:
118-
return AnalogyGRPCLogLevel.None;
119-
default:
120-
return AnalogyGRPCLogLevel.Unknown;
121-
}
97+
return level switch
98+
{
99+
Interfaces.DataTypes.AnalogyLogLevel.Unknown => AnalogyGRPCLogLevel.Unknown,
100+
Interfaces.DataTypes.AnalogyLogLevel.Trace => AnalogyGRPCLogLevel.Trace,
101+
Interfaces.DataTypes.AnalogyLogLevel.Verbose => AnalogyGRPCLogLevel.Verbose,
102+
Interfaces.DataTypes.AnalogyLogLevel.Debug => AnalogyGRPCLogLevel.Debug,
103+
Interfaces.DataTypes.AnalogyLogLevel.Information => AnalogyGRPCLogLevel.Information,
104+
Interfaces.DataTypes.AnalogyLogLevel.Warning => AnalogyGRPCLogLevel.Warning,
105+
Interfaces.DataTypes.AnalogyLogLevel.Error => AnalogyGRPCLogLevel.Error,
106+
Interfaces.DataTypes.AnalogyLogLevel.Critical => AnalogyGRPCLogLevel.Critical,
107+
Interfaces.DataTypes.AnalogyLogLevel.Analogy => AnalogyGRPCLogLevel.Analogy,
108+
Interfaces.DataTypes.AnalogyLogLevel.None => AnalogyGRPCLogLevel.None,
109+
_ => AnalogyGRPCLogLevel.Unknown,
110+
};
122111
}
123112

124113
public void StopReceiving()

Analogy.LogServer.Clients/Netframework/AnalogyMessageConsumer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Analogy.LogServer.Clients
1111
{
1212
public class AnalogyMessageConsumer : IDisposable
1313
{
14-
public event EventHandler<Interfaces.AnalogyLogMessage> OnNewMessage;
14+
public event EventHandler<Interfaces.DataTypes.AnalogyLogMessage> OnNewMessage;
1515
public event EventHandler<string> OnError;
1616
private static Analogy.AnalogyClient Client { get; set; }
1717
private readonly AsyncServerStreamingCall<AnalogyGRPCLogMessage> _stream;
@@ -41,10 +41,10 @@ private async Task GetMessages()
4141
{
4242
var m = _stream.ResponseStream.Current;
4343
var token = _cts.Token;
44-
Interfaces.AnalogyLogMessage msg = new Interfaces.AnalogyLogMessage()
44+
Interfaces.DataTypes.AnalogyLogMessage msg = new Interfaces.DataTypes.AnalogyLogMessage()
4545
{
46-
Level = (AnalogyLogLevel)m.Level,
47-
Class = (AnalogyLogClass)m.Class,
46+
Level = (Interfaces.DataTypes.AnalogyLogLevel)m.Level,
47+
Class = (Interfaces.DataTypes.AnalogyLogClass)m.Class,
4848
Date = m.Date.ToDateTimeOffset(),
4949
FileName = m.FileName,
5050
LineNumber = m.LineNumber,

Analogy.LogServer.Clients/Netframework/AnalogyMessageProducer.cs

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public AnalogyMessageProducer(string address)
4141
}
4242
}
4343

44-
public async Task Log(string text, string source, AnalogyLogLevel level, string category = "",
44+
public async Task Log(string text, string source, Interfaces.DataTypes.AnalogyLogLevel level, string category = "",
4545
string machineName = null, string userName = null, string processName = null, int processId = 0, int threadId = 0, Dictionary<string, string> additionalInformation = null, [CallerMemberName] string memberName = "", [CallerLineNumber] long lineNumber = 0, [CallerFilePath] string filePath = "")
4646
{
4747
if (!connected)
@@ -91,33 +91,22 @@ public async Task Log(string text, string source, AnalogyLogLevel level, string
9191
}
9292
}
9393

94-
private AnalogyGRPCLogLevel GetLogLevel(AnalogyLogLevel level)
94+
private AnalogyGRPCLogLevel GetLogLevel(Interfaces.DataTypes.AnalogyLogLevel level)
9595
{
96-
switch (level)
97-
{
98-
case AnalogyLogLevel.Unknown:
99-
return AnalogyGRPCLogLevel.Unknown;
100-
case AnalogyLogLevel.Trace:
101-
return AnalogyGRPCLogLevel.Trace;
102-
case AnalogyLogLevel.Verbose:
103-
return AnalogyGRPCLogLevel.Verbose;
104-
case AnalogyLogLevel.Debug:
105-
return AnalogyGRPCLogLevel.Debug;
106-
case AnalogyLogLevel.Information:
107-
return AnalogyGRPCLogLevel.Information;
108-
case AnalogyLogLevel.Warning:
109-
return AnalogyGRPCLogLevel.Warning;
110-
case AnalogyLogLevel.Error:
111-
return AnalogyGRPCLogLevel.Error;
112-
case AnalogyLogLevel.Critical:
113-
return AnalogyGRPCLogLevel.Critical;
114-
case AnalogyLogLevel.Analogy:
115-
return AnalogyGRPCLogLevel.Analogy;
116-
case AnalogyLogLevel.None:
117-
return AnalogyGRPCLogLevel.None;
118-
default:
119-
return AnalogyGRPCLogLevel.Unknown;
120-
}
96+
return level switch
97+
{
98+
Interfaces.DataTypes.AnalogyLogLevel.Unknown => AnalogyGRPCLogLevel.Unknown,
99+
Interfaces.DataTypes.AnalogyLogLevel.Trace => AnalogyGRPCLogLevel.Trace,
100+
Interfaces.DataTypes.AnalogyLogLevel.Verbose => AnalogyGRPCLogLevel.Verbose,
101+
Interfaces.DataTypes.AnalogyLogLevel.Debug => AnalogyGRPCLogLevel.Debug,
102+
Interfaces.DataTypes.AnalogyLogLevel.Information => AnalogyGRPCLogLevel.Information,
103+
Interfaces.DataTypes.AnalogyLogLevel.Warning => AnalogyGRPCLogLevel.Warning,
104+
Interfaces.DataTypes.AnalogyLogLevel.Error => AnalogyGRPCLogLevel.Error,
105+
Interfaces.DataTypes.AnalogyLogLevel.Critical => AnalogyGRPCLogLevel.Critical,
106+
Interfaces.DataTypes.AnalogyLogLevel.Analogy => AnalogyGRPCLogLevel.Analogy,
107+
Interfaces.DataTypes.AnalogyLogLevel.None => AnalogyGRPCLogLevel.None,
108+
_ => AnalogyGRPCLogLevel.Unknown,
109+
};
121110
}
122111

123112
public void StopReceiving()

Analogy.LogServer.Configurator/Analogy.LogServer.Configurator.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.1.0" />
20-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
21-
<PackageReference Include="System.Resources.Extensions" Version="9.0.6" />
19+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="9.0.0-rc2" />
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
21+
<PackageReference Include="System.Resources.Extensions" Version="9.0.10" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

Analogy.LogServer.Configurator/MainForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void MainForm_Load(object sender, EventArgs e)
4242
private void LoadSettings()
4343
{
4444
chLogToFile.Checked = ServiceConfiguration.ServiceConfiguration.LogAlsoToLogFile;
45-
txtbLogFileLocation.Text = ServiceConfiguration.Serilog.WriteTo[1].Args.pathFormat;
45+
txtbLogFileLocation.Text = ServiceConfiguration.Serilog.WriteTo[1].Args.PathFormat;
4646
nudHoursToKeepHistory.Value = ServiceConfiguration.ServiceConfiguration.HoursToKeepHistory;
4747
nudMemoryUsageInMB.Value = ServiceConfiguration.ServiceConfiguration.MemoryUsageInMB;
4848
nudCleanUpIntervalMinutes.Value = ServiceConfiguration.ServiceConfiguration.CleanUpIntervalMinutes;
@@ -52,7 +52,7 @@ private void LoadSettings()
5252
private void SaveSettings()
5353
{
5454
ServiceConfiguration.ServiceConfiguration.LogAlsoToLogFile = chLogToFile.Checked;
55-
ServiceConfiguration.Serilog.WriteTo[1].Args.pathFormat = txtbLogFileLocation.Text;
55+
ServiceConfiguration.Serilog.WriteTo[1].Args.PathFormat = txtbLogFileLocation.Text;
5656
ServiceConfiguration.ServiceConfiguration.HoursToKeepHistory = (int)nudHoursToKeepHistory.Value;
5757
ServiceConfiguration.ServiceConfiguration.MemoryUsageInMB = (int)nudMemoryUsageInMB.Value;
5858
ServiceConfiguration.ServiceConfiguration.CleanUpIntervalMinutes = (int)nudCleanUpIntervalMinutes.Value;

0 commit comments

Comments
 (0)