Merge pull request #61 from skbkontur/a.dobrynin/net7

A.dobrynin/net7
skbkontur · May 3, 2023 · addebdd · addebdd
2 parents eea8b6e + df3d7d9
commit addebdd
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 21 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -2,9 +2,7 @@ on:
   push:
     paths-ignore:
       - "**/*.md"
-    pull_request:
-env:
-  DOTNET_VERSION: 6.0.x
+  pull_request:
 jobs:
   test:
     runs-on: windows-2019
@@ -16,7 +14,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+          global-json-file: global.json
 
       - name: Install dependencies
         run: dotnet restore ./TypeScript.ContractGenerator.sln --verbosity minimal && dotnet tool restore
@@ -41,7 +39,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+          global-json-file: global.json
 
       - name: Build
         run: dotnet build --configuration Release ./TypeScript.ContractGenerator.sln

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.128" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/README.md b/README.md
@@ -2,12 +2,13 @@
 
 A tool that can generate TypeScript types from C# classes
 
-|              | Build Status
-|--------------|:--------------:
-| TypeScript.ContractGenerator | [![NuGet Status](https://img.shields.io/nuget/v/SkbKontur.TypeScript.ContractGenerator.svg)](https://www.nuget.org/packages/SkbKontur.TypeScript.ContractGenerator/)
-| TypeScript.ContractGenerator.Roslyn | [![NuGet Status](https://img.shields.io/nuget/v/SkbKontur.TypeScript.ContractGenerator.Roslyn.svg)](https://www.nuget.org/packages/SkbKontur.TypeScript.ContractGenerator.Roslyn/)
-| TypeScript.ContractGenerator.Cli | [![NuGet Status](https://img.shields.io/nuget/v/SkbKontur.TypeScript.ContractGenerator.Cli.svg)](https://www.nuget.org/packages/SkbKontur.TypeScript.ContractGenerator.Cli/)
-| Build | [![Build status](https://ci.appveyor.com/api/projects/status/1x5x9gw0a7h12g38/branch/master?svg=true)](https://ci.appveyor.com/project/skbkontur/typescript-contractgenerator/branch/master)
+|                                     | Build Status |
+|-------------------------------------|:--------------: |
+| TypeScript.ContractGenerator        | [![NuGet Status](https://img.shields.io/nuget/v/SkbKontur.TypeScript.ContractGenerator.svg)](https://www.nuget.org/packages/SkbKontur.TypeScript.ContractGenerator/) |
+| TypeScript.ContractGenerator.Roslyn | [![NuGet Status](https://img.shields.io/nuget/v/SkbKontur.TypeScript.ContractGenerator.Roslyn.svg)](https://www.nuget.org/packages/SkbKontur.TypeScript.ContractGenerator.Roslyn/) |
+| TypeScript.ContractGenerator.Cli    | [![NuGet Status](https://img.shields.io/nuget/v/SkbKontur.TypeScript.ContractGenerator.Cli.svg)](https://www.nuget.org/packages/SkbKontur.TypeScript.ContractGenerator.Cli/) |
+| Build                               | [![Build status](https://github.com/skbkontur/TypeScript.ContractGenerator/actions/workflows/actions.yml/badge.svg)](https://github.com/skbkontur/TypeScript.ContractGenerator/actions) |
+
 
 ## Release Notes
 

diff --git a/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj b/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>

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="4.0.1" />
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0" />
     </ItemGroup>
 
 </Project>
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>net48;net6.0</TargetFrameworks>
+      <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
       <AssemblyName>SkbKontur.TypeScript.ContractGenerator.Tests</AssemblyName>
       <RootNamespace>SkbKontur.TypeScript.ContractGenerator.Tests</RootNamespace>
     </PropertyGroup>
@@ -12,11 +12,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="DiffPlex" Version="1.7.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" />
+      <PackageReference Include="DiffPlex" Version="1.7.1" />
+      <PackageReference Include="FluentAssertions" Version="6.11.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+      <PackageReference Include="NUnit" Version="3.13.3" />
+      <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     </ItemGroup>
 
     <ItemGroup>

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