From c4d4030856198506a95371bcba8a58cd2a025840 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Mon, 27 Nov 2023 17:01:33 +0100 Subject: [PATCH] update to .net8, efcore8; etc... --- TIAM.Core/TIAM.Core.csproj | 2 +- TIAM.Database.Test/TIAM.Database.Test.csproj | 39 ++++++++++--------- TIAM.Database.Test/UserDalTests.cs | 28 +++++++------ TIAM.Database/DataLayers/Users/UserDal.cs | 2 +- TIAM.Database/TIAM.Database.csproj | 22 +++++------ .../TIAM.Entities.Server.csproj | 2 +- TIAM.Entities/TIAM.Entities.csproj | 14 +++---- TIAMDLL.Common/TIAMDLL.Common.csproj | 2 +- TIAMMobileApp/TIAMMobileApp.csproj | 16 ++++---- TIAMSharedRazor/TIAMSharedRazor.csproj | 2 +- TIAMSharedUI/TIAMSharedUI.csproj | 10 ++--- TIAMWebApp/Client/TIAMWebApp.Client.csproj | 12 +++--- TIAMWebApp/Server/TIAMWebApp.Server.csproj | 24 ++++++------ .../TIAMWebApp.Shared.Application.csproj | 18 ++++----- 14 files changed, 100 insertions(+), 93 deletions(-) diff --git a/TIAM.Core/TIAM.Core.csproj b/TIAM.Core/TIAM.Core.csproj index cfadb03d..30402ac0 100644 --- a/TIAM.Core/TIAM.Core.csproj +++ b/TIAM.Core/TIAM.Core.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj index fbc415e1..8620cc03 100644 --- a/TIAM.Database.Test/TIAM.Database.Test.csproj +++ b/TIAM.Database.Test/TIAM.Database.Test.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -10,15 +10,18 @@ - - - - - + + + + + - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -29,31 +32,31 @@ - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll - ..\..\AyCode.Core\AyCode.Database.Tests\bin\Debug\net7.0\AyCode.Core.Tests.dll + ..\..\AyCode.Core\AyCode.Database.Tests\bin\Debug\net8.0\AyCode.Core.Tests.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Database.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Database.dll - ..\..\AyCode.Core\AyCode.Database.Tests\bin\Debug\net7.0\AyCode.Database.Tests.dll + ..\..\AyCode.Core\AyCode.Database.Tests\bin\Debug\net8.0\AyCode.Database.Tests.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs index c2c760b6..d10a1d52 100644 --- a/TIAM.Database.Test/UserDalTests.cs +++ b/TIAM.Database.Test/UserDalTests.cs @@ -1,5 +1,7 @@ using AyCode.Database.Tests; using Microsoft.EntityFrameworkCore; +using Microsoft.VisualStudio.TestPlatform.ObjectModel; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using TIAM.Database.DataLayers.Users; using TIAM.Database.DbContexts; @@ -29,10 +31,10 @@ namespace TIAM.Database.Test } [TestMethod] - public async Task GetUserByEmailAsync_ReturnsUser_WhenUserExists() + [DataRow("test@tiam.hu")] + public async Task GetUserByEmailAsync_ReturnsUser_WhenUserExists(string email) { // Arrange - var email = "test@tiam.hu"; var user = new User { Email = email }; var users = new[] { user }.AsQueryable(); @@ -53,10 +55,10 @@ namespace TIAM.Database.Test } [TestMethod] - public async Task GetUserByEmailAsync_ReturnsNull_WhenUserDoesNotExist() + [DataRow("test@test.hu")] + public async Task GetUserByEmailAsync_ReturnsNull_WhenUserDoesNotExist(string email) { // Arrange - var email = "test@test.hu"; var users = new User[0].AsQueryable(); var mockSet = new Mock>(); @@ -75,15 +77,16 @@ namespace TIAM.Database.Test } [TestMethod] - public async Task CreateUserAsync_ShouldReturnTrue_WhenUserIsCreated() + [DataRow("test@test.com", "+1234567890", "password")] + public async Task CreateUserAsync_ShouldReturnTrue_WhenUserIsCreated(string email, string phoneNumbr, string password) { // Arrange var user = new User { Id = Guid.NewGuid(), - Email = "test@test.com", - PhoneNumber = "+1234567890", - Password = "password" + Email = email, + PhoneNumber = phoneNumbr, + Password = password }; var mockSet = new Mock>(); @@ -102,21 +105,22 @@ namespace TIAM.Database.Test } [TestMethod] - public async Task UpdateUserAsync_ShouldUpdateUser() + [DataRow("test@test.com", "+1234567890", "password")] + public async Task UpdateUserAsync_ShouldUpdateUser(string email, string phoneNumbr, string password) { // Arrange - var user = new User { Email = "test@test.com", PhoneNumber = "+1234567890", Password = "password" }; + var user = new User(Guid.NewGuid(), email, phoneNumbr, password); _mockContext.Object.Users.Add(user); await _mockContext.Object.SaveChangesAsync(); // Act - user.Email = "updated@test.com"; + user.Email = email; var result = await _userDal.UpdateUserAsync(user); // Assert Assert.IsTrue(result); var updatedUser = _mockContext.Object.Users.Single(u => u.Email == user.Email); - Assert.AreEqual("updated@test.com", updatedUser.Email); + Assert.AreEqual(email, updatedUser.Email); } } } \ No newline at end of file diff --git a/TIAM.Database/DataLayers/Users/UserDal.cs b/TIAM.Database/DataLayers/Users/UserDal.cs index 7542d9dd..6133e60a 100644 --- a/TIAM.Database/DataLayers/Users/UserDal.cs +++ b/TIAM.Database/DataLayers/Users/UserDal.cs @@ -74,7 +74,7 @@ namespace TIAM.Database.DataLayers.Users var existingUser = Ctx.Users.FirstOrDefault(u => u.Email == user.Email); if (existingUser != null) { - user.Modified = DateTime.UtcNow; + //user.Modified = DateTime.UtcNow; //ezt nem kell megadni, a háttérben ezt magától megcsinálja a DbContextBase - J. existingUser = user; Ctx.Users.Update(existingUser); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0); diff --git a/TIAM.Database/TIAM.Database.csproj b/TIAM.Database/TIAM.Database.csproj index 58f5ee9b..5da5f98c 100644 --- a/TIAM.Database/TIAM.Database.csproj +++ b/TIAM.Database/TIAM.Database.csproj @@ -1,15 +1,15 @@ - net7.0 + net8.0 enable enable - - - + + + @@ -23,25 +23,25 @@ - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Database.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Database.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll diff --git a/TIAM.Entities.Server/TIAM.Entities.Server.csproj b/TIAM.Entities.Server/TIAM.Entities.Server.csproj index cfadb03d..30402ac0 100644 --- a/TIAM.Entities.Server/TIAM.Entities.Server.csproj +++ b/TIAM.Entities.Server/TIAM.Entities.Server.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/TIAM.Entities/TIAM.Entities.csproj b/TIAM.Entities/TIAM.Entities.csproj index b78d3f14..3e927349 100644 --- a/TIAM.Entities/TIAM.Entities.csproj +++ b/TIAM.Entities/TIAM.Entities.csproj @@ -1,29 +1,29 @@ - net7.0 + net8.0 enable enable - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.Server.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll diff --git a/TIAMDLL.Common/TIAMDLL.Common.csproj b/TIAMDLL.Common/TIAMDLL.Common.csproj index cfadb03d..30402ac0 100644 --- a/TIAMDLL.Common/TIAMDLL.Common.csproj +++ b/TIAMDLL.Common/TIAMDLL.Common.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj index b0277669..8a9787f2 100644 --- a/TIAMMobileApp/TIAMMobileApp.csproj +++ b/TIAMMobileApp/TIAMMobileApp.csproj @@ -1,10 +1,10 @@  - net7.0-android;net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 + net8.0-maccatalyst;net8.0-android;net8.0-ios + $(TargetFrameworks);net8.0-windows10.0.19041.0 - + Exe TIAMMobileApp true @@ -50,7 +50,7 @@ - + @@ -61,18 +61,18 @@ - + - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll diff --git a/TIAMSharedRazor/TIAMSharedRazor.csproj b/TIAMSharedRazor/TIAMSharedRazor.csproj index b2ff6b06..d4d84fd9 100644 --- a/TIAMSharedRazor/TIAMSharedRazor.csproj +++ b/TIAMSharedRazor/TIAMSharedRazor.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable true diff --git a/TIAMSharedUI/TIAMSharedUI.csproj b/TIAMSharedUI/TIAMSharedUI.csproj index e1e1538c..74c969b2 100644 --- a/TIAMSharedUI/TIAMSharedUI.csproj +++ b/TIAMSharedUI/TIAMSharedUI.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -13,7 +13,7 @@ - + @@ -24,13 +24,13 @@ - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll diff --git a/TIAMWebApp/Client/TIAMWebApp.Client.csproj b/TIAMWebApp/Client/TIAMWebApp.Client.csproj index 5fe4e044..b1d2a0c3 100644 --- a/TIAMWebApp/Client/TIAMWebApp.Client.csproj +++ b/TIAMWebApp/Client/TIAMWebApp.Client.csproj @@ -1,15 +1,15 @@ - net7.0 + net8.0 enable enable - - + + @@ -19,13 +19,13 @@ - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj index 8e1b5f8f..e8891ee2 100644 --- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj +++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj @@ -1,16 +1,16 @@  - net7.0 + net8.0 enable enable - - - + + + @@ -28,28 +28,28 @@ - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.Server.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Database.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Database.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.Server.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.Server.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll - ..\..\..\AyCode.Core\AyCode.Utils\bin\Debug\net7.0\AyCode.Utils.dll + ..\..\..\AyCode.Core\AyCode.Utils\bin\Debug\net8.0\AyCode.Utils.dll diff --git a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj index 16aad7a3..10d009b8 100644 --- a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj +++ b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable @@ -16,8 +16,8 @@ - - + + @@ -28,22 +28,22 @@ - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Core.Server.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Core.Server.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Entities.Server.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Entities.Server.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.dll - ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net7.0\AyCode.Interfaces.Server.dll + ..\..\..\AyCode.Core\AyCode.Database\bin\Debug\net8.0\AyCode.Interfaces.Server.dll