Update dependencies; use net6.0

skbkontur · Nov 11, 2021 · b05021c · b05021c
1 parent d60646b
commit b05021c
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 18 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2020.3.3",
+      "version": "2021.2.2",
       "commands": [
         "jb"
       ]

diff --git a/AspNetCoreExample.Generator/AspNetCoreExample.Generator.csproj b/AspNetCoreExample.Generator/AspNetCoreExample.Generator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFramework>net5.0</TargetFramework>
+      <TargetFramework>net6.0</TargetFramework>
       <OutputType>Exe</OutputType>
       <IsPackable>false</IsPackable>
     </PropertyGroup>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.0.105 - 2021.11.11
+- Use net6.0 in cli tool
+- Update Roslyn dependencies
+
 ## v2.0.104 - 2021.10.28
 - treat long type as number in javascript according to serializers' behavior (e.g. JSON.NET & Netwonsoft.JSON)
 

diff --git a/Common.DotSettings b/Common.DotSettings
@@ -138,6 +138,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_CASE_FROM_SWITCH/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AP/@EntryIndexedValue">AP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AB/@EntryIndexedValue">AB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TTN/@EntryIndexedValue">TTN</s:String>

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/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj b/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>SkbKontur.TypeScript.ContractGenerator.Cli</AssemblyName>
     <RootNamespace>SkbKontur.TypeScript.ContractGenerator.Cli</RootNamespace>
     <PackageId>SkbKontur.TypeScript.ContractGenerator.Cli</PackageId>

diff --git a/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj b/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" />
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/TypeScript.ContractGenerator.Tests/CliTest.cs b/TypeScript.ContractGenerator.Tests/CliTest.cs
@@ -13,8 +13,8 @@ public class CliTest
         [Test]
         public void CliGenerated()
         {
-            RunCmdCommand($"dotnet {pathToSlnDirectory}/TypeScript.ContractGenerator.Cli/bin/{configuration}/net5.0/SkbKontur.TypeScript.ContractGenerator.Cli.dll " +
-                          $"-a {pathToSlnDirectory}/AspNetCoreExample.Generator/bin/{configuration}/net5.0/AspNetCoreExample.Generator.dll " +
+            RunCmdCommand($"dotnet {pathToSlnDirectory}/TypeScript.ContractGenerator.Cli/bin/{configuration}/net6.0/SkbKontur.TypeScript.ContractGenerator.Cli.dll " +
+                          $"-a {pathToSlnDirectory}/AspNetCoreExample.Generator/bin/{configuration}/net6.0/AspNetCoreExample.Generator.dll " +
                           $"-o {TestContext.CurrentContext.TestDirectory}/cliOutput " +
                           "--nullabilityMode Optimistic " +
                           "--lintMode TsLint " +
@@ -28,7 +28,7 @@ public void CliGenerated()
         [Test]
         public void RoslynCliGenerated()
         {
-            RunCmdCommand($"dotnet {pathToSlnDirectory}/TypeScript.ContractGenerator.Cli/bin/{configuration}/net5.0/SkbKontur.TypeScript.ContractGenerator.Cli.dll " +
+            RunCmdCommand($"dotnet {pathToSlnDirectory}/TypeScript.ContractGenerator.Cli/bin/{configuration}/net6.0/SkbKontur.TypeScript.ContractGenerator.Cli.dll " +
                           $"-d {pathToSlnDirectory}/AspNetCoreExample.Api;{pathToSlnDirectory}/AspNetCoreExample.Generator " +
                           $"-a {typeof(ControllerBase).Assembly.Location} " +
                           $"-o {TestContext.CurrentContext.TestDirectory}/roslynCliOutput " +

diff --git a/TypeScript.ContractGenerator.Tests/TestRewriteTypeInfo.cs b/TypeScript.ContractGenerator.Tests/TestRewriteTypeInfo.cs
@@ -29,8 +29,8 @@ public void Rewrite()
                              .Project;
 
             var compilation = project.GetCompilationAsync().GetAwaiter().GetResult()!
-                              .AddReferences(AdhocProject.GetMetadataReferences())
-                              .AddReferences(MetadataReference.CreateFromFile(typeof(ControllerBase).Assembly.Location));
+                                     .AddReferences(AdhocProject.GetMetadataReferences())
+                                     .AddReferences(MetadataReference.CreateFromFile(typeof(ControllerBase).Assembly.Location));
 
             TypeInfoRewriter.Types.Clear();
             var tree = compilation.SyntaxTrees.Single(x => x.FilePath.Contains("ApiControllerTypeBuildingContext.cs"));

diff --git a/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj b/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>net472;netcoreapp3.1;net5.0</TargetFrameworks>
+      <TargetFrameworks>net48;net6.0</TargetFrameworks>
       <AssemblyName>SkbKontur.TypeScript.ContractGenerator.Tests</AssemblyName>
       <RootNamespace>SkbKontur.TypeScript.ContractGenerator.Tests</RootNamespace>
     </PropertyGroup>
@@ -13,10 +13,10 @@
 
     <ItemGroup>
       <PackageReference Include="DiffPlex" Version="1.7.0" />
-      <PackageReference Include="FluentAssertions" Version="5.10.3" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-      <PackageReference Include="NUnit" Version="3.13.1" />
-      <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+      <PackageReference Include="FluentAssertions" Version="6.2.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+      <PackageReference Include="NUnit" Version="3.13.2" />
+      <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
     </ItemGroup>
 
     <ItemGroup>

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

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.302",
+    "version": "6.0.100",
     "rollForward": "latestFeature"
   }
 }