Skip to content

Commit 768eb85

Browse files
v8.0.0
1 parent 2933e64 commit 768eb85

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ dotnet_diagnostic.SA1108.severity = silent
274274
dotnet_diagnostic.SA1012.severity = error
275275
dotnet_diagnostic.SA1500.severity = error
276276
dotnet_diagnostic.SA1316.severity = error
277+
csharp_prefer_system_threading_lock = true:suggestion
278+
dotnet_diagnostic.MA0132.severity = error
277279

278280
[*.{cs,vb}]
279281
dotnet_style_operator_placement_when_wrapping = beginning_of_line

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

+6-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
configuration: [Release, Debug]
15+
configuration: [Release]
1616

1717
runs-on: windows-latest # For a list of available runner types, refer to
1818
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
@@ -23,13 +23,13 @@ jobs:
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4.2.2
2727
with:
2828
fetch-depth: 0
2929

3030
# Install the .NET Core workload
3131
- name: Install .NET Core
32-
uses: actions/setup-dotnet@v4.1.0
32+
uses: actions/setup-dotnet@v4.2.0
3333
with:
3434
dotnet-version: 9.0.x
3535

@@ -54,7 +54,7 @@ jobs:
5454

5555
# Publish Artifacts
5656
- name: 'Publish Artifacts'
57-
uses: actions/upload-artifact@v4.4.0
57+
uses: actions/upload-artifact@v4.4.3
5858
with:
5959
name: artifactory_${{ matrix.configuration }}
6060
path: ./Analogy.LogViewer.NLogProvider/bin/${{ matrix.configuration }}
@@ -64,21 +64,17 @@ jobs:
6464
if: ${{ github.event_name == 'push'}}
6565
runs-on: windows-latest
6666
steps:
67+
- name: Setup NuGet.exe for use with actions
68+
uses: NuGet/setup-nuget@v2.0.1
6769
- name: 'Download Artifact'
6870
uses: actions/download-artifact@v4.1.8
6971
with:
7072
name: artifactory_Release
7173
- name: 'Dotnet NuGet Push'
7274
run: |
7375
Get-ChildItem ./ -Filter *.nupkg |
74-
Where-Object { !$_.Name.Contains('preview') } |
7576
ForEach-Object { dotnet nuget push $_ --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}} }
7677
shell: pwsh
77-
78-
- name: Setup NuGet.exe for use with actions
79-
uses: NuGet/setup-nuget@v1.0.5
80-
81-
8278
concurrency:
8379
group: ${{ github.ref }}
8480
cancel-in-progress: true

Analogy.LogViewer.NLogProvider/Analogy.LogViewer.NLogProvider.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
44
<TargetFrameworks>net9.0-windows;net8.0-windows;net48</TargetFrameworks>
5-
<VersionPrefix>7.2.0</VersionPrefix>
5+
<VersionPrefix>8.0.0</VersionPrefix>
66
<VersionSuffix></VersionSuffix>
77
<AssemblyName>Analogy.LogViewer.NLogProvider</AssemblyName>
88
<RootNamespace>Analogy.LogViewer.NLogProvider</RootNamespace>
@@ -29,8 +29,8 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="CsvHelper" Version="33.0.1" />
32-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.2.0" />
33-
<PackageReference Include="Analogy.LogViewer.Template" Version="7.2.0" />
32+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0" />
33+
<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0" />
3434
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3535
<PackageReference Include="System.Resources.Extensions" Version="9.0.1" />
3636
</ItemGroup>

Analogy.LogViewer.NLogProvider/NLogFileLoader.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,18 @@ private IAnalogyLogMessage ParseMessage(ElasticRowRecord record)
124124
return m;
125125
}
126126

127-
private DateTime ParseDateTime(string timestamp)
127+
private DateTimeOffset ParseDateTime(string timestamp)
128128
{
129-
if (DateTime.TryParse(timestamp, out var time))
129+
if (DateTimeOffset.TryParse(timestamp, out var time))
130130
{
131131
return time;
132132
}
133133

134-
if (DateTime.TryParseExact(timestamp, logFileSettings.DateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out var formatted))
134+
if (DateTimeOffset.TryParseExact(timestamp, logFileSettings.DateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out var formatted))
135135
{
136136
return formatted;
137137
}
138-
return DateTime.Now;
138+
return DateTimeOffset.Now;
139139
}
140140
}
141141

0 commit comments

Comments
 (0)