From b409d1f2c5620a844c9480ce079d7092bd65a2bd Mon Sep 17 00:00:00 2001 From: Kibnet Philosoff Date: Wed, 13 Mar 2024 16:00:13 +0300 Subject: [PATCH 1/4] =?UTF-8?q?refs:=20=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F?= =?UTF-8?q?=D1=82=D1=8B=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D1=84?= =?UTF-8?q?=D1=80=D0=B5=D0=B9=D0=BC=D0=B2=D0=BE=D1=80=D0=BA=D0=B0=20=D0=B2?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=D1=85=20=D0=B4?= =?UTF-8?q?=D0=BE=20net8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Unlimotion.Interface/Unlimotion.Interface.csproj | 2 +- src/Unlimotion.Server.Domain/Unlimotion.Server.Domain.csproj | 2 +- .../Unlimotion.Server.ServiceInterface.csproj | 2 +- .../Unlimotion.Server.ServiceModel.csproj | 2 +- src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Unlimotion.Interface/Unlimotion.Interface.csproj b/src/Unlimotion.Interface/Unlimotion.Interface.csproj index 3e8fef7..007b7e3 100644 --- a/src/Unlimotion.Interface/Unlimotion.Interface.csproj +++ b/src/Unlimotion.Interface/Unlimotion.Interface.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net8.0 latest diff --git a/src/Unlimotion.Server.Domain/Unlimotion.Server.Domain.csproj b/src/Unlimotion.Server.Domain/Unlimotion.Server.Domain.csproj index 8be854f..7f49d8a 100644 --- a/src/Unlimotion.Server.Domain/Unlimotion.Server.Domain.csproj +++ b/src/Unlimotion.Server.Domain/Unlimotion.Server.Domain.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net8.0 latest diff --git a/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj b/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj index 03d5580..4966ce8 100644 --- a/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj +++ b/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net8.0 latest diff --git a/src/Unlimotion.Server.ServiceModel/Unlimotion.Server.ServiceModel.csproj b/src/Unlimotion.Server.ServiceModel/Unlimotion.Server.ServiceModel.csproj index 37e2d1c..0149084 100644 --- a/src/Unlimotion.Server.ServiceModel/Unlimotion.Server.ServiceModel.csproj +++ b/src/Unlimotion.Server.ServiceModel/Unlimotion.Server.ServiceModel.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net8.0 latest diff --git a/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj b/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj index cf32367..1a6279e 100644 --- a/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj +++ b/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net8.0 latest From 7502165ff5bfa7dbc13572ff27099eddcd7da064 Mon Sep 17 00:00:00 2001 From: Kibnet Philosoff Date: Wed, 13 Mar 2024 16:15:27 +0300 Subject: [PATCH 2/4] =?UTF-8?q?test:=20=D0=9D=D0=B5=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=BB=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Unlimotion.Server.Test/UnitTest1.cs | 11 --------- .../Unlimotion.Server.Test.csproj | 23 ------------------ src/Unlimotion.Test/UnitTest1.cs | 24 +++++++------------ src/Unlimotion.Test/Unlimotion.Test.csproj | 11 ++++----- src/Unlimotion.sln | 8 +------ 5 files changed, 15 insertions(+), 62 deletions(-) delete mode 100644 src/Unlimotion.Server.Test/UnitTest1.cs delete mode 100644 src/Unlimotion.Server.Test/Unlimotion.Server.Test.csproj diff --git a/src/Unlimotion.Server.Test/UnitTest1.cs b/src/Unlimotion.Server.Test/UnitTest1.cs deleted file mode 100644 index c677efc..0000000 --- a/src/Unlimotion.Server.Test/UnitTest1.cs +++ /dev/null @@ -1,11 +0,0 @@ -using NUnit.Framework; -using System.Collections.Generic; -using System.Linq; - -namespace Unlimotion.Server.Test -{ - public class Tests - { - - } -} \ No newline at end of file diff --git a/src/Unlimotion.Server.Test/Unlimotion.Server.Test.csproj b/src/Unlimotion.Server.Test/Unlimotion.Server.Test.csproj deleted file mode 100644 index 7ca66e7..0000000 --- a/src/Unlimotion.Server.Test/Unlimotion.Server.Test.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net8.0 - latest - false - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - diff --git a/src/Unlimotion.Test/UnitTest1.cs b/src/Unlimotion.Test/UnitTest1.cs index 63c892b..5780241 100644 --- a/src/Unlimotion.Test/UnitTest1.cs +++ b/src/Unlimotion.Test/UnitTest1.cs @@ -3,33 +3,26 @@ using System.Reactive.Linq; using System.Threading.Tasks; using DynamicData.Aggregation; -using NUnit.Framework; using Telerik.JustMock; using Unlimotion.ViewModel; +using Xunit; namespace Unlimotion.Test { public class Tests { - [SetUp] - public void Setup() - { - } - - [Test] + [Fact] public void CreateTaskItem() { var taskItem = new TaskItem(); - Assert.IsNotNull(taskItem.Id); - Assert.IsNotEmpty(taskItem.Id); - Assert.IsFalse(taskItem.IsCompleted); - Assert.IsTrue((taskItem.CreatedDateTime- DateTimeOffset.UtcNow).TotalSeconds < 1); - Assert.IsNotNull(taskItem.ContainsTasks); - Assert.IsNotNull(taskItem.BlocksTasks); + Assert.False(taskItem.IsCompleted); + Assert.True((taskItem.CreatedDateTime- DateTimeOffset.UtcNow).TotalSeconds < 1); + Assert.NotNull(taskItem.ContainsTasks); + Assert.NotNull(taskItem.BlocksTasks); } - [Test] + [Fact] public async Task CreateTaskItemViewModel() { var storage = Mock.Create(); @@ -45,8 +38,9 @@ public async Task CreateTaskItemViewModel() }; Mock.Arrange(() => storage.GetAll()).Returns(list); var repository = new TaskRepository(storage); + repository.Init(); var count = await repository.GetRoots().Count().FirstAsync(); - Assert.AreEqual(2, count); + Assert.Equal(2, count); } } diff --git a/src/Unlimotion.Test/Unlimotion.Test.csproj b/src/Unlimotion.Test/Unlimotion.Test.csproj index 8ccad85..b4bb084 100644 --- a/src/Unlimotion.Test/Unlimotion.Test.csproj +++ b/src/Unlimotion.Test/Unlimotion.Test.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -7,11 +7,10 @@ - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Unlimotion.sln b/src/Unlimotion.sln index f10a2a4..ca30822 100644 --- a/src/Unlimotion.sln +++ b/src/Unlimotion.sln @@ -34,15 +34,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unlimotion.Server.ServiceIn EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unlimotion.Server.ServiceModel", "Unlimotion.Server.ServiceModel\Unlimotion.Server.ServiceModel.csproj", "{4C4280BE-33D7-4A96-B75F-086A225736C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unlimotion.Server.Test", "Unlimotion.Server.Test\Unlimotion.Server.Test.csproj", "{958796EE-ED2F-48D8-9AF3-A1B5D5F27DFE}" -EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{3B31BDF8-CE3D-4E7F-BE8D-E60510DE5622}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unlimotion.iOS", "Unlimotion.iOS\Unlimotion.iOS.csproj", "{FAEB9E81-5207-46F7-A642-B5248E284420}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unlimotion.Browser", "Unlimotion.Browser\Unlimotion.Browser.csproj", "{08B3C356-E89E-4353-9B05-647B44B85F0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unlimotion.AppNameGenerator", "Unlimotion.AppNameGenerator\Unlimotion.AppNameGenerator.csproj", "{930C71F8-836A-4458-9DA4-2B1709BB9FE0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unlimotion.AppNameGenerator", "Unlimotion.AppNameGenerator\Unlimotion.AppNameGenerator.csproj", "{930C71F8-836A-4458-9DA4-2B1709BB9FE0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -92,10 +90,6 @@ Global {4C4280BE-33D7-4A96-B75F-086A225736C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C4280BE-33D7-4A96-B75F-086A225736C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C4280BE-33D7-4A96-B75F-086A225736C1}.Release|Any CPU.Build.0 = Release|Any CPU - {958796EE-ED2F-48D8-9AF3-A1B5D5F27DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {958796EE-ED2F-48D8-9AF3-A1B5D5F27DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {958796EE-ED2F-48D8-9AF3-A1B5D5F27DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {958796EE-ED2F-48D8-9AF3-A1B5D5F27DFE}.Release|Any CPU.Build.0 = Release|Any CPU {3B31BDF8-CE3D-4E7F-BE8D-E60510DE5622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B31BDF8-CE3D-4E7F-BE8D-E60510DE5622}.Debug|Any CPU.Build.0 = Debug|Any CPU {3B31BDF8-CE3D-4E7F-BE8D-E60510DE5622}.Release|Any CPU.ActiveCfg = Release|Any CPU From 1557679e70fdb12da890eff7406912d475594863 Mon Sep 17 00:00:00 2001 From: Kibnet Philosoff Date: Wed, 13 Mar 2024 16:19:37 +0300 Subject: [PATCH 3/4] =?UTF-8?q?refs:=20=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F?= =?UTF-8?q?=D1=82=D1=8B=20=D0=BC=D0=B8=D0=BD=D0=BE=D1=80=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Unlimotion.Android/Unlimotion.Android.csproj | 2 +- .../Unlimotion.AppNameGenerator.csproj | 2 +- src/Unlimotion.Server/Unlimotion.Server.csproj | 4 ++-- src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj | 6 +++--- src/Unlimotion/Unlimotion.csproj | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Unlimotion.Android/Unlimotion.Android.csproj b/src/Unlimotion.Android/Unlimotion.Android.csproj index 7c8a91c..4ea62e0 100644 --- a/src/Unlimotion.Android/Unlimotion.Android.csproj +++ b/src/Unlimotion.Android/Unlimotion.Android.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Unlimotion.AppNameGenerator/Unlimotion.AppNameGenerator.csproj b/src/Unlimotion.AppNameGenerator/Unlimotion.AppNameGenerator.csproj index 1a05f9a..30989e8 100644 --- a/src/Unlimotion.AppNameGenerator/Unlimotion.AppNameGenerator.csproj +++ b/src/Unlimotion.AppNameGenerator/Unlimotion.AppNameGenerator.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Unlimotion.Server/Unlimotion.Server.csproj b/src/Unlimotion.Server/Unlimotion.Server.csproj index 94bc428..67bd694 100644 --- a/src/Unlimotion.Server/Unlimotion.Server.csproj +++ b/src/Unlimotion.Server/Unlimotion.Server.csproj @@ -19,13 +19,13 @@ - + - + diff --git a/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj b/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj index 1a6279e..dfea0d2 100644 --- a/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj +++ b/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj @@ -6,9 +6,9 @@ - + - - + + diff --git a/src/Unlimotion/Unlimotion.csproj b/src/Unlimotion/Unlimotion.csproj index cdc9454..0919d45 100644 --- a/src/Unlimotion/Unlimotion.csproj +++ b/src/Unlimotion/Unlimotion.csproj @@ -14,11 +14,11 @@ - + - + From 8697c6b00f1e3e56be1d679ed5f5f78b69a0abad Mon Sep 17 00:00:00 2001 From: Kibnet Philosoff Date: Wed, 13 Mar 2024 20:06:53 +0300 Subject: [PATCH 4/4] =?UTF-8?q?refs:=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=B0=D0=B6=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=B1?= =?UTF-8?q?=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Unlimotion.Server.ServiceInterface.csproj | 2 +- src/Unlimotion.Server/appsettings.json | 2 +- src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj b/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj index 4966ce8..41dad5a 100644 --- a/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj +++ b/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Unlimotion.Server/appsettings.json b/src/Unlimotion.Server/appsettings.json index 6603c77..56cfb53 100644 --- a/src/Unlimotion.Server/appsettings.json +++ b/src/Unlimotion.Server/appsettings.json @@ -38,7 +38,7 @@ } }, "ServiceStackSettings": { - "LicenseKey": "TRIAL30WEB-e1JlZjpUUklBTDMwV0VCLE5hbWU6OS82LzIwMjIgNTZhN2Y0NGFhZjNhNGYwMjk2MTZlOGI2MjU4ZTJjMTMsVHlwZTpUcmlhbCxNZXRhOjAsSGFzaDpEVkhLdVVxUC85Myt3enZock9NQ1VBRDVxRzJWSCtyaVIyZ2UrM1YvRmROUXJUNEdIRHhTcWk5Y0YrNlREVXJjYmozcm9mdGdhSlFlTVpoWHdsdVRNbEZaQ2RYdVFpVFQ1NDBjaEFhNjlhdUc0SUF0WTRrSUx1aFBaN2lYUm5aUzMvbCtWQUZqSkROcmY2RDVjS3I3b1p6cnV1dkJJQldxbDU2ektSSTRiV3c9LEV4cGlyeToyMDIyLTEwLTA2fQ==", + "LicenseKey": "TRIAL30WEB-e3JlZjpUUklBTDMwV0VCLG5hbWU6My8xMy8yMDI0IDQ3MmNlYzhmNzkyMDQ0NDhhYjNkYTJlODUwNzYwZDQ0LHR5cGU6VHJpYWwsbWV0YTowLGhhc2g6WURYTlhQNmhtWEEzMys5VlpZMy9yVTRybUIxY0VHMXJVSEhZNXpyazBiUGVYK1NOeEZqNVlyT3JjVXRvK3ZrMUhoNEdHN2NuVmZ5UXMrRG4wVzBtR3UzcThLSUJxWFd2eXpaVVZnSGR6Q2hQZFlia3hPaThWZlFza1dtT2plemEzQzJVemNtb0ZIcEl4YXR1SVJXWGJtQzJRaHRIOFp4WHdyRlRlNFBRL2U0PSxleHBpcnk6MjAyNC0wNC0xMn0=", "LicenseKeyAddress": "https://account.servicestack.net/trial" }, "FilesPath": "Files" diff --git a/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj b/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj index dfea0d2..d5a849c 100644 --- a/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj +++ b/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj @@ -7,7 +7,7 @@ - +