aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BackEnd/Timeline.Tests/Timeline.Tests.csproj4
-rw-r--r--BackEnd/Timeline/Timeline.csproj10
-rw-r--r--Dockerfile2
-rw-r--r--FrontEnd/package.json2
-rw-r--r--FrontEnd/pnpm-lock.yaml28
5 files changed, 25 insertions, 21 deletions
diff --git a/BackEnd/Timeline.Tests/Timeline.Tests.csproj b/BackEnd/Timeline.Tests/Timeline.Tests.csproj
index 74f918d7..03f724b1 100644
--- a/BackEnd/Timeline.Tests/Timeline.Tests.csproj
+++ b/BackEnd/Timeline.Tests/Timeline.Tests.csproj
@@ -15,8 +15,8 @@
<PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
- <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.11" />
- <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.11" />
+ <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
diff --git a/BackEnd/Timeline/Timeline.csproj b/BackEnd/Timeline/Timeline.csproj
index dbadf461..601703e9 100644
--- a/BackEnd/Timeline/Timeline.csproj
+++ b/BackEnd/Timeline/Timeline.csproj
@@ -37,11 +37,11 @@
<PackageReference Include="AutoMapper" Version="12.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="Markdig" Version="0.30.4" />
- <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.11" />
- <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.11" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="6.0.11" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.11" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11">
+ <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="7.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
diff --git a/Dockerfile b/Dockerfile
index 9ab009b9..8ed6c1b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ COPY BackEnd .
COPY --from=front-build /timeline-app/dist /timeline-app/Timeline/ClientApp
RUN dotnet publish Timeline/Timeline.csproj --configuration Release --output ./Timeline/publish/ -r linux-x64 --self-contained false
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
ENV ASPNETCORE_URLS=http://0.0.0.0:5000
ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
WORKDIR /app
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index 192d5484..e1ba2ab6 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -7,7 +7,7 @@
"description": "Timeline app.",
"type": "module",
"dependencies": {
- "@microsoft/signalr": "^6.0.10",
+ "@microsoft/signalr": "^7.0.0",
"@popperjs/core": "^2.11.6",
"axios": "^1.1.3",
"bootstrap": "^5.2.2",
diff --git a/FrontEnd/pnpm-lock.yaml b/FrontEnd/pnpm-lock.yaml
index 697a6899..0c3dd5c4 100644
--- a/FrontEnd/pnpm-lock.yaml
+++ b/FrontEnd/pnpm-lock.yaml
@@ -1,7 +1,7 @@
lockfileVersion: 5.4
specifiers:
- '@microsoft/signalr': ^6.0.10
+ '@microsoft/signalr': ^7.0.0
'@popperjs/core': ^2.11.6
'@tsconfig/vite-react': ^1.0.1
'@types/color': ^3.0.3
@@ -57,7 +57,7 @@ specifiers:
xregexp: ^5.1.1
dependencies:
- '@microsoft/signalr': 6.0.10
+ '@microsoft/signalr': 7.0.0
'@popperjs/core': 2.11.6
axios: 1.1.3
bootstrap: 5.2.2_@popperjs+core@2.11.6
@@ -1442,12 +1442,12 @@ packages:
'@jridgewell/sourcemap-codec': 1.4.14
dev: true
- /@microsoft/signalr/6.0.10:
- resolution: {integrity: sha512-ND9LiIYac+ZDgCgW2QzpNfe9BTiOtjc2AX/2GtFIhRGhEzx5CixcNANg2VGj27IAxycAPPnEoy7+QA31Eil7QQ==}
+ /@microsoft/signalr/7.0.0:
+ resolution: {integrity: sha512-9bHYqc0cjN0fL1KnK+MhlN0Qd/rp8Na4pzKYSV3wP8VC8p7188dvvmRTreYLXXh0srRLf9aMBj0ZbdZQwfnL/A==}
dependencies:
abort-controller: 3.0.0
- eventsource: 1.1.2
- fetch-cookie: 0.11.0
+ eventsource: 2.0.2
+ fetch-cookie: 2.1.0
node-fetch: 2.6.7
ws: 7.5.9
transitivePeerDependencies:
@@ -2663,9 +2663,9 @@ packages:
engines: {node: '>=6'}
dev: false
- /eventsource/1.1.2:
- resolution: {integrity: sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==}
- engines: {node: '>=0.12.0'}
+ /eventsource/2.0.2:
+ resolution: {integrity: sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==}
+ engines: {node: '>=12.0.0'}
dev: false
/fast-deep-equal/3.1.3:
@@ -2701,10 +2701,10 @@ packages:
reusify: 1.0.4
dev: true
- /fetch-cookie/0.11.0:
- resolution: {integrity: sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA==}
- engines: {node: '>=8'}
+ /fetch-cookie/2.1.0:
+ resolution: {integrity: sha512-39+cZRbWfbibmj22R2Jy6dmTbAWC+oqun1f1FzQaNurkPDUP4C38jpeZbiXCR88RKRVDp8UcDrbFXkNhN+NjYg==}
dependencies:
+ set-cookie-parser: 2.5.1
tough-cookie: 4.1.2
dev: false
@@ -3877,6 +3877,10 @@ packages:
randombytes: 2.1.0
dev: true
+ /set-cookie-parser/2.5.1:
+ resolution: {integrity: sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==}
+ dev: false
+
/shallow-equal/1.2.1:
resolution: {integrity: sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==}
dev: false