Merge pull request #44 from skbkontur/net6

fakefeik · web-flow · commit 8d6fc8e5c5db · 2021-11-26T19:56:50.000+05:00
Net6
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,25 +3,25 @@
   "isRoot": true,
   "tools": {
     "skbkontur.typescript.contractgenerator.cli": {
-      "version": "2.0.94",
+      "version": "2.0.105",
       "commands": [
         "dotnet-ts-gen"
       ]
     },
     "nbgv": {
-      "version": "3.3.37",
+      "version": "3.4.244",
       "commands": [
         "nbgv"
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2020.3.3",
+      "version": "2021.2.2",
       "commands": [
         "jb"
       ]
     },
     "dotnet-ef": {
-      "version": "3.1.7",
+      "version": "3.1.21",
       "commands": [
         "dotnet-ef"
       ]
diff --git a/DbViewer.TestApi/DbViewer.TestApi.csproj b/DbViewer.TestApi/DbViewer.TestApi.csproj
@@ -1,21 +1,22 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>SkbKontur.DbViewer.TestApi</AssemblyName>
     <RootNamespace>SkbKontur.DbViewer.TestApi</RootNamespace>
     <OutputPath>bin\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GroboContainer" Version="1.2.52" />
+    <PackageReference Include="GroboContainer" Version="1.2.60" />
     <PackageReference Include="GroBuf" Version="1.7.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Include="SkbKontur.TypeScript.ContractGenerator" Version="2.0.94" />
-    <PackageReference Include="AutoFixture" Version="4.15.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.21" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.21" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.18" />
+    <PackageReference Include="SkbKontur.TypeScript.ContractGenerator" Version="2.0.105" />
+    <PackageReference Include="AutoFixture" Version="4.17.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/DbViewer.TestApi/EntityFramework/EntityFrameworkDbContext.cs b/DbViewer.TestApi/EntityFramework/EntityFrameworkDbContext.cs
@@ -8,13 +8,14 @@ namespace SkbKontur.DbViewer.TestApi.EntityFramework
 {
     public class EntityFrameworkDbContext : DbContext
     {
+        public const string ConnectionString = "Host=localhost;Database=my_db;Username=postgres;Password=postgres";
+
         public DbSet<UsersTable> Users { get; set; }
         public DbSet<FtpUser> FtpUsers { get; set; }
         public DbSet<TestTable> Tests { get; set; }
         public DbSet<SqlDocument> Documents { get; set; }
 
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-            => optionsBuilder.UseNpgsql("Host=localhost;Database=my_db;Username=postgres;Password=postgres");
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) => optionsBuilder.UseNpgsql(ConnectionString);
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
diff --git a/DbViewer.TestApi/Startup.cs b/DbViewer.TestApi/Startup.cs
@@ -23,7 +23,7 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers().AddNewtonsoftJson();
-            services.AddDbContext<EntityFrameworkDbContext>(options => options.UseNpgsql(Configuration.GetConnectionString("EntityFrameworkDbContext")));
+            services.AddDbContext<EntityFrameworkDbContext>(options => options.UseNpgsql(EntityFrameworkDbContext.ConnectionString));
             services.AddSingleton<IControllerFactory>(new GroboControllerFactory());
         }
 
diff --git a/DbViewer.Tests/DbViewer.Tests.csproj b/DbViewer.Tests/DbViewer.Tests.csproj
@@ -1,18 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>SkbKontur.DbViewer.Tests</AssemblyName>
     <RootNamespace>SkbKontur.DbViewer.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Kontur.ReactUI.SeleniumTesting" Version="3.2.0" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="Kontur.ReactUI.SeleniumTesting" Version="3.5.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DbViewer.Tests/FrontTests/Helpers/ControlBaseExtensions.cs b/DbViewer.Tests/FrontTests/Helpers/ControlBaseExtensions.cs
@@ -1,6 +1,4 @@
-﻿using Kontur.Selone.Properties;
-
-using NUnit.Framework;
+﻿using NUnit.Framework;
 
 using SKBKontur.SeleniumTesting;
 
@@ -20,12 +18,12 @@ public static void WaitAbsence(this ControlBase control)
 
         public static void WaitIncorrect(this ControlBase control)
         {
-            control.GetError().Wait().That(Is.True);
+            control.HasError.Wait().That(Is.True);
         }
 
         public static void WaitCorrect(this ControlBase control)
         {
-            control.GetError().Wait().That(Is.False);
+            control.HasError.Wait().That(Is.False);
         }
 
         public static T ClickAndGoTo<T>(this ControlBase control)
@@ -39,10 +37,5 @@ private static PageBase ClickAndGetPage(this ControlBase control)
             control.Click();
             return (PageBase)control.GetRootContainer();
         }
-
-        private static IProp<bool> GetError(this ControlBase control)
-        {
-            return Prop.Create(control.HasError, "error");
-        }
     }
 }
diff --git a/DbViewer.sln.DotSettings b/DbViewer.sln.DotSettings
@@ -1,10 +1,15 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=3646A699_002D60D3_002D4668_002D9E40_002DE49A8FBF8BC0_002Fd_003AMigrations/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=8929152D75F88149BA91E0ED1FDC8ACF/AbsolutePath/@EntryValue">F:\repositories\git\kontur.store\Common.DotSettings</s:String>
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=8929152D75F88149BA91E0ED1FDC8ACF/RelativePath/@EntryValue">..\Common.DotSettings</s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=8929152D75F88149BA91E0ED1FDC8ACF/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File8929152D75F88149BA91E0ED1FDC8ACF/@KeyIndexDefined">True</s:Boolean>
 	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File8929152D75F88149BA91E0ED1FDC8ACF/RelativePriority/@EntryValue">1</s:Double>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=grobo/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Keyspace/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kontur/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,8 +19,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ yarn build:types
 dotnet ef database update --project ./DbViewer.TestApi/DbViewer.TestApi.csproj --no-build --configuration Release
 
 # start db-viewer
-./DbViewer.TestApi/bin/net5.0/SkbKontur.DbViewer.TestApi.exe
+./DbViewer.TestApi/bin/net6.0/SkbKontur.DbViewer.TestApi.exe
 yarn start:prod
 
 # start tests
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
@@ -54,7 +54,7 @@ build_script:
 
 before_test:
   - cmd: dotnet ef database update --project ./DbViewer.TestApi/DbViewer.TestApi.csproj --no-build --configuration Release
-  - ps: Start-Process ./DbViewer.TestApi/bin/net5.0/SkbKontur.DbViewer.TestApi.exe
+  - ps: Start-Process ./DbViewer.TestApi/bin/net6.0/SkbKontur.DbViewer.TestApi.exe
   - ps: |
         Set-Location -Path db-viewer-ui
         Start-Process yarn start:prod
diff --git a/db-viewer-ui/package.json b/db-viewer-ui/package.json
@@ -27,7 +27,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 ./../DbViewer.TestApi/bin/net5.0/SkbKontur.DbViewer.TestApi.dll --outputDir ./src/Domain/Api --nullabilityMode NullableReference",
+    "build:types": "dotnet ts-gen --assembly ./../DbViewer.TestApi/bin/net6.0/SkbKontur.DbViewer.TestApi.dll --outputDir ./src/Domain/Api --nullabilityMode NullableReference",
     "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,5 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.401"
+    "version": "6.0.100",
+    "rollForward": "latestFeature"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,14 @@ namespace SkbKontur.DbViewer.TestApi.EntityFramework`
`8`	`8`	`{`
`9`	`9`	`public class EntityFrameworkDbContext : DbContext`
`10`	`10`	`{`
	`11`	`+ public const string ConnectionString = "Host=localhost;Database=my_db;Username=postgres;Password=postgres";`
	`12`	`+`
`11`	`13`	`public DbSet<UsersTable> Users { get; set; }`
`12`	`14`	`public DbSet<FtpUser> FtpUsers { get; set; }`
`13`	`15`	`public DbSet<TestTable> Tests { get; set; }`
`14`	`16`	`public DbSet<SqlDocument> Documents { get; set; }`
`15`	`17`
`16`		`- protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`17`		`- => optionsBuilder.UseNpgsql("Host=localhost;Database=my_db;Username=postgres;Password=postgres");`
	`18`	`+ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) => optionsBuilder.UseNpgsql(ConnectionString);`
`18`	`19`
`19`	`20`	`protected override void OnModelCreating(ModelBuilder modelBuilder)`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public Startup(IConfiguration configuration)`
`23`	`23`	`public void ConfigureServices(IServiceCollection services)`
`24`	`24`	`{`
`25`	`25`	`services.AddControllers().AddNewtonsoftJson();`
`26`		`- services.AddDbContext<EntityFrameworkDbContext>(options => options.UseNpgsql(Configuration.GetConnectionString("EntityFrameworkDbContext")));`
	`26`	`+ services.AddDbContext<EntityFrameworkDbContext>(options => options.UseNpgsql(EntityFrameworkDbContext.ConnectionString));`
`27`	`27`	`services.AddSingleton<IControllerFactory>(new GroboControllerFactory());`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Kontur.Selone.Properties;`
`2`		`-`
`3`		`-using NUnit.Framework;`
	`1`	`+using NUnit.Framework;`
`4`	`2`
`5`	`3`	`using SKBKontur.SeleniumTesting;`
`6`	`4`
`@@ -20,12 +18,12 @@ public static void WaitAbsence(this ControlBase control)`
`20`	`18`
`21`	`19`	`public static void WaitIncorrect(this ControlBase control)`
`22`	`20`	`{`
`23`		`- control.GetError().Wait().That(Is.True);`
	`21`	`+ control.HasError.Wait().That(Is.True);`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`public static void WaitCorrect(this ControlBase control)`
`27`	`25`	`{`
`28`		`- control.GetError().Wait().That(Is.False);`
	`26`	`+ control.HasError.Wait().That(Is.False);`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`public static T ClickAndGoTo<T>(this ControlBase control)`
`@@ -39,10 +37,5 @@ private static PageBase ClickAndGetPage(this ControlBase control)`
`39`	`37`	`control.Click();`
`40`	`38`	`return (PageBase)control.GetRootContainer();`
`41`	`39`	`}`
`42`		`-`
`43`		`- private static IProp<bool> GetError(this ControlBase control)`
`44`		`- {`
`45`		`- return Prop.Create(control.HasError, "error");`
`46`		`- }`
`47`	`40`	`}`
`48`	`41`	`}`