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

Commit 2b032b2

Browse files
committed
BIG CHANGE: Upgrade to .NET Core 2.1
1 parent a861a68 commit 2b032b2

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1
2-
FROM microsoft/aspnetcore-build:2.1.300-preview1 AS builder
2+
FROM microsoft/dotnet:2.1.300-sdk-stretch AS builder
33
WORKDIR /source
44

55
# caches restore result by copying csproj file separately

Ferrous.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="EPPlus" Version="4.5.1" />
21-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-preview2-final" />
22-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.0-preview2-final" />
23-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0-preview2" />
21+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
22+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.0" />
23+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

Misc/WebSocketHubs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class BuildingUpdateHub : Hub
99
public static readonly string BuildingWebsocketUrl = "/api/websocket/building";
1010
public async Task JoinBuilding(string building)
1111
{
12-
await Groups.AddAsync(Context.ConnectionId, building);
12+
await Groups.AddToGroupAsync(Context.ConnectionId, building);
1313
}
1414
}
1515
}

ferrous.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ DO $$
143143
BEGIN
144144
IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20180414091319_Init') THEN
145145
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
146-
VALUES ('20180414091319_Init', '2.1.0-preview2-30571');
146+
VALUES ('20180414091319_Init', '2.1.0-rtm-30799');
147147
END IF;
148148
END $$;
149149

@@ -185,7 +185,7 @@ DO $$
185185
BEGIN
186186
IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20180603073712_caperson') THEN
187187
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
188-
VALUES ('20180603073712_caperson', '2.1.0-preview2-30571');
188+
VALUES ('20180603073712_caperson', '2.1.0-rtm-30799');
189189
END IF;
190190
END $$;
191191

@@ -214,7 +214,7 @@ DO $$
214214
BEGIN
215215
IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20180603080245_casex') THEN
216216
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
217-
VALUES ('20180603080245_casex', '2.1.0-preview2-30571');
217+
VALUES ('20180603080245_casex', '2.1.0-rtm-30799');
218218
END IF;
219219
END $$;
220220

@@ -257,7 +257,7 @@ DO $$
257257
BEGIN
258258
IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20180603085047_allottedca') THEN
259259
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
260-
VALUES ('20180603085047_allottedca', '2.1.0-preview2-30571');
260+
VALUES ('20180603085047_allottedca', '2.1.0-rtm-30799');
261261
END IF;
262262
END $$;
263263

@@ -293,6 +293,6 @@ DO $$
293293
BEGIN
294294
IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20180603143928_rename-canav') THEN
295295
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
296-
VALUES ('20180603143928_rename-canav', '2.1.0-preview2-30571');
296+
VALUES ('20180603143928_rename-canav', '2.1.0-rtm-30799');
297297
END IF;
298298
END $$;

publish.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Remove-Item -Recurse -Force built
2+
Remove-Item publish.zip
13
dotnet publish -c release -r linux-x64 -o built
24
dotnet ef migrations script -i -o ferrous.sql
35
Add-Type -A System.IO.Compression.FileSystem

0 commit comments

Comments
 (0)