diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 51dfae2..3fb09bb 100644
--- 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
index d3ec2e7..5b9556d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,7 +19,7 @@
-
+
diff --git a/README.md b/README.md
index 76bd70e..b83193f 100644
--- 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
index ab8d7b6..ca7684c 100644
--- a/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj
+++ b/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj b/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj
index 4c97ffd..cb8006d 100644
--- a/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj
+++ b/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj b/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj
index 34e5689..5c3eed5 100644
--- a/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj
+++ b/TypeScript.ContractGenerator.Tests/TypeScript.ContractGenerator.Tests.csproj
@@ -1,7 +1,7 @@
- net48;net6.0
+ net48;net6.0;net7.0
SkbKontur.TypeScript.ContractGenerator.Tests
SkbKontur.TypeScript.ContractGenerator.Tests
@@ -12,11 +12,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/global.json b/global.json
index d6c2c37..ece2da4 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "6.0.100",
+ "version": "7.0.0",
"rollForward": "latestFeature"
}
}
\ No newline at end of file