Skip to content
This repository was archived by the owner on Jan 8, 2024. It is now read-only.

Commit c0a7ed2

Browse files
author
Matt Jeanes
committed
Upgrade server dependencies, move to proper signalr package instead of pre-release
Also couple of code fixes to work with new versions
1 parent 837e68d commit c0a7ed2

File tree

13 files changed

+50
-54
lines changed

13 files changed

+50
-54
lines changed

‎.nuget/nuget.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
</solution>
66
<packageSources>
77
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
8-
<add key="AspNetCore Dev" value="https://dotnet.myget.org/f/aspnetcore-dev/api/v3/index.json" />
98
</packageSources>
109
</configuration>

‎SystemChecker.Migrations/SystemChecker.Migrations.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="dbup" Version="4.0.0-beta0005" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
24+
<PackageReference Include="dbup" Version="4.1.0" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
2828
<PackageReference Include="NDesk.Options" Version="0.2.1" />
2929
</ItemGroup>
3030

‎SystemChecker.Model/Data/Entities/CheckNotificationType.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ public class CheckNotificationType
1414
[Key]
1515
public int ID { get; set; }
1616

17-
[Column("ID")]
18-
public Enums.CheckNotificationType Type { get; set; }
19-
2017
public string Name { get; set; }
2118

2219
public List<CheckNotificationTypeOption> Options { get; set; }

‎SystemChecker.Model/Data/Entities/CheckType.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ public class CheckType
1414
[Key]
1515
public int ID { get; set; }
1616

17-
[Column("ID")]
18-
public Enums.CheckType Type { get; set; }
19-
2017
public string Name { get; set; }
2118

2219
public List<CheckTypeOption> Options { get; set; }

‎SystemChecker.Model/Data/Entities/SubCheckType.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ public class SubCheckType
1414
[Key]
1515
public int ID { get; set; }
1616

17-
[Column("ID")]
18-
public int Type { get; set; }
19-
2017
[Column("CheckTypeID")]
2118
public CheckType CheckType { get; set; }
2219

‎SystemChecker.Model/SystemChecker.Model.csproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AutoMapper" Version="6.2.2" />
8+
<PackageReference Include="AutoMapper" Version="7.0.1" />
99
<PackageReference Include="AutoMapper.Collection" Version="3.1.3" />
10-
<PackageReference Include="libphonenumber-csharp" Version="8.9.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
15-
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
16-
<PackageReference Include="Quartz" Version="3.0.2" />
17-
<PackageReference Include="Quartz.Serialization.Json" Version="3.0.2" />
10+
<PackageReference Include="libphonenumber-csharp" Version="8.9.8" />
11+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
14+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
15+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
16+
<PackageReference Include="Quartz" Version="3.0.5" />
17+
<PackageReference Include="Quartz.Serialization.Json" Version="3.0.5" />
1818
<PackageReference Include="SlackAPI" Version="1.0.5.93" />
19-
<PackageReference Include="StackExchange.Redis" Version="1.2.6" />
20-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.1" />
21-
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.1" />
22-
<PackageReference Include="TimeZoneConverter" Version="2.3.1" />
19+
<PackageReference Include="StackExchange.Redis" Version="1.2.7-alpha-00002" />
20+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.2" />
21+
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.0" />
22+
<PackageReference Include="TimeZoneConverter" Version="2.4.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎SystemChecker.Service/SystemChecker.Service.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
</Content>
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="DasMulli.Win32.ServiceUtils" Version="1.1.0" />
18-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
17+
<PackageReference Include="DasMulli.Win32.ServiceUtils" Version="1.2.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
2020
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
25-
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0-dev-00023" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.1.1" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
25+
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0-dev-00024" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<ProjectReference Include="..\SystemChecker.Model\SystemChecker.Model.csproj" />

‎SystemChecker.Web/ClientApp/app/dashboard/dashboard.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AfterViewInit, Component, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core";
22
import { Router } from "@angular/router";
3-
import { HubConnection, TransportType } from "@aspnet/signalr";
3+
import { HubConnectionBuilder, HttpTransportType } from "@aspnet/signalr";
44
import { DataTable, SelectItem } from "primeng/primeng";
55

66
import { CheckResultStatus } from "../app.enums";
@@ -77,7 +77,9 @@ export class DashboardComponent implements AfterViewInit, OnInit, OnDestroy {
7777
};
7878
public types: ICheckType[] = [];
7979
@ViewChild("dt") private dataTable: DataTable;
80-
private hub = new HubConnection("hub/dashboard", { transport: TransportType.WebSockets });
80+
private hub = new HubConnectionBuilder()
81+
.withUrl("hub/dashboard", { transport: HttpTransportType.WebSockets })
82+
.build();
8183
private hubReady: boolean = false;
8284
private loading: boolean = false;
8385
constructor(private appService: AppService, private messageService: MessageService, private ngZone: NgZone, private router: Router) {

‎SystemChecker.Web/ClientApp/app/details/details.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, NgZone, OnDestroy, OnInit } from "@angular/core";
22
import { ActivatedRoute } from "@angular/router";
3-
import { HubConnection, TransportType } from "@aspnet/signalr";
3+
import { HubConnectionBuilder, HttpTransportType } from "@aspnet/signalr";
44
import { TdLoadingService } from "@covalent/core";
55

66
import { ICheck, ICheckResults } from "../app.interfaces";
@@ -31,7 +31,9 @@ export class DetailsComponent implements OnInit, OnDestroy {
3131
public dateFrom: Date = new Date();
3232
public dateTo: Date = new Date();
3333
public loadingId = "details-chart-loading";
34-
private hub = new HubConnection("hub/details", { transport: TransportType.WebSockets });
34+
private hub = new HubConnectionBuilder()
35+
.withUrl("hub/details", { transport: HttpTransportType.WebSockets })
36+
.build();
3537
private hubReady: boolean = false;
3638
private checkID?: number;
3739
private selectedKey?: number;

‎SystemChecker.Web/SystemChecker.Web.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
<WarningsAsErrors>NU1605</WarningsAsErrors>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.0.1" />
16-
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.0.2" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.2" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
12+
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.1" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.1.1" />
15+
<PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.1.1" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
1919
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
2020
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.7.0" />
21-
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0-dev-00023" />
22-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.1" />
23-
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.0-preview2-30187" />
21+
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0-dev-00024" />
22+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.2" />
23+
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.1" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<Content Remove="ClientApp\**" />

‎SystemChecker.Web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@angular/platform-browser-dynamic": "^5.2.8",
2222
"@angular/platform-server": "^5.2.8",
2323
"@angular/router": "^5.2.8",
24-
"@aspnet/signalr": "^1.0.0-preview2-30187",
24+
"@aspnet/signalr": "^1.0.0",
2525
"@auth0/angular-jwt": "1.0.0-beta.9",
2626
"@covalent/core": "1.0.0",
2727
"@swimlane/ngx-charts": "^7.1.1",

‎SystemChecker.Web/tslint.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
"no-shadowed-variable": false,
3030
"comment-format": [
3131
false
32-
]
32+
],
33+
"no-namespace": false,
34+
"no-internal-module": false
3335
}
3436
}

‎SystemChecker.Web/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
dependencies:
7777
tslib "^1.7.1"
7878

79-
"@aspnet/signalr@^1.0.0-preview2-30187":
80-
version "1.0.0-preview2-30187"
81-
resolved "https://dotnet.myget.org/F/aspnetcore-dev/npm/@aspnet/signalr/-/@aspnet/signalr-1.0.0-preview2-30187.tgz#f19fda67a74f149d91b8a1ebb6cb746a0fe151c9"
79+
"@aspnet/signalr@^1.0.0":
80+
version "1.0.0"
81+
resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.0.0.tgz#26b10a32014a65c540cc5053cffa883c320788ce"
8282

8383
"@auth0/[email protected]":
8484
version "1.0.0-beta.9"

0 commit comments

Comments
 (0)