Merge pull request #132 from Kibnet/feat/Upgrade-libraries

feat: Обновлены библиотеки до последних версий
Kibnet · Mar 13, 2024 · e563f96 · e563f96
2 parents 5e29dec + 8697c6b
commit e563f96
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 79 deletions.
diff --git a/src/Unlimotion.Android/Unlimotion.Android.csproj b/src/Unlimotion.Android/Unlimotion.Android.csproj
@@ -19,7 +19,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
-		<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
+		<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.6" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Unlimotion.AppNameGenerator/Unlimotion.AppNameGenerator.csproj b/src/Unlimotion.AppNameGenerator/Unlimotion.AppNameGenerator.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
 	</ItemGroup>
 

diff --git a/src/Unlimotion.Interface/Unlimotion.Interface.csproj b/src/Unlimotion.Interface/Unlimotion.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 

diff --git a/src/Unlimotion.Server.Domain/Unlimotion.Server.Domain.csproj b/src/Unlimotion.Server.Domain/Unlimotion.Server.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 

diff --git a/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj b/src/Unlimotion.Server.ServiceInterface/Unlimotion.Server.ServiceInterface.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AutoMapper" Version="12.0.0" />
+		<PackageReference Include="AutoMapper" Version="13.0.1" />
 		<PackageReference Include="RavenDB.Client" Version="5.4.4" />
 		<PackageReference Include="ServiceStack.Server" Version="6.4.0" />
 	</ItemGroup>

diff --git a/src/Unlimotion.Server.ServiceModel/Unlimotion.Server.ServiceModel.csproj b/src/Unlimotion.Server.ServiceModel/Unlimotion.Server.ServiceModel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 

diff --git a/src/Unlimotion.Server.Test/UnitTest1.cs b/src/Unlimotion.Server.Test/UnitTest1.cs
diff --git a/src/Unlimotion.Server.Test/Unlimotion.Server.Test.csproj b/src/Unlimotion.Server.Test/Unlimotion.Server.Test.csproj
diff --git a/src/Unlimotion.Server/Unlimotion.Server.csproj b/src/Unlimotion.Server/Unlimotion.Server.csproj
@@ -19,13 +19,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
 		<PackageReference Include="RavenDB.Embedded" Version="5.4.4" />
 		<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
 		<PackageReference Include="ServiceStack.Api.OpenApi" Version="6.4.0" />
 		<PackageReference Include="ServiceStack.Api.Swagger" Version="5.14.0" />
 		<PackageReference Include="SignalR.EasyUse.Server" Version="0.2.1" />
-		<PackageReference Include="WritableJsonConfiguration" Version="6.0.0" />
+		<PackageReference Include="WritableJsonConfiguration" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git 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.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<ITaskStorage>();
@@ -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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
@@ -7,11 +7,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JustMock" Version="2022.3.912.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-		<PackageReference Include="coverlet.collector" Version="3.1.2">
+		<PackageReference Include="JustMock" Version="2024.1.124.247" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="xunit" Version="2.7.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj b/src/Unlimotion.ViewModel/Unlimotion.ViewModel.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="PropertyChanged.Fody" Version="4.0.5" />
-		<PackageReference Include="ReactiveUI" Version="18.3.1" />
-		<PackageReference Include="System.Runtime.Caching" Version="7.0.0" />
-		<PackageReference Include="WritableJsonConfiguration" Version="6.0.0" />
+		<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
+		<PackageReference Include="ReactiveUI" Version="19.5.41" />
+		<PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
+		<PackageReference Include="WritableJsonConfiguration" Version="8.0.0" />
 	</ItemGroup>
 </Project>
diff --git 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

diff --git a/src/Unlimotion/Unlimotion.csproj b/src/Unlimotion/Unlimotion.csproj
@@ -14,11 +14,11 @@
 		<Watch Include="**\*.axaml" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="AutoMapper" Version="12.0.0" />
+		<PackageReference Include="AutoMapper" Version="13.0.1" />
 		<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaVersion)" />
 		<PackageReference Include="Avalonia.Controls.PanAndZoom" Version="$(AvaloniaVersion)" />
-		<PackageReference Include="DialogHost.Avalonia" Version="0.7.4" />
+		<PackageReference Include="DialogHost.Avalonia" Version="0.7.7" />
 		<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
 		<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
 		<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />