Skip to content

Commit 45941cd

Browse files
author
Warren Buckley
authored
Merge branch 'dev' into fix-error-with-devtools
2 parents 5bd24f1 + 1ad742f commit 45941cd

File tree

7 files changed

+842
-1782
lines changed

7 files changed

+842
-1782
lines changed
36.4 KB
Loading

LogViewer.Client/package-lock.json

Lines changed: 823 additions & 1763 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LogViewer.Client/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@
2626
"@types/angular": "^1.8.4",
2727
"@types/chart.js": "^2.9.35",
2828
"@types/electron-is-dev": "^1.1.1",
29-
"@types/node": "^18.7.8",
30-
"@typescript-eslint/eslint-plugin": "^5.33.1",
31-
"@typescript-eslint/parser": "^5.33.1",
32-
"electron": "^20.0.3",
33-
"electron-builder": "^23.3.3",
34-
"eslint": "^8.22.0",
35-
"eslint-plugin-jsdoc": "^39.3.6",
29+
"@types/node": "^18.11.10",
30+
"@typescript-eslint/eslint-plugin": "^5.46.0",
31+
"@typescript-eslint/parser": "^5.46.0",
32+
"electron": "^22.0.0",
33+
"electron-builder": "^23.6.0",
34+
"eslint": "^8.29.0",
35+
"eslint-plugin-jsdoc": "^39.6.4",
3636
"eslint-plugin-prefer-arrow": "^1.2.3",
37-
"typescript": "^4.7.4",
37+
"typescript": "^4.9.4",
3838
"typescript-tslint-plugin": "^1.0.2"
3939
},
4040
"dependencies": {
4141
"angular": "^1.8.3",
4242
"angular-chart.js": "^1.1.1",
43-
"axios": "^0.27.2",
44-
"bootstrap": "^5.2.0",
43+
"axios": "^1.2.0",
44+
"bootstrap": "^5.2.3",
4545
"chart.js": "2.9.4",
4646
"electron-log": "^4.4.8",
47-
"electron-updater": "^5.2.1",
48-
"jquery": "^3.6.0",
47+
"electron-updater": "^5.3.0",
48+
"jquery": "^3.6.1",
4949
"popper.js": "^1.16.1"
5050
}
5151
}

LogViewer.Server.Tests/LogViewer.Server.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="nunit" Version="3.13.3" />
14-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
14+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

LogViewer.Server/LogViewer.Server.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
22-
<PackageReference Include="Serilog.Expressions" Version="3.4.0" />
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
22+
<PackageReference Include="Serilog.Expressions" Version="3.4.1" />
2323
<PackageReference Include="Serilog.Formatting.Compact.Reader" Version="1.0.5" />
2424
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2525
</ItemGroup>

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A cross platform tool to read &amp; query JSON aka CLEF log files created by Ser
99
Releases are available on this GitHub Repository along on the Windows Store
1010

1111
### Windows
12-
<a href='//www.microsoft.com/store/apps/9N8RV8LKTXRJ?cid=storebadge&ocid=badge'><img src='https://assets.windowsphone.com/85864462-9c82-451e-9355-a3d5f874397a/English_get-it-from-MS_InvariantCulture_Default.png' alt='English badge' style='height: 38px;' height="38" /></a>
12+
<a href='https://www.microsoft.com/store/apps/9N8RV8LKTXRJ?cid=storebadge&ocid=badge'><img src='English_get-it-from-MS_InvariantCulture_Default.png' alt='English badge' style='height: 38px;' height="38" /></a>
1313

1414
### MacOS
1515
The metrics for the MacOS usage was too little & I don't currently build/release any other Apple apps, so my Apple Developer subscription lapsed. I assumed the application would still be available to download but that I would not be able to push any new updates. However it seems Apple just removes the listing :(
@@ -29,8 +29,8 @@ https://visualstudio.microsoft.com/vs/
2929
### Build Steps 🔨📐
3030
- Clone Repo
3131
- Open terminal in root of project
32-
- `dotnet publish LogViewer.Server --runtime osx-x64 --output bin/dist/osx --configuration release -p:PublishSingleFile=true` generates a self contained application for our WebAPI
33-
- `dotnet publish LogViewer.Server --runtime win-x64 --output bin/dist/win --configuration release -p:PublishSingleFile=true` same but creates the Windows version
32+
- `dotnet publish LogViewer.Server --runtime osx-x64 --output LogViewer.Server/bin/dist/osx --configuration release -p:PublishSingleFile=true` generates a self contained application for our WebAPI
33+
- `dotnet publish LogViewer.Server --runtime win-x64 --output LogViewer.Server/bin/dist/win --configuration release -p:PublishSingleFile=true` same but creates the Windows version
3434
- Change terminal directory to `LogViewer.Client` folder
3535
- Install TypeScript if missing `npm install -g typescript`
3636
- `npm install`

screenshot.JPG

179 KB
Loading

0 commit comments

Comments
 (0)