From 86c7ef8aca3982754456cf99609ec4f83fc09f5c Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 11 Nov 2020 15:45:27 +0800 Subject: Migrate to .net 5.0. --- .github/workflows/back-ci.yaml | 4 +- .../Timeline.ErrorCodes.CodeGenerator.csproj | 2 +- .../packages.lock.json | 2 +- .../Timeline.ErrorCodes/Timeline.ErrorCodes.csproj | 2 +- BackEnd/Timeline.ErrorCodes/packages.lock.json | 2 +- .../IntegratedTests/UserAvatarTest.cs | 1 + BackEnd/Timeline.Tests/Timeline.Tests.csproj | 12 +- BackEnd/Timeline.Tests/packages.lock.json | 405 +++++++++------------ BackEnd/Timeline/Timeline.csproj | 18 +- BackEnd/Timeline/packages.lock.json | 383 +++++++++---------- Dockerfile | 4 +- 11 files changed, 383 insertions(+), 452 deletions(-) diff --git a/.github/workflows/back-ci.yaml b/.github/workflows/back-ci.yaml index 5b4609f7..dd7ffb06 100644 --- a/.github/workflows/back-ci.yaml +++ b/.github/workflows/back-ci.yaml @@ -33,10 +33,10 @@ jobs: restore-keys: | nuget-${{ runner.os }}- - - name: Use .Net Core 3.1.x + - name: Use .Net Core 5.0.x uses: actions/setup-dotnet@v1 with: - dotnet-version: "3.1.x" + dotnet-version: "5.0.x" - name: Build And Test run: dotnet test --logger html --collect:"XPlat Code Coverage" --settings './Timeline.Tests/coverletArgs.runsettings' diff --git a/BackEnd/Timeline.ErrorCodes.CodeGenerator/Timeline.ErrorCodes.CodeGenerator.csproj b/BackEnd/Timeline.ErrorCodes.CodeGenerator/Timeline.ErrorCodes.CodeGenerator.csproj index c8eb97f3..767bec39 100644 --- a/BackEnd/Timeline.ErrorCodes.CodeGenerator/Timeline.ErrorCodes.CodeGenerator.csproj +++ b/BackEnd/Timeline.ErrorCodes.CodeGenerator/Timeline.ErrorCodes.CodeGenerator.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 diff --git a/BackEnd/Timeline.ErrorCodes.CodeGenerator/packages.lock.json b/BackEnd/Timeline.ErrorCodes.CodeGenerator/packages.lock.json index 69cfee1e..bbe8e02a 100644 --- a/BackEnd/Timeline.ErrorCodes.CodeGenerator/packages.lock.json +++ b/BackEnd/Timeline.ErrorCodes.CodeGenerator/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - ".NETCoreApp,Version=v3.1": { + ".NETCoreApp,Version=v5.0": { "TextCopy": { "type": "Direct", "requested": "[4.2.0, )", diff --git a/BackEnd/Timeline.ErrorCodes/Timeline.ErrorCodes.csproj b/BackEnd/Timeline.ErrorCodes/Timeline.ErrorCodes.csproj index 01ca2568..563e6f93 100644 --- a/BackEnd/Timeline.ErrorCodes/Timeline.ErrorCodes.csproj +++ b/BackEnd/Timeline.ErrorCodes/Timeline.ErrorCodes.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 diff --git a/BackEnd/Timeline.ErrorCodes/packages.lock.json b/BackEnd/Timeline.ErrorCodes/packages.lock.json index dabf86bc..79ad3024 100644 --- a/BackEnd/Timeline.ErrorCodes/packages.lock.json +++ b/BackEnd/Timeline.ErrorCodes/packages.lock.json @@ -1,6 +1,6 @@ { "version": 1, "dependencies": { - ".NETCoreApp,Version=v3.1": {} + ".NETCoreApp,Version=v5.0": {} } } \ No newline at end of file diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs index f2796005..66a12573 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs @@ -65,6 +65,7 @@ namespace Timeline.Tests.IntegratedTests { using var content = new ByteArrayContent(new[] { (byte)0x00 }); + content.Headers.ContentLength = null; content.Headers.ContentType = new MediaTypeHeaderValue("image/png"); var res = await client.PutAsync("users/user1/avatar", content); res.Should().BeInvalidModel(); diff --git a/BackEnd/Timeline.Tests/Timeline.Tests.csproj b/BackEnd/Timeline.Tests/Timeline.Tests.csproj index 973e0fc0..624014d9 100644 --- a/BackEnd/Timeline.Tests/Timeline.Tests.csproj +++ b/BackEnd/Timeline.Tests/Timeline.Tests.csproj @@ -1,9 +1,9 @@  - netcoreapp3.1 + net5.0 - 8.0 + 9.0 @@ -14,13 +14,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all diff --git a/BackEnd/Timeline.Tests/packages.lock.json b/BackEnd/Timeline.Tests/packages.lock.json index 7150a222..7d84213e 100644 --- a/BackEnd/Timeline.Tests/packages.lock.json +++ b/BackEnd/Timeline.Tests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - ".NETCoreApp,Version=v3.1": { + ".NETCoreApp,Version=v5.0": { "coverlet.collector": { "type": "Direct", "requested": "[1.3.0, )", @@ -35,40 +35,40 @@ }, "Microsoft.AspNetCore.TestHost": { "type": "Direct", - "requested": "[3.1.9, )", - "resolved": "3.1.9", - "contentHash": "0DBtfgmM2yS4h0v+gS4JHRX4nuyQmW7Yi5/G4yB5KelA2dDXPsAiipw9z47B1jVEs9QZdOwSqPQm2R/owl2TnA==", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "pTeq9KFW7YiobyMkFotEtWe2rYNFemHNvuKM6Pl8DR6RubVQHOZ7TvUlBVRBE3Onr2Bk9u3U4bbhJXmsxeSYvA==", "dependencies": { - "System.IO.Pipelines": "4.7.3" + "System.IO.Pipelines": "5.0.0" } }, "Microsoft.CodeAnalysis.FxCopAnalyzers": { "type": "Direct", - "requested": "[3.3.0, )", - "resolved": "3.3.0", - "contentHash": "k3Icqx8kc+NrHImuiB8Jc/wd32Xeyd2B/7HOR5Qu9pyKzXQ4ikPeBAwzG2FSTuYhyIuNWvwL5k9yYBbbVz6w9w==", + "requested": "[3.3.1, )", + "resolved": "3.3.1", + "contentHash": "O6L7wOD6dmytWZr4ulw6wLYk8QmsO/TlBHyWOB2OQKnUm31JGOXEncJjVm8Fw24BDzP22wfsleWFidiNU/DIsA==", "dependencies": { - "Microsoft.CodeAnalysis.VersionCheckAnalyzer": "[3.3.0]", - "Microsoft.CodeQuality.Analyzers": "[3.3.0]", - "Microsoft.NetCore.Analyzers": "[3.3.0]", - "Microsoft.NetFramework.Analyzers": "[3.3.0]" + "Microsoft.CodeAnalysis.VersionCheckAnalyzer": "[3.3.1]", + "Microsoft.CodeQuality.Analyzers": "[3.3.1]", + "Microsoft.NetCore.Analyzers": "[3.3.1]", + "Microsoft.NetFramework.Analyzers": "[3.3.1]" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[16.7.1, )", - "resolved": "16.7.1", - "contentHash": "7T3XYuLT2CRMZXwlp8p4cEEf6y7VifxTdKwYNzCYp31CN4iyrcDKneIJvNTo0YVnTxJn+CSlGVlUnZHUlAwt9A==", + "requested": "[16.8.0, )", + "resolved": "16.8.0", + "contentHash": "fc8VoTlD9+en13XWT9SW86M9jn4Y0Vns/uHRUJ2B6fevnuYmkilBLL+bIXC9yMELGYrerXIZm+B6Caux8lopfQ==", "dependencies": { - "Microsoft.CodeCoverage": "16.7.1", - "Microsoft.TestPlatform.TestHost": "16.7.1" + "Microsoft.CodeCoverage": "16.8.0", + "Microsoft.TestPlatform.TestHost": "16.8.0" } }, "Moq": { "type": "Direct", - "requested": "[4.14.7, )", - "resolved": "4.14.7", - "contentHash": "z1jwY3lL3d4l+92cdSnhRDUUco68HiRNfLKB9r9/PLP5lrN+ZL1Qtt3brVGVB8iY+ioBXhlFue2JtycBczE8Pw==", + "requested": "[4.15.1, )", + "resolved": "4.15.1", + "contentHash": "nqN2hVf28peFnkVLqtSpRgNRqoRCwK1dB94UmjUi51ksTq3bKlj7LtpmzCbb2PITrzQTrLmNya3Vu3mUK61vZw==", "dependencies": { "Castle.Core": "4.4.0", "System.Threading.Tasks.Extensions": "4.5.1" @@ -283,15 +283,6 @@ "Microsoft.AspNetCore.Mvc.Core": "1.0.4" } }, - "Microsoft.AspNetCore.NodeServices": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "bbd3FlSPWiRQrIcBLa5TaOvo4gjmmiNMkxA8VmZ6u0eIpS0Yj35/eTopaGdtzqwlqj5jXbdRoib1MruXuPaW8A==", - "dependencies": { - "Microsoft.Extensions.Logging.Console": "3.1.9", - "Newtonsoft.Json": "12.0.2" - } - }, "Microsoft.AspNetCore.Routing": { "type": "Transitive", "resolved": "1.0.4", @@ -317,21 +308,12 @@ "System.Threading.Tasks": "4.0.11" } }, - "Microsoft.AspNetCore.SpaServices": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "Fb+N2ZyF1wNrGeWggT+Ovv6W8AAVxfi4V/SnuEsBOR+nmkFhty9zyh6IDRRS98GJK6OE3adqqPbWMtJqbxYnNA==", - "dependencies": { - "Microsoft.AspNetCore.NodeServices": "3.1.9" - } - }, "Microsoft.AspNetCore.SpaServices.Extensions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "ciy2GCvRnh9C22laArLsaItS+72U6Hqf4nDYShdvFgcen2ZV+NNSitb/B3vsmFfIPM8m4mf2x4T+vZ6OlI5XaA==", + "resolved": "5.0.0", + "contentHash": "mmnLfzxrpsK7YDrS6U2V3HhPSAA24iyRgIq7K6nK98tFeUMwSMDkuR9Ei67NRE1S6EN8J+CSfsoTyzvKBg/dRw==", "dependencies": { - "Microsoft.AspNetCore.SpaServices": "3.1.9", - "Microsoft.Extensions.FileProviders.Physical": "3.1.9" + "Microsoft.Extensions.FileProviders.Physical": "5.0.0" } }, "Microsoft.AspNetCore.StaticFiles": { @@ -359,30 +341,20 @@ "System.Text.Encodings.Web": "4.0.1" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "J2G1k+u5unBV+aYcwxo94ip16Rkp65pgWFb0R6zwJipzWNMgvqlWeuI7/+R+e8bob66LnSG+llLJ+z8wI94cHg==" - }, "Microsoft.CodeAnalysis.VersionCheckAnalyzer": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "xjLM3DRFZMan3nQyBQEM1mBw6VqQybi4iMJhMFW6Ic1E1GCvqJR3ABOwEL7WtQjDUzxyrGld9bASnAos7G/Xyg==" + "resolved": "3.3.1", + "contentHash": "ZUMf70abtWvwevkLFOlEHDck81oZCsi9jBHODDSSH2YPQdtCKzeQfaWWnAmn2ii7N3Q2V2arOj4Mu8ZTTSs3PA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.7.1", - "contentHash": "PhSppbk+kvAyD9yGJIcBRJ/XYwY+21YK88l22PGTtixaxNdjnx1idVKh88LCGwKaTL8HhlnQ41VmBiBdZJzIQw==" + "resolved": "16.8.0", + "contentHash": "fR7HsWO+jTRhfBPWVl6QJbJSEU98siIKcQIDIo2tOH6nlogcOdScquWzVABR0UUpQlfWwt13vyryOltvLfsHnw==" }, "Microsoft.CodeQuality.Analyzers": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "zZ3miq6u22UFQKhfJyLnVEJ+DgeOopLh3eKJnKAcOetPP2hiv3wa7kHZlBDeTvtqJQiAQhAVbttket8XxjN1zw==" + "resolved": "3.3.1", + "contentHash": "h6o+zBUf47OFarRQn6LjwUNFvRUyUWLWcnunw6vLCxSDBmgPDQCsrsWpEtMz/+NKBvOeikVJobscarx3Wgtbiw==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -391,10 +363,10 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "+u4PeT1npi2EzhxGc5r1Z2z73zuXw+TlKVZm44WQhNCUw4LtUVDaxGSpUhrjW+X4snBCBfr4kT/uJyKnL4R4og==", + "resolved": "5.0.0", + "contentHash": "O1PBB9Y9bU9Fb3FkewqeXzVJ3hI2DW9DtRGj7lGkT1FnP1B3kqjn3xpG2AaVzkv2MkzzKHNJAh+LQq3XaFcAMw==", "dependencies": { - "SQLitePCLRaw.core": "2.0.2" + "SQLitePCLRaw.core": "2.0.4" } }, "Microsoft.DotNet.PlatformAbstractions": { @@ -404,57 +376,56 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "u3A2W0BvAuAF2jgW+WX+C+Sh8sMGX5Kl1hdA0gu6A/XSrZQoW/BUP4a/q2n3iitDGndaorqjAKx+Spb9gBto+w==", + "resolved": "5.0.0", + "contentHash": "QJk6pwN5wCriRdaNXQQxifeDNYephqqDMSXAQFX1nZjHwz/hChD0kDwklX20FexN9IAwQftepMbglcjwTX3l4Q==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Bcl.HashCode": "1.1.0", - "Microsoft.EntityFrameworkCore.Abstractions": "3.1.9", - "Microsoft.EntityFrameworkCore.Analyzers": "3.1.9", - "Microsoft.Extensions.Caching.Memory": "3.1.9", - "Microsoft.Extensions.DependencyInjection": "3.1.9", - "Microsoft.Extensions.Logging": "3.1.9", - "System.Collections.Immutable": "1.7.1", - "System.ComponentModel.Annotations": "4.7.0", - "System.Diagnostics.DiagnosticSource": "4.7.1" + "Microsoft.EntityFrameworkCore.Abstractions": "5.0.0", + "Microsoft.EntityFrameworkCore.Analyzers": "5.0.0", + "Microsoft.Extensions.Caching.Memory": "5.0.0", + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "System.Collections.Immutable": "5.0.0", + "System.ComponentModel.Annotations": "5.0.0", + "System.Diagnostics.DiagnosticSource": "5.0.0" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "IR6Y4RJVlw0QXdWXjF3Kx9s1QLiicJus+BFBKr43lBtriV20j3yrWMoaZ9W1AUUgnicZXpXVcNfklqtmwb9Sxw==" + "resolved": "5.0.0", + "contentHash": "PCDiskNvB+1rs+d3ET0Itm3mPj6+CpFO7V1nPXfVL6ipS6+27vKs9mnEP4C8vTr2BhSpyvKQetp4Z0ktrqv+wg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "eXGyx/Lb1fiiKtnIStdxGrfBSSQg8oZytE10f1T/2xAx12W9dKB9U9fg05cwNCDC0S2CXILsmZHYaGqCSXVAqQ==" + "resolved": "5.0.0", + "contentHash": "l1c/1ge8ymXgLqtstTyX3PZOLRuFo1jn0FQ9H4ag3Bwz70KTMyEOXwkKBZZ1gDlCibETrooflMis8wvvXFh5YQ==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "7fhWuSfrCYlv/hvOX5OhbFJF/G9f8sifqTrJiYnAYLDOvNizwv7t9tFPD8JwaF3zM2S54O5/Vni2NxvwzSaW2w==", + "resolved": "5.0.0", + "contentHash": "UMhoo0t3eii73AUwsvbGpYMGXS0ga/uA/cukgJza+IJ4EtcuNfdhGsA3emzf9nYpQ7urJzWzU6VOfG59h935Ag==", "dependencies": { - "Microsoft.EntityFrameworkCore": "3.1.9" + "Microsoft.EntityFrameworkCore": "5.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "5.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "sMFCWv/1UcsFQZeGQcbfPbEZKZ1oKZqWZXTbc7PEZVMIXu82nbavstdNQ84x5IBXJkxl8iW3zjChb/FRBr5uLQ==", + "resolved": "5.0.0", + "contentHash": "xlpmIN768QlG1f0yzPQvqxfV+r7oIwid/ohosCdNeIf9MolAX97Bi517EQEL+AEU9cJaUx2GBrS3boWCNfe5tg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "3.1.9", - "SQLitePCLRaw.bundle_e_sqlite3": "2.0.2" + "Microsoft.EntityFrameworkCore.Sqlite.Core": "5.0.0", + "SQLitePCLRaw.bundle_e_sqlite3": "2.0.4" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "Da6h8LdpJwKc1az9DMWt2Mt6gHXPRZqwiumV1Zx0AuM3EThyokVDzBGy2sti0AcBhcQMLJHPEr5R9xuiWvaYYQ==", + "resolved": "5.0.0", + "contentHash": "S5R5FvZ2ZDtHRHdPgHhz3JJqpzui1aGrFCUzelBFlPqiR7KO06Ew18X9KlK0Ur5hv4zuJ9hbXXBAgnuHf3aTHQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "3.1.9", + "Microsoft.Data.Sqlite.Core": "5.0.0", "Microsoft.DotNet.PlatformAbstractions": "3.1.6", - "Microsoft.EntityFrameworkCore.Relational": "3.1.9", - "Microsoft.Extensions.DependencyModel": "3.1.6" + "Microsoft.EntityFrameworkCore.Relational": "5.0.0", + "Microsoft.Extensions.DependencyModel": "5.0.0" } }, "Microsoft.Extensions.ApiDescription.Server": { @@ -464,74 +435,56 @@ }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "/2QsPAsUZD4qvftZkUKHRRRryPDXWh606/iNXPLrulwHLMr9JNsKBJWVqylT3qU92nJok5VoqSblkY9mSyxFyg==", + "resolved": "5.0.0", + "contentHash": "bu8As90/SBAouMZ6fJ+qRNo1X+KgHGrVueFhhYi+E5WqEhcnp2HoWRFnMzXQ6g4RdZbvPowFerSbKNH4Dtg5yg==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.1.9" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "/JrVMVetX/kpJQUIlJ6NLQ3zbF0yyryXpo4+uFCqYIUZzgmWk8DS/zSKcyj1tQ3410+vhDEAPngxC+hg0IlJeg==", - "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "3.1.9", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", - "Microsoft.Extensions.Logging.Abstractions": "3.1.9", - "Microsoft.Extensions.Options": "3.1.9" - } - }, - "Microsoft.Extensions.Configuration": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "lqdkOGNeTMKG981Q7yWGlRiFbIlsRwTlMMiybT+WOzUCFBS/wc25tZgh7Wm/uRoBbWefgvokzmnea7ZjmFedmA==", + "resolved": "5.0.0", + "contentHash": "/1qPCleFOkJe0O+xmFqCNLFYQZTJz965sVw8CUB/BQgsApBwzAUsL2BUkDvQW+geRUVTXUS9zLa0pBjC2VJ1gA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.9" + "Microsoft.Extensions.Caching.Abstractions": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "vOJxPKczaHpXeZFrxARxYwsEulhEouXc5aZGgMdkhV/iEXX9/pfjqKk76rTG+4CsJjHV+G/4eMhvOIaQMHENNA==", - "dependencies": { - "Microsoft.Extensions.Primitives": "3.1.9" - } - }, - "Microsoft.Extensions.Configuration.Binder": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "BG6HcT7tARYakftqfQu+cLksgIWG1NdxMY+igI12hdZrUK+WjS973NiRyuao/U9yyTeM9NPwRnC61hCmG3G3jg==", + "resolved": "5.0.0", + "contentHash": "ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", "dependencies": { - "Microsoft.Extensions.Configuration": "3.1.9" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "ORqfrAACcvTInie1oGola5uky344/PiNfgayTPuZWV4WnSfIQZJQm/ZLpGshJE3h7TqwYaYElGazK/yaM2bFLA==", + "resolved": "5.0.0", + "contentHash": "Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9" + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "8PkcaPwiTPOhqshoY4+rQUbz86X6YpLDLUqXOezh7L2A3pgpBmeBBByYIffofBlvQxDdQ0zB2DkWjbZWyCxRWg==" + "resolved": "5.0.0", + "contentHash": "ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==" }, "Microsoft.Extensions.DependencyModel": { "type": "Transitive", - "resolved": "3.1.6", - "contentHash": "/UlDKULIVkLQYn1BaHcy/rc91ApDxJb7T75HcCbGdqwvxhnRQRKM2di1E70iCPMF9zsr6f4EgQTotBGxFIfXmw==", - "dependencies": { - "System.Text.Json": "4.7.2" - } + "resolved": "5.0.0", + "contentHash": "umBECCoMC+sOUgm083yFr8SxTobUOcPFH4AXigdO2xJiszCHAnmeDl4qPphJt+oaJ/XIfV1wOjIts2nRnki61Q==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "Q4SGwEFZKiZbpzPgdGbQUULxtcH1zXMOwCPKSm6QwVcOCGshf3QLfBh+O/GyFH4B0RfZ16nKyeW1mMONlRyjUw==", + "resolved": "5.0.0", + "contentHash": "iuZIiZ3mteEb+nsUqpGXKx2cGF+cv6gWPd5jqQI4hzqdiJ6I94ddLjKhQOuRW1lueHwocIw30xbSHGhQj0zjdQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.1.9" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.FileProviders.Embedded": { @@ -545,52 +498,34 @@ }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "HWDSsblTCQp7EEJJmnLzttIhFGzDu+DGqBbOvGCdFT0+pkCuBkn3EiWpEEcm5WMTO5njmsbLSK9ZuUUf2zPsFg==", + "resolved": "5.0.0", + "contentHash": "1rkd8UO2qf21biwO7X0hL9uHP7vtfmdv/NLvKgCRHkdz1XnW8zVQJXyEYiN68WYpExgtVWn55QF0qBzgfh1mGg==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "3.1.9", - "Microsoft.Extensions.FileSystemGlobbing": "3.1.9" + "Microsoft.Extensions.FileProviders.Abstractions": "5.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "5bnewG1aBiSESPNwcXGIxDDRN95uqdy+fqZZ8Z63Et5rRNlAwAfXHOrg+FTht7UjHobjvtjzquMCbAWhWEPHIw==" + "resolved": "5.0.0", + "contentHash": "ArliS8lGk8sWRtrWpqI8yUVYJpRruPjCDT+EIjrgkA/AAPRctlAkRISVZ334chAKktTLzD1+PK8F5IZpGedSqA==" }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "+V3i0jCQCO6IIOf6e+fL0SqrZd2x/Krug9EEL1JHa9R03RsbEpltCtjVY5hxedyuyuQKwvLoR12sCfu/9XEUAw==", + "resolved": "5.0.0", + "contentHash": "MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", "dependencies": { - "Microsoft.Extensions.Configuration.Binder": "3.1.9", - "Microsoft.Extensions.DependencyInjection": "3.1.9", - "Microsoft.Extensions.Logging.Abstractions": "3.1.9", - "Microsoft.Extensions.Options": "3.1.9" + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "W5fbF8qVR9SMVVJqDQLIR7meWbev6Pu/lbrm7LDNr4Sp7HOotr4k2UULTdFSXOi5aoDdkQZpWnq0ZSpjrR3tjg==" - }, - "Microsoft.Extensions.Logging.Configuration": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "hv6XsGgikrbkolBJdF1usl9R/nrliC5mifMqHMEY9zWcCLwNkXMJiS8p0lbosrnpVAMi4PbNx39DB51Dqscd0w==", - "dependencies": { - "Microsoft.Extensions.Logging": "3.1.9", - "Microsoft.Extensions.Options.ConfigurationExtensions": "3.1.9" - } - }, - "Microsoft.Extensions.Logging.Console": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "8Dusl1rkDivmvLrwj6QAo917xMHPiDBzG3IG3agiyDdtsC/fRp+1VN5iIN+O09PtEaMged2OLA6wCDwfSTSTZw==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.9", - "Microsoft.Extensions.Logging": "3.1.9", - "Microsoft.Extensions.Logging.Configuration": "3.1.9" - } + "resolved": "5.0.0", + "contentHash": "NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==" }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", @@ -605,22 +540,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "EIb3G1DL+Rl9MvJR7LjI1wCy2nfTN4y8MflbOftn1HLYQBj/Rwl8kUbGTrSFE01c99Wm4ETjWVsjqKcpFvhPng==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", - "Microsoft.Extensions.Primitives": "3.1.9" - } - }, - "Microsoft.Extensions.Options.ConfigurationExtensions": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "u5jh7RW+Ev81YqK1ZoBG0lftp2MA9xqXiTiRL46XzaPj2ScNUyiVbzcVY0fPbE27UOpT2hj+yPzRSOMIIo55UA==", + "resolved": "5.0.0", + "contentHash": "CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.9", - "Microsoft.Extensions.Configuration.Binder": "3.1.9", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", - "Microsoft.Extensions.Options": "3.1.9" + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.PlatformAbstractions": { @@ -638,8 +562,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "IrHecH0eGG7/XoeEtv++oLg/sJHRNyeCqlA9RhAo6ig4GpOTjtDr32sBMYuuLtUq8ALahneWkrOzoBAwJ4L4iA==" + "resolved": "5.0.0", + "contentHash": "cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==" }, "Microsoft.Extensions.WebEncoders": { "type": "Transitive", @@ -691,8 +615,8 @@ }, "Microsoft.NetCore.Analyzers": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "6qptTHUu1Wfszuf83NhU0IoAb4j7YWOpJs6oc6S4G/nI6aGGWKH/Xi5Vs9L/8lrI74ijEEzPcIwafSQW5ASHtA==" + "resolved": "3.3.1", + "contentHash": "8Ez3EImhFioAsB4bR2bBLA3Pkcz8K/VI6jPdnm98nLu+rodZU8s8QRjRnkrQEnC6VcVAVZJ8W7DL9yrfDsgjqQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -706,23 +630,23 @@ }, "Microsoft.NetFramework.Analyzers": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "JTfMic5fEFWICePbr7GXOGPranqS9Qxu2U/BZEcnnGbK1SFW8TxRyGp6O1L52xsbfOdqmzjc0t5ubhDrjj+Xpg==" + "resolved": "3.3.1", + "contentHash": "EI5Afqt03Kq4Wy5Ot6nGvnwunisM9ORi5L9fteCCOK1Wh283wAhM1dIOWOsBN3jlFbw1VTeVPR8oPz9J9xlHLw==" }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.7.1", - "contentHash": "FL+VpAC/nCCzj80MwX6L8gJD06u2m1SKcQQLAymDLFqNtgtI9h3J5n0mVN+s18qcMzybsmO9GK7rMuHYx11KMg==", + "resolved": "16.8.0", + "contentHash": "Y60IDgwinOqwECwmvXyFqk2lnQAvcS6EKevc3DyKUJoJaNJ9bUGsUS8H2nlgBHloSQ/Zqj27CjRuLhBsCUO58w==", "dependencies": { "NuGet.Frameworks": "5.0.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.7.1", - "contentHash": "mv7MnBDtqwQAjoH+AphE+Tu0dsF6x/c7Zs8umkb2McbvNALJdfBuWJQbiXGWqhNq7k8eMmnkNO6klJz4pkgekw==", + "resolved": "16.8.0", + "contentHash": "CVXKGIWakPq7UboAlJ7ukcngBFF2UaHwS9pAN3nLyOpOR3yUYbinpd+eVvz6Fm/qRBP4uiwx0lWEZlHOHG1c0w==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.7.1", + "Microsoft.TestPlatform.ObjectModel": "16.8.0", "Newtonsoft.Json": "9.0.1" } }, @@ -797,8 +721,36 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "12.0.2", - "contentHash": "rTK0s2EKlfHsQsH6Yx2smvcTCeyoDNgCW7FEYyV01drPlh2T243PR2DiDXqtC5N4GDm4Ma/lkxfW5a/4793vbA==" + "resolved": "10.0.1", + "contentHash": "ebWzW9j2nwxQeBo59As2TYn7nYr9BHicqqCwHOD1Vdo+50HBtLPuqdiCYJcLdTRknpYis/DSEOQz5KmZxwrIAg==", + "dependencies": { + "Microsoft.CSharp": "4.3.0", + "System.Collections": "4.3.0", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Dynamic.Runtime": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Runtime.Serialization.Formatters": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } }, "Newtonsoft.Json.Bson": { "type": "Transitive", @@ -991,33 +943,33 @@ }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "OVPI/nh5AqfLCIKhAYqjCa6AHhc7oKApGcGM3UhMRSerFiBx58nSpGwxVFdMgjOCWZR+fA49nzsnKlWp5hFo8w==", + "resolved": "2.0.4", + "contentHash": "f5U8Sw0lRym8tTraJ2zm6OqcDrcrEVvcKDtYlKSLs3Ox9SerkwkPXiFXb/uiW0g2tJdUw6oBhsxI/l5DoRxXMg==", "dependencies": { - "SQLitePCLRaw.core": "2.0.2", - "SQLitePCLRaw.lib.e_sqlite3": "2.0.2", - "SQLitePCLRaw.provider.dynamic_cdecl": "2.0.2" + "SQLitePCLRaw.core": "2.0.4", + "SQLitePCLRaw.lib.e_sqlite3": "2.0.4", + "SQLitePCLRaw.provider.dynamic_cdecl": "2.0.4" } }, "SQLitePCLRaw.core": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "TFSBX426OelS1tkaVC254NVVlrJIe9YLhWPkEvuqJj2104QpmDmEYOhfdfDJD1E/2SmqDhoRw1ek5cQHj8olcQ==", + "resolved": "2.0.4", + "contentHash": "4XlDZpDAsboMD6qZQcz9AaKblKDUTVHF+8f3lvbP7QjoqSRr2Xc0Lm34IK2pjRIYnyFLhI3yOJ5YWfOiCid2yg==", "dependencies": { "System.Memory": "4.5.3" } }, "SQLitePCLRaw.lib.e_sqlite3": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "S+Tsqe/M7wsc+9HeediI6UHtBKf2X586aRwhi1aBVLGe0WxkAo52O9ZxwEy/v8XMLefcrEMupd2e9CDlIT6QCw==" + "resolved": "2.0.4", + "contentHash": "oetvmtDZOE4Nnrtxd8Trapl9geBiu0rDCUXff46qGYjnUwzaU1mZ3OHnfR402tl32rx8gBWg3n5OBRaPJRbsGw==" }, "SQLitePCLRaw.provider.dynamic_cdecl": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "ZSwacbKJUsxJEZxwT23uZVrGbaIvXcADZDz5Sr66fikO5eehdcceDncjzwzTzWfW13di8gpTpstx3WJSt/Ci5Q==", + "resolved": "2.0.4", + "contentHash": "AY6+vv/4ji1mCkLrS6HP/88rHT9YFKRyg3LUj8RyIk6imJMUFdQDiP8rK8gq0a/0FbqspLjK1t7rtKcr7FXRYA==", "dependencies": { - "SQLitePCLRaw.core": "2.0.2" + "SQLitePCLRaw.core": "2.0.4" } }, "System.AppContext": { @@ -1069,8 +1021,8 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "1.7.1", - "contentHash": "B43Zsz5EfMwyEbnObwRxW5u85fzJma3lrDeGcSAV1qkhSRTNY5uXAByTn9h9ddNdhM+4/YoLc/CI43umjwIl9Q==" + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==" }, "System.Collections.NonGeneric": { "type": "Transitive", @@ -1109,8 +1061,8 @@ }, "System.ComponentModel.Annotations": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ==" + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" }, "System.ComponentModel.Primitives": { "type": "Transitive", @@ -1184,8 +1136,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.7.1", - "contentHash": "j81Lovt90PDAq8kLpaJfJKV/rWdWuEk6jfV+MBkee33vzYLEUsy4gXK8laa9V2nZlLM9VM9yA/OOQxxPEJKAMw==" + "resolved": "5.0.0", + "contentHash": "tCQTzPsGZh/A9LhhA6zrqCRV4hOHsK90/G7q3Khxmn6tnB1PuNU0cRaKANP2AWcF9bn0zsuOoZOSrHuJk6oNBA==" }, "System.Diagnostics.Tools": { "type": "Transitive", @@ -1362,8 +1314,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "4.7.3", - "contentHash": "zykThu9scJyg2Yeg27GMZCbjzniIsmjtNP5x6kQCd/8rEeKXRy20fP2NOMS7xQ+0pS/E85LZQA+K1aoQLxiUdw==" + "resolved": "5.0.0", + "contentHash": "irMYm3vhVgRsYvHTU5b2gsT2CwT/SMM6LZFzuJjpIvT5Z4CshxNsaoBC1X/LltwuR3Opp8d6jOS/60WwOb7Q2Q==" }, "System.Linq": { "type": "Transitive", @@ -1633,13 +1585,25 @@ "System.Runtime.Extensions": "4.3.0" } }, + "System.Runtime.Serialization.Formatters": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0" + } + }, "System.Runtime.Serialization.Primitives": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", + "resolved": "4.3.0", + "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", "dependencies": { - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0" + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" } }, "System.Security.Claims": { @@ -1835,11 +1799,6 @@ "System.Threading": "4.0.11" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" - }, "System.Text.RegularExpressions": { "type": "Transitive", "resolved": "4.3.0", @@ -2022,10 +1981,10 @@ "dependencies": { "AutoMapper": "10.1.1", "AutoMapper.Extensions.Microsoft.DependencyInjection": "8.1.0", - "Microsoft.AspNetCore.SpaServices.Extensions": "3.1.9", - "Microsoft.EntityFrameworkCore": "3.1.9", - "Microsoft.EntityFrameworkCore.Analyzers": "3.1.9", - "Microsoft.EntityFrameworkCore.Sqlite": "3.1.9", + "Microsoft.AspNetCore.SpaServices.Extensions": "5.0.0", + "Microsoft.EntityFrameworkCore": "5.0.0", + "Microsoft.EntityFrameworkCore.Analyzers": "5.0.0", + "Microsoft.EntityFrameworkCore.Sqlite": "5.0.0", "NSwag.AspNetCore": "13.8.2", "SixLabors.ImageSharp": "1.0.1", "System.IdentityModel.Tokens.Jwt": "6.8.0", diff --git a/BackEnd/Timeline/Timeline.csproj b/BackEnd/Timeline/Timeline.csproj index 5131cdb0..b6c6b4ba 100644 --- a/BackEnd/Timeline/Timeline.csproj +++ b/BackEnd/Timeline/Timeline.csproj @@ -1,12 +1,12 @@  - netcoreapp3.1 + net5.0 1f6fb74d-4277-4bc0-aeea-b1fc5ffb0b43 crupest false - 8.0 + 9.0 enable true @@ -27,7 +27,7 @@ PreserveNewest - + PreserveNewest @@ -35,15 +35,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/BackEnd/Timeline/packages.lock.json b/BackEnd/Timeline/packages.lock.json index ed92c672..36fdbcf2 100644 --- a/BackEnd/Timeline/packages.lock.json +++ b/BackEnd/Timeline/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - ".NETCoreApp,Version=v3.1": { + ".NETCoreApp,Version=v5.0": { "AutoMapper": { "type": "Direct", "requested": "[10.1.1, )", @@ -25,67 +25,64 @@ }, "Microsoft.AspNetCore.SpaServices.Extensions": { "type": "Direct", - "requested": "[3.1.9, )", - "resolved": "3.1.9", - "contentHash": "ciy2GCvRnh9C22laArLsaItS+72U6Hqf4nDYShdvFgcen2ZV+NNSitb/B3vsmFfIPM8m4mf2x4T+vZ6OlI5XaA==", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "mmnLfzxrpsK7YDrS6U2V3HhPSAA24iyRgIq7K6nK98tFeUMwSMDkuR9Ei67NRE1S6EN8J+CSfsoTyzvKBg/dRw==", "dependencies": { - "Microsoft.AspNetCore.SpaServices": "3.1.9", - "Microsoft.Extensions.FileProviders.Physical": "3.1.9" + "Microsoft.Extensions.FileProviders.Physical": "5.0.0" } }, "Microsoft.CodeAnalysis.FxCopAnalyzers": { "type": "Direct", - "requested": "[3.3.0, )", - "resolved": "3.3.0", - "contentHash": "k3Icqx8kc+NrHImuiB8Jc/wd32Xeyd2B/7HOR5Qu9pyKzXQ4ikPeBAwzG2FSTuYhyIuNWvwL5k9yYBbbVz6w9w==", + "requested": "[3.3.1, )", + "resolved": "3.3.1", + "contentHash": "O6L7wOD6dmytWZr4ulw6wLYk8QmsO/TlBHyWOB2OQKnUm31JGOXEncJjVm8Fw24BDzP22wfsleWFidiNU/DIsA==", "dependencies": { - "Microsoft.CodeAnalysis.VersionCheckAnalyzer": "[3.3.0]", - "Microsoft.CodeQuality.Analyzers": "[3.3.0]", - "Microsoft.NetCore.Analyzers": "[3.3.0]", - "Microsoft.NetFramework.Analyzers": "[3.3.0]" + "Microsoft.CodeAnalysis.VersionCheckAnalyzer": "[3.3.1]", + "Microsoft.CodeQuality.Analyzers": "[3.3.1]", + "Microsoft.NetCore.Analyzers": "[3.3.1]", + "Microsoft.NetFramework.Analyzers": "[3.3.1]" } }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[3.1.9, )", - "resolved": "3.1.9", - "contentHash": "u3A2W0BvAuAF2jgW+WX+C+Sh8sMGX5Kl1hdA0gu6A/XSrZQoW/BUP4a/q2n3iitDGndaorqjAKx+Spb9gBto+w==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Bcl.HashCode": "1.1.0", - "Microsoft.EntityFrameworkCore.Abstractions": "3.1.9", - "Microsoft.EntityFrameworkCore.Analyzers": "3.1.9", - "Microsoft.Extensions.Caching.Memory": "3.1.9", - "Microsoft.Extensions.DependencyInjection": "3.1.9", - "Microsoft.Extensions.Logging": "3.1.9", - "System.Collections.Immutable": "1.7.1", - "System.ComponentModel.Annotations": "4.7.0", - "System.Diagnostics.DiagnosticSource": "4.7.1" + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "QJk6pwN5wCriRdaNXQQxifeDNYephqqDMSXAQFX1nZjHwz/hChD0kDwklX20FexN9IAwQftepMbglcjwTX3l4Q==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Abstractions": "5.0.0", + "Microsoft.EntityFrameworkCore.Analyzers": "5.0.0", + "Microsoft.Extensions.Caching.Memory": "5.0.0", + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "System.Collections.Immutable": "5.0.0", + "System.ComponentModel.Annotations": "5.0.0", + "System.Diagnostics.DiagnosticSource": "5.0.0" } }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Direct", - "requested": "[3.1.9, )", - "resolved": "3.1.9", - "contentHash": "eXGyx/Lb1fiiKtnIStdxGrfBSSQg8oZytE10f1T/2xAx12W9dKB9U9fg05cwNCDC0S2CXILsmZHYaGqCSXVAqQ==" + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "l1c/1ge8ymXgLqtstTyX3PZOLRuFo1jn0FQ9H4ag3Bwz70KTMyEOXwkKBZZ1gDlCibETrooflMis8wvvXFh5YQ==" }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[3.1.9, )", - "resolved": "3.1.9", - "contentHash": "sMFCWv/1UcsFQZeGQcbfPbEZKZ1oKZqWZXTbc7PEZVMIXu82nbavstdNQ84x5IBXJkxl8iW3zjChb/FRBr5uLQ==", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "xlpmIN768QlG1f0yzPQvqxfV+r7oIwid/ohosCdNeIf9MolAX97Bi517EQEL+AEU9cJaUx2GBrS3boWCNfe5tg==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "3.1.9", - "SQLitePCLRaw.bundle_e_sqlite3": "2.0.2" + "Microsoft.EntityFrameworkCore.Sqlite.Core": "5.0.0", + "SQLitePCLRaw.bundle_e_sqlite3": "2.0.4" } }, "Microsoft.EntityFrameworkCore.Tools": { "type": "Direct", - "requested": "[3.1.9, )", - "resolved": "3.1.9", - "contentHash": "mSgwjp0h5iqW5V49SVijR5O+kNpI1nitcbN12n9FYx/Ga6oCEFwXR/llBDesD6ASHw3Mx16vodJYJ7CEBx5rig==", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "HSV7DLFMImkOuhnExianO/Csn1O/6s7h1kQxPFDa6zgfCQI09fyh7zzJoJ3KQiMUnajBBfYkEE9GtK7FoyeHOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Design": "3.1.9" + "Microsoft.EntityFrameworkCore.Design": "5.0.0" } }, "NSwag.AspNetCore": { @@ -123,6 +120,11 @@ "Microsoft.IdentityModel.Tokens": "6.8.0" } }, + "Humanizer.Core": { + "type": "Transitive", + "resolved": "2.8.26", + "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A==" + }, "Microsoft.AspNetCore.Authorization": { "type": "Transitive", "resolved": "1.0.3", @@ -279,15 +281,6 @@ "Microsoft.AspNetCore.Mvc.Core": "1.0.4" } }, - "Microsoft.AspNetCore.NodeServices": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "bbd3FlSPWiRQrIcBLa5TaOvo4gjmmiNMkxA8VmZ6u0eIpS0Yj35/eTopaGdtzqwlqj5jXbdRoib1MruXuPaW8A==", - "dependencies": { - "Microsoft.Extensions.Logging.Console": "3.1.9", - "Newtonsoft.Json": "12.0.2" - } - }, "Microsoft.AspNetCore.Routing": { "type": "Transitive", "resolved": "1.0.4", @@ -313,14 +306,6 @@ "System.Threading.Tasks": "4.0.11" } }, - "Microsoft.AspNetCore.SpaServices": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "Fb+N2ZyF1wNrGeWggT+Ovv6W8AAVxfi4V/SnuEsBOR+nmkFhty9zyh6IDRRS98GJK6OE3adqqPbWMtJqbxYnNA==", - "dependencies": { - "Microsoft.AspNetCore.NodeServices": "3.1.9" - } - }, "Microsoft.AspNetCore.StaticFiles": { "type": "Transitive", "resolved": "1.0.4", @@ -346,25 +331,15 @@ "System.Text.Encodings.Web": "4.0.1" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "J2G1k+u5unBV+aYcwxo94ip16Rkp65pgWFb0R6zwJipzWNMgvqlWeuI7/+R+e8bob66LnSG+llLJ+z8wI94cHg==" - }, "Microsoft.CodeAnalysis.VersionCheckAnalyzer": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "xjLM3DRFZMan3nQyBQEM1mBw6VqQybi4iMJhMFW6Ic1E1GCvqJR3ABOwEL7WtQjDUzxyrGld9bASnAos7G/Xyg==" + "resolved": "3.3.1", + "contentHash": "ZUMf70abtWvwevkLFOlEHDck81oZCsi9jBHODDSSH2YPQdtCKzeQfaWWnAmn2ii7N3Q2V2arOj4Mu8ZTTSs3PA==" }, "Microsoft.CodeQuality.Analyzers": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "zZ3miq6u22UFQKhfJyLnVEJ+DgeOopLh3eKJnKAcOetPP2hiv3wa7kHZlBDeTvtqJQiAQhAVbttket8XxjN1zw==" + "resolved": "3.3.1", + "contentHash": "h6o+zBUf47OFarRQn6LjwUNFvRUyUWLWcnunw6vLCxSDBmgPDQCsrsWpEtMz/+NKBvOeikVJobscarx3Wgtbiw==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -373,10 +348,10 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "+u4PeT1npi2EzhxGc5r1Z2z73zuXw+TlKVZm44WQhNCUw4LtUVDaxGSpUhrjW+X4snBCBfr4kT/uJyKnL4R4og==", + "resolved": "5.0.0", + "contentHash": "O1PBB9Y9bU9Fb3FkewqeXzVJ3hI2DW9DtRGj7lGkT1FnP1B3kqjn3xpG2AaVzkv2MkzzKHNJAh+LQq3XaFcAMw==", "dependencies": { - "SQLitePCLRaw.core": "2.0.2" + "SQLitePCLRaw.core": "2.0.4" } }, "Microsoft.DotNet.PlatformAbstractions": { @@ -386,35 +361,37 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "IR6Y4RJVlw0QXdWXjF3Kx9s1QLiicJus+BFBKr43lBtriV20j3yrWMoaZ9W1AUUgnicZXpXVcNfklqtmwb9Sxw==" + "resolved": "5.0.0", + "contentHash": "PCDiskNvB+1rs+d3ET0Itm3mPj6+CpFO7V1nPXfVL6ipS6+27vKs9mnEP4C8vTr2BhSpyvKQetp4Z0ktrqv+wg==" }, "Microsoft.EntityFrameworkCore.Design": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "2zgP7BWcw5nqGQiT4bEtiI6ras+4pvKg5D+tA3AYvjEifzzaWvmRTb3B9nRHpIYJAhPtmWNBVnVXLbu3fS1OYA==", + "resolved": "5.0.0", + "contentHash": "kyd66aJDTZjpo4awTpJb6BOVGnhS/pZgD3O2JH1A9QhtE+0kqEVXJLpNN9CPfbKWERipXAEUyUadPHNclZCc3g==", "dependencies": { + "Humanizer.Core": "2.8.26", "Microsoft.CSharp": "4.7.0", - "Microsoft.EntityFrameworkCore.Relational": "3.1.9" + "Microsoft.EntityFrameworkCore.Relational": "5.0.0" } }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "7fhWuSfrCYlv/hvOX5OhbFJF/G9f8sifqTrJiYnAYLDOvNizwv7t9tFPD8JwaF3zM2S54O5/Vni2NxvwzSaW2w==", + "resolved": "5.0.0", + "contentHash": "UMhoo0t3eii73AUwsvbGpYMGXS0ga/uA/cukgJza+IJ4EtcuNfdhGsA3emzf9nYpQ7urJzWzU6VOfG59h935Ag==", "dependencies": { - "Microsoft.EntityFrameworkCore": "3.1.9" + "Microsoft.EntityFrameworkCore": "5.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "5.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "Da6h8LdpJwKc1az9DMWt2Mt6gHXPRZqwiumV1Zx0AuM3EThyokVDzBGy2sti0AcBhcQMLJHPEr5R9xuiWvaYYQ==", + "resolved": "5.0.0", + "contentHash": "S5R5FvZ2ZDtHRHdPgHhz3JJqpzui1aGrFCUzelBFlPqiR7KO06Ew18X9KlK0Ur5hv4zuJ9hbXXBAgnuHf3aTHQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "3.1.9", + "Microsoft.Data.Sqlite.Core": "5.0.0", "Microsoft.DotNet.PlatformAbstractions": "3.1.6", - "Microsoft.EntityFrameworkCore.Relational": "3.1.9", - "Microsoft.Extensions.DependencyModel": "3.1.6" + "Microsoft.EntityFrameworkCore.Relational": "5.0.0", + "Microsoft.Extensions.DependencyModel": "5.0.0" } }, "Microsoft.Extensions.ApiDescription.Server": { @@ -424,74 +401,56 @@ }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "/2QsPAsUZD4qvftZkUKHRRRryPDXWh606/iNXPLrulwHLMr9JNsKBJWVqylT3qU92nJok5VoqSblkY9mSyxFyg==", + "resolved": "5.0.0", + "contentHash": "bu8As90/SBAouMZ6fJ+qRNo1X+KgHGrVueFhhYi+E5WqEhcnp2HoWRFnMzXQ6g4RdZbvPowFerSbKNH4Dtg5yg==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.1.9" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "/JrVMVetX/kpJQUIlJ6NLQ3zbF0yyryXpo4+uFCqYIUZzgmWk8DS/zSKcyj1tQ3410+vhDEAPngxC+hg0IlJeg==", + "resolved": "5.0.0", + "contentHash": "/1qPCleFOkJe0O+xmFqCNLFYQZTJz965sVw8CUB/BQgsApBwzAUsL2BUkDvQW+geRUVTXUS9zLa0pBjC2VJ1gA==", "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "3.1.9", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", - "Microsoft.Extensions.Logging.Abstractions": "3.1.9", - "Microsoft.Extensions.Options": "3.1.9" - } - }, - "Microsoft.Extensions.Configuration": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "lqdkOGNeTMKG981Q7yWGlRiFbIlsRwTlMMiybT+WOzUCFBS/wc25tZgh7Wm/uRoBbWefgvokzmnea7ZjmFedmA==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.9" + "Microsoft.Extensions.Caching.Abstractions": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "vOJxPKczaHpXeZFrxARxYwsEulhEouXc5aZGgMdkhV/iEXX9/pfjqKk76rTG+4CsJjHV+G/4eMhvOIaQMHENNA==", + "resolved": "5.0.0", + "contentHash": "ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.1.9" - } - }, - "Microsoft.Extensions.Configuration.Binder": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "BG6HcT7tARYakftqfQu+cLksgIWG1NdxMY+igI12hdZrUK+WjS973NiRyuao/U9yyTeM9NPwRnC61hCmG3G3jg==", - "dependencies": { - "Microsoft.Extensions.Configuration": "3.1.9" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "ORqfrAACcvTInie1oGola5uky344/PiNfgayTPuZWV4WnSfIQZJQm/ZLpGshJE3h7TqwYaYElGazK/yaM2bFLA==", + "resolved": "5.0.0", + "contentHash": "Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9" + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "8PkcaPwiTPOhqshoY4+rQUbz86X6YpLDLUqXOezh7L2A3pgpBmeBBByYIffofBlvQxDdQ0zB2DkWjbZWyCxRWg==" + "resolved": "5.0.0", + "contentHash": "ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==" }, "Microsoft.Extensions.DependencyModel": { "type": "Transitive", - "resolved": "3.1.6", - "contentHash": "/UlDKULIVkLQYn1BaHcy/rc91ApDxJb7T75HcCbGdqwvxhnRQRKM2di1E70iCPMF9zsr6f4EgQTotBGxFIfXmw==", - "dependencies": { - "System.Text.Json": "4.7.2" - } + "resolved": "5.0.0", + "contentHash": "umBECCoMC+sOUgm083yFr8SxTobUOcPFH4AXigdO2xJiszCHAnmeDl4qPphJt+oaJ/XIfV1wOjIts2nRnki61Q==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "Q4SGwEFZKiZbpzPgdGbQUULxtcH1zXMOwCPKSm6QwVcOCGshf3QLfBh+O/GyFH4B0RfZ16nKyeW1mMONlRyjUw==", + "resolved": "5.0.0", + "contentHash": "iuZIiZ3mteEb+nsUqpGXKx2cGF+cv6gWPd5jqQI4hzqdiJ6I94ddLjKhQOuRW1lueHwocIw30xbSHGhQj0zjdQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.1.9" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.FileProviders.Embedded": { @@ -505,52 +464,34 @@ }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "HWDSsblTCQp7EEJJmnLzttIhFGzDu+DGqBbOvGCdFT0+pkCuBkn3EiWpEEcm5WMTO5njmsbLSK9ZuUUf2zPsFg==", + "resolved": "5.0.0", + "contentHash": "1rkd8UO2qf21biwO7X0hL9uHP7vtfmdv/NLvKgCRHkdz1XnW8zVQJXyEYiN68WYpExgtVWn55QF0qBzgfh1mGg==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "3.1.9", - "Microsoft.Extensions.FileSystemGlobbing": "3.1.9" + "Microsoft.Extensions.FileProviders.Abstractions": "5.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "5bnewG1aBiSESPNwcXGIxDDRN95uqdy+fqZZ8Z63Et5rRNlAwAfXHOrg+FTht7UjHobjvtjzquMCbAWhWEPHIw==" + "resolved": "5.0.0", + "contentHash": "ArliS8lGk8sWRtrWpqI8yUVYJpRruPjCDT+EIjrgkA/AAPRctlAkRISVZ334chAKktTLzD1+PK8F5IZpGedSqA==" }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "+V3i0jCQCO6IIOf6e+fL0SqrZd2x/Krug9EEL1JHa9R03RsbEpltCtjVY5hxedyuyuQKwvLoR12sCfu/9XEUAw==", + "resolved": "5.0.0", + "contentHash": "MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", "dependencies": { - "Microsoft.Extensions.Configuration.Binder": "3.1.9", - "Microsoft.Extensions.DependencyInjection": "3.1.9", - "Microsoft.Extensions.Logging.Abstractions": "3.1.9", - "Microsoft.Extensions.Options": "3.1.9" + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "W5fbF8qVR9SMVVJqDQLIR7meWbev6Pu/lbrm7LDNr4Sp7HOotr4k2UULTdFSXOi5aoDdkQZpWnq0ZSpjrR3tjg==" - }, - "Microsoft.Extensions.Logging.Configuration": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "hv6XsGgikrbkolBJdF1usl9R/nrliC5mifMqHMEY9zWcCLwNkXMJiS8p0lbosrnpVAMi4PbNx39DB51Dqscd0w==", - "dependencies": { - "Microsoft.Extensions.Logging": "3.1.9", - "Microsoft.Extensions.Options.ConfigurationExtensions": "3.1.9" - } - }, - "Microsoft.Extensions.Logging.Console": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "8Dusl1rkDivmvLrwj6QAo917xMHPiDBzG3IG3agiyDdtsC/fRp+1VN5iIN+O09PtEaMged2OLA6wCDwfSTSTZw==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.9", - "Microsoft.Extensions.Logging": "3.1.9", - "Microsoft.Extensions.Logging.Configuration": "3.1.9" - } + "resolved": "5.0.0", + "contentHash": "NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==" }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", @@ -565,22 +506,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "EIb3G1DL+Rl9MvJR7LjI1wCy2nfTN4y8MflbOftn1HLYQBj/Rwl8kUbGTrSFE01c99Wm4ETjWVsjqKcpFvhPng==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", - "Microsoft.Extensions.Primitives": "3.1.9" - } - }, - "Microsoft.Extensions.Options.ConfigurationExtensions": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "u5jh7RW+Ev81YqK1ZoBG0lftp2MA9xqXiTiRL46XzaPj2ScNUyiVbzcVY0fPbE27UOpT2hj+yPzRSOMIIo55UA==", + "resolved": "5.0.0", + "contentHash": "CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.9", - "Microsoft.Extensions.Configuration.Binder": "3.1.9", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", - "Microsoft.Extensions.Options": "3.1.9" + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.PlatformAbstractions": { @@ -598,8 +528,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "IrHecH0eGG7/XoeEtv++oLg/sJHRNyeCqlA9RhAo6ig4GpOTjtDr32sBMYuuLtUq8ALahneWkrOzoBAwJ4L4iA==" + "resolved": "5.0.0", + "contentHash": "cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==" }, "Microsoft.Extensions.WebEncoders": { "type": "Transitive", @@ -651,8 +581,8 @@ }, "Microsoft.NetCore.Analyzers": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "6qptTHUu1Wfszuf83NhU0IoAb4j7YWOpJs6oc6S4G/nI6aGGWKH/Xi5Vs9L/8lrI74ijEEzPcIwafSQW5ASHtA==" + "resolved": "3.3.1", + "contentHash": "8Ez3EImhFioAsB4bR2bBLA3Pkcz8K/VI6jPdnm98nLu+rodZU8s8QRjRnkrQEnC6VcVAVZJ8W7DL9yrfDsgjqQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -666,8 +596,8 @@ }, "Microsoft.NetFramework.Analyzers": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "JTfMic5fEFWICePbr7GXOGPranqS9Qxu2U/BZEcnnGbK1SFW8TxRyGp6O1L52xsbfOdqmzjc0t5ubhDrjj+Xpg==" + "resolved": "3.3.1", + "contentHash": "EI5Afqt03Kq4Wy5Ot6nGvnwunisM9ORi5L9fteCCOK1Wh283wAhM1dIOWOsBN3jlFbw1VTeVPR8oPz9J9xlHLw==" }, "Microsoft.Win32.Primitives": { "type": "Transitive", @@ -689,8 +619,32 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "12.0.2", - "contentHash": "rTK0s2EKlfHsQsH6Yx2smvcTCeyoDNgCW7FEYyV01drPlh2T243PR2DiDXqtC5N4GDm4Ma/lkxfW5a/4793vbA==" + "resolved": "9.0.1", + "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", + "dependencies": { + "Microsoft.CSharp": "4.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Dynamic.Runtime": "4.0.11", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Linq": "4.1.0", + "System.Linq.Expressions": "4.1.0", + "System.ObjectModel": "4.0.12", + "System.Reflection": "4.1.0", + "System.Reflection.Extensions": "4.0.1", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Text.Encoding": "4.0.11", + "System.Text.Encoding.Extensions": "4.0.11", + "System.Text.RegularExpressions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "System.Xml.ReaderWriter": "4.0.11", + "System.Xml.XDocument": "4.0.11" + } }, "NJsonSchema": { "type": "Transitive", @@ -766,33 +720,33 @@ }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "OVPI/nh5AqfLCIKhAYqjCa6AHhc7oKApGcGM3UhMRSerFiBx58nSpGwxVFdMgjOCWZR+fA49nzsnKlWp5hFo8w==", + "resolved": "2.0.4", + "contentHash": "f5U8Sw0lRym8tTraJ2zm6OqcDrcrEVvcKDtYlKSLs3Ox9SerkwkPXiFXb/uiW0g2tJdUw6oBhsxI/l5DoRxXMg==", "dependencies": { - "SQLitePCLRaw.core": "2.0.2", - "SQLitePCLRaw.lib.e_sqlite3": "2.0.2", - "SQLitePCLRaw.provider.dynamic_cdecl": "2.0.2" + "SQLitePCLRaw.core": "2.0.4", + "SQLitePCLRaw.lib.e_sqlite3": "2.0.4", + "SQLitePCLRaw.provider.dynamic_cdecl": "2.0.4" } }, "SQLitePCLRaw.core": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "TFSBX426OelS1tkaVC254NVVlrJIe9YLhWPkEvuqJj2104QpmDmEYOhfdfDJD1E/2SmqDhoRw1ek5cQHj8olcQ==", + "resolved": "2.0.4", + "contentHash": "4XlDZpDAsboMD6qZQcz9AaKblKDUTVHF+8f3lvbP7QjoqSRr2Xc0Lm34IK2pjRIYnyFLhI3yOJ5YWfOiCid2yg==", "dependencies": { "System.Memory": "4.5.3" } }, "SQLitePCLRaw.lib.e_sqlite3": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "S+Tsqe/M7wsc+9HeediI6UHtBKf2X586aRwhi1aBVLGe0WxkAo52O9ZxwEy/v8XMLefcrEMupd2e9CDlIT6QCw==" + "resolved": "2.0.4", + "contentHash": "oetvmtDZOE4Nnrtxd8Trapl9geBiu0rDCUXff46qGYjnUwzaU1mZ3OHnfR402tl32rx8gBWg3n5OBRaPJRbsGw==" }, "SQLitePCLRaw.provider.dynamic_cdecl": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "ZSwacbKJUsxJEZxwT23uZVrGbaIvXcADZDz5Sr66fikO5eehdcceDncjzwzTzWfW13di8gpTpstx3WJSt/Ci5Q==", + "resolved": "2.0.4", + "contentHash": "AY6+vv/4ji1mCkLrS6HP/88rHT9YFKRyg3LUj8RyIk6imJMUFdQDiP8rK8gq0a/0FbqspLjK1t7rtKcr7FXRYA==", "dependencies": { - "SQLitePCLRaw.core": "2.0.2" + "SQLitePCLRaw.core": "2.0.4" } }, "System.AppContext": { @@ -844,8 +798,8 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "1.7.1", - "contentHash": "B43Zsz5EfMwyEbnObwRxW5u85fzJma3lrDeGcSAV1qkhSRTNY5uXAByTn9h9ddNdhM+4/YoLc/CI43umjwIl9Q==" + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==" }, "System.Collections.NonGeneric": { "type": "Transitive", @@ -884,8 +838,8 @@ }, "System.ComponentModel.Annotations": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ==" + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" }, "System.ComponentModel.Primitives": { "type": "Transitive", @@ -939,8 +893,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.7.1", - "contentHash": "j81Lovt90PDAq8kLpaJfJKV/rWdWuEk6jfV+MBkee33vzYLEUsy4gXK8laa9V2nZlLM9VM9yA/OOQxxPEJKAMw==" + "resolved": "5.0.0", + "contentHash": "tCQTzPsGZh/A9LhhA6zrqCRV4hOHsK90/G7q3Khxmn6tnB1PuNU0cRaKANP2AWcF9bn0zsuOoZOSrHuJk6oNBA==" }, "System.Diagnostics.Tools": { "type": "Transitive", @@ -962,6 +916,28 @@ "System.Runtime": "4.1.0" } }, + "System.Dynamic.Runtime": { + "type": "Transitive", + "resolved": "4.0.11", + "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Linq": "4.1.0", + "System.Linq.Expressions": "4.1.0", + "System.ObjectModel": "4.0.12", + "System.Reflection": "4.1.0", + "System.Reflection.Emit": "4.0.1", + "System.Reflection.Emit.ILGeneration": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" + } + }, "System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1435,11 +1411,6 @@ "System.Threading": "4.0.11" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" - }, "System.Text.RegularExpressions": { "type": "Transitive", "resolved": "4.1.0", diff --git a/Dockerfile b/Dockerfile index b602cba0..14b2d99b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,13 @@ WORKDIR /timeline-app COPY FrontEnd . RUN yarn && yarn build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS back-build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS back-build WORKDIR /timeline-app 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/core/aspnet:3.1 +FROM mcr.microsoft.com/dotnet/aspnet:5.0 WORKDIR /app ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED true COPY --from=back-build /timeline-app/Timeline/publish . -- cgit v1.2.3