Merge pull request #10 from skbkontur/a.dobrynin/net6

aldobrynin · web-flow · commit 347d5c6a81be · 2021-12-02T20:04:40.000+03:00
net6
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "skbkontur.typescript.contractgenerator.cli": {
-      "version": "2.0.94",
+      "version": "2.0.105",
       "commands": [
         "dotnet-ts-gen"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2020.3.3",
+      "version": "2021.2.2",
       "commands": [
         "jb"
       ]
diff --git a/.start-all.cmd b/.start-all.cmd
@@ -1,6 +1,6 @@
-start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net5.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4403
-start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net5.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4404
-start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net5.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4405
-start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net5.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4406
-start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net5.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4407
-start .\Cassandra.DistributedTaskQueue.Monitoring.TestService\bin\net5.0\SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.exe --urls http://localhost:4413
+start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net6.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4403
+start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net6.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4404
+start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net6.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4405
+start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net6.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4406
+start .\Cassandra.DistributedTaskQueue.TestExchangeService\bin\net6.0\SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe --urls http://localhost:4407
+start .\Cassandra.DistributedTaskQueue.Monitoring.TestService\bin\net6.0\SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.exe --urls http://localhost:4413
diff --git a/Cassandra.DistributedTaskQueue.Monitoring.TestService/Cassandra.DistributedTaskQueue.Monitoring.TestService.csproj b/Cassandra.DistributedTaskQueue.Monitoring.TestService/Cassandra.DistributedTaskQueue.Monitoring.TestService.csproj
@@ -1,16 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService</AssemblyName>
     <RootNamespace>SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService</RootNamespace>
     <OutputPath>bin\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
-    <PackageReference Include="SkbKontur.TypeScript.ContractGenerator" Version="2.0.94" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="SkbKontur.TypeScript.ContractGenerator" Version="2.0.105" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Cassandra.DistributedTaskQueue.Monitoring.TestService/GroboControllerFactory.cs b/Cassandra.DistributedTaskQueue.Monitoring.TestService/GroboControllerFactory.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Threading.Tasks;
 
 using GroboContainer.Core;
 
@@ -32,6 +33,11 @@ public void ReleaseController(ControllerContext context, object controller)
         {
         }
 
+        public ValueTask ReleaseControllerAsync(ControllerContext context, object controller)
+        {
+            return default;
+        }
+
         private static IContainer ConfigureContainer()
         {
             var container = ApplicationBase.Initialize();
diff --git a/Cassandra.DistributedTaskQueue.Monitoring.TestService/Startup.cs b/Cassandra.DistributedTaskQueue.Monitoring.TestService/Startup.cs
@@ -4,13 +4,15 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
+using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Json;
+
 namespace SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService
 {
     public class Startup
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddControllers().AddNewtonsoftJson();
+            services.AddControllers().AddNewtonsoftJson(options => options.SerializerSettings.Converters.Add(new LongToStringConverter()));
             services.AddSingleton<IControllerFactory>(new GroboControllerFactory());
         }
 
diff --git a/Cassandra.DistributedTaskQueue.Monitoring.TestService/TypeScriptConfiguration/RtqMonitoringCustomTypeGenerator.cs b/Cassandra.DistributedTaskQueue.Monitoring.TestService/TypeScriptConfiguration/RtqMonitoringCustomTypeGenerator.cs
@@ -27,6 +27,8 @@ public ITypeBuildingContext ResolveType(string initialUnitPath, ITypeGenerator t
                 return TypeBuilding.RedirectToType("Timestamp", @"..\DataTypes\Timestamp", type);
             if (type.Equals(TypeInfo.From<TimestampRange>()))
                 return TypeBuilding.RedirectToType("DateTimeRange", @"..\DataTypes\DateTimeRange", type);
+            if (type.Equals(TypeInfo.From<long>()))
+                return new TypeRedirectBuildingContext(TypeInfo.From<long>(), new TypeScriptBuildInType("string"));
             if (InternalApiTypeBuildingContext.Accept(type))
                 return new InternalApiTypeBuildingContext(unitFactory.GetOrCreateTypeUnit(initialUnitPath), type);
             return null;
diff --git a/Cassandra.DistributedTaskQueue.Monitoring.TestService/TypeScriptConfiguration/TypeRedirectBuildingContext.cs b/Cassandra.DistributedTaskQueue.Monitoring.TestService/TypeScriptConfiguration/TypeRedirectBuildingContext.cs
@@ -0,0 +1,30 @@
+using System;
+
+using JetBrains.Annotations;
+
+using SkbKontur.TypeScript.ContractGenerator;
+using SkbKontur.TypeScript.ContractGenerator.Abstractions;
+using SkbKontur.TypeScript.ContractGenerator.CodeDom;
+using SkbKontur.TypeScript.ContractGenerator.TypeBuilders;
+
+namespace SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.TypeScriptConfiguration
+{
+    public class TypeRedirectBuildingContext : TypeBuildingContextBase
+    {
+        public TypeRedirectBuildingContext([NotNull] ITypeInfo type, [NotNull] TypeScriptType typeScriptType)
+            : base(type)
+        {
+            this.typeScriptType = typeScriptType;
+        }
+
+        protected override TypeScriptType ReferenceFromInternal(ITypeInfo type, TypeScriptUnit targetUnit, ITypeGenerator typeGenerator)
+        {
+            if (type.Equals(Type))
+                return typeScriptType;
+            throw new ArgumentException($"Expected type {Type}, but got {type}");
+        }
+
+        [NotNull]
+        private readonly TypeScriptType typeScriptType;
+    }
+}
diff --git a/Cassandra.DistributedTaskQueue.TestExchangeService/Cassandra.DistributedTaskQueue.TestExchangeService.csproj b/Cassandra.DistributedTaskQueue.TestExchangeService/Cassandra.DistributedTaskQueue.TestExchangeService.csproj
@@ -1,15 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService</AssemblyName>
     <RootNamespace>SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService</RootNamespace>
     <OutputPath>bin\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Cassandra.DistributedTaskQueue.Tests/Cassandra.DistributedTaskQueue.Tests.csproj b/Cassandra.DistributedTaskQueue.Tests/Cassandra.DistributedTaskQueue.Tests.csproj
@@ -1,19 +1,19 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>SkbKontur.Cassandra.DistributedTaskQueue.Tests</AssemblyName>
     <RootNamespace>SkbKontur.Cassandra.DistributedTaskQueue.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="GroboContainer.NUnitExtensions" Version="1.0.44" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="GroboContainer.NUnitExtensions" Version="1.0.56" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="morelinq" Version="3.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="Vostok.ClusterClient.Transport" Version="0.1.17" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="Vostok.ClusterClient.Transport" Version="0.1.21" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Cassandra.DistributedTaskQueue.Tests/RemoteTaskQueue/RepositoriesTests/TaskExceptionInfoStorageTest.cs b/Cassandra.DistributedTaskQueue.Tests/RemoteTaskQueue/RepositoriesTests/TaskExceptionInfoStorageTest.cs
@@ -7,8 +7,6 @@
 
 using GroboContainer.NUnitExtensions;
 
-using MoreLinq;
-
 using NUnit.Framework;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Cassandra.Entities;
diff --git a/Cassandra.DistributedTaskQueue.Tests/RemoteTaskQueue/RepositoriesTests/TimeBasedBlobStorageTest.cs b/Cassandra.DistributedTaskQueue.Tests/RemoteTaskQueue/RepositoriesTests/TimeBasedBlobStorageTest.cs
@@ -2,6 +2,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
+using FluentAssertions;
+
 using GroboContainer.NUnitExtensions;
 
 using NUnit.Framework;
@@ -162,15 +164,17 @@ public void ReadAll()
             WriteByte(id21, 21);
             WriteByte(id22, 22);
 
-            Assert.That(timeBasedBlobStorage.ReadAll(1).Select(x => Tuple.Create(x.Item1, x.Item2.Single())).ToArray(),
-                        Is.EquivalentTo(new[]
-                            {
-                                new Tuple<BlobId, byte>(idLarge, 255),
-                                new Tuple<BlobId, byte>(id11, 11),
-                                new Tuple<BlobId, byte>(id12, 12),
-                                new Tuple<BlobId, byte>(id21, 21),
-                                new Tuple<BlobId, byte>(id22, 22),
-                            }));
+            timeBasedBlobStorage.ReadAll(1)
+                                .Select(x => Tuple.Create(x.Item1, x.Item2.Single()))
+                                .Should()
+                                .BeEquivalentTo(new[]
+                                    {
+                                        new Tuple<BlobId, byte>(idLarge, 255),
+                                        new Tuple<BlobId, byte>(id11, 11),
+                                        new Tuple<BlobId, byte>(id12, 12),
+                                        new Tuple<BlobId, byte>(id21, 21),
+                                        new Tuple<BlobId, byte>(id22, 22),
+                                    });
         }
 
         [Test]
diff --git a/Common.DotSettings b/Common.DotSettings
@@ -51,6 +51,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">False</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">120</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_TERNARY_EXPR_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/WrapLongLines/@EntryValue">False</s:Boolean>
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@ skip_commits:
   files:
     - '**/*.md'
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 init:
   - cmd: git config --global core.autocrlf false
@@ -17,7 +17,9 @@ environment:
     secure: Gx5yyFrlELZY4DNW/uAuiXdhUADacNqi3LptQwldv8O61KpYyiDUniA8lBJ5jfne
 
 install:
-  - cmd: docker-compose up -d
+  - cmd: docker-switch-windows
+  - cmd: docker info
+  - cmd: docker-compose -f docker-compose.yaml up -d
 
 before_build:
   - ps: |
@@ -51,12 +53,12 @@ build_script:
   - cmd: cd cassandra-distributed-task-queue-ui && yarn build
 
 before_test:
-  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4403"
-  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4404"
-  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4405"
-  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4406"
-  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4407"
-  - ps: Start-Process ./Cassandra.DistributedTaskQueue.Monitoring.TestService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.exe -ArgumentList "--urls http://localhost:4413"
+  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net6.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4403"
+  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net6.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4404"
+  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net6.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4405"
+  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net6.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4406"
+  - ps: Start-Process ./Cassandra.DistributedTaskQueue.TestExchangeService/bin/net6.0/SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService.exe -ArgumentList "--urls http://localhost:4407"
+  - ps: Start-Process ./Cassandra.DistributedTaskQueue.Monitoring.TestService/bin/net6.0/SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.exe -ArgumentList "--urls http://localhost:4413"
 
 test_script:
   - cmd: dotnet jb cleanupcode Cassandra.DistributedTaskQueue.sln --profile=CatalogueCleanup --verbosity=WARN
diff --git a/cassandra-distributed-task-queue-ui/package.json b/cassandra-distributed-task-queue-ui/package.json
@@ -26,7 +26,7 @@
     "build:copy:src": "copyfiles --up 1 \"src/**/*.js\" dist",
     "build:copy:meta": "copyfiles --flat package.json \"../*.md\" ../LICENSE dist",
     "build:pack": "cd dist && npm pack",
-    "build:types": "dotnet ts-gen --assembly ./../Cassandra.DistributedTaskQueue.Monitoring.TestService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.dll --outputDir ./src/Domain/Api --nullabilityMode Pessimistic",
+    "build:types": "dotnet ts-gen --assembly ./../Cassandra.DistributedTaskQueue.Monitoring.TestService/bin/net6.0/SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.dll --outputDir ./src/Domain/Api --nullabilityMode Pessimistic",
     "start": "webpack serve --env api=fake",
     "start:prod": "webpack serve --env api=real",
     "storybook": "start-storybook -p 6006 -s .",
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0",
+    "version": "6.0",
     "rollForward": "latestFeature"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"skbkontur.typescript.contractgenerator.cli": {`
`6`		`- "version": "2.0.94",`
	`6`	`+ "version": "2.0.105",`
`7`	`7`	`"commands": [`
`8`	`8`	`"dotnet-ts-gen"`
`9`	`9`	`]`
`@@ -15,7 +15,7 @@`
`15`	`15`	`]`
`16`	`16`	`},`
`17`	`17`	`"jetbrains.resharper.globaltools": {`
`18`		`- "version": "2020.3.3",`
	`18`	`+ "version": "2021.2.2",`
`19`	`19`	`"commands": [`
`20`	`20`	`"jb"`
`21`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Threading.Tasks;`
`2`	`3`
`3`	`4`	`using GroboContainer.Core;`
`4`	`5`
`@@ -32,6 +33,11 @@ public void ReleaseController(ControllerContext context, object controller)`
`32`	`33`	`{`
`33`	`34`	`}`
`34`	`35`
	`36`	`+ public ValueTask ReleaseControllerAsync(ControllerContext context, object controller)`
	`37`	`+ {`
	`38`	`+ return default;`
	`39`	`+ }`
	`40`	`+`
`35`	`41`	`private static IContainer ConfigureContainer()`
`36`	`42`	`{`
`37`	`43`	`var container = ApplicationBase.Initialize();`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,15 @@`
`4`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`5`	`using Microsoft.Extensions.Hosting;`
`6`	`6`
	`7`	`+using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Json;`
	`8`	`+`
`7`	`9`	`namespace SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService`
`8`	`10`	`{`
`9`	`11`	`public class Startup`
`10`	`12`	`{`
`11`	`13`	`public void ConfigureServices(IServiceCollection services)`
`12`	`14`	`{`
`13`		`- services.AddControllers().AddNewtonsoftJson();`
	`15`	`+ services.AddControllers().AddNewtonsoftJson(options => options.SerializerSettings.Converters.Add(new LongToStringConverter()));`
`14`	`16`	`services.AddSingleton<IControllerFactory>(new GroboControllerFactory());`
`15`	`17`	`}`
`16`	`18`