From 1722f133320f05649d2f41f032c7f4555d7bc353 Mon Sep 17 00:00:00 2001 From: Alexander Dobrynin Date: Wed, 3 May 2023 12:41:05 +0400 Subject: [PATCH 1/3] run tests againt net7.0, bump dependencies --- .github/workflows/actions.yml | 6 ++---- Directory.Build.props | 2 +- .../TypeScript.ContractGenerator.Cli.csproj | 2 +- .../TypeScript.ContractGenerator.Roslyn.csproj | 2 +- .../TypeScript.ContractGenerator.Tests.csproj | 12 ++++++------ global.json | 2 +- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 51dfae2..511710b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -3,8 +3,6 @@ on: paths-ignore: - "**/*.md" pull_request: -env: - DOTNET_VERSION: 6.0.x 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/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 From 77283c8b1f245dd425d94f26b146b0d9c8ea2d06 Mon Sep 17 00:00:00 2001 From: Alexander Dobrynin Date: Wed, 3 May 2023 12:52:55 +0400 Subject: [PATCH 2/3] fix build status badge in readme --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 From df3d7d9b656ac47a3209cd79fa28349234034d7b Mon Sep 17 00:00:00 2001 From: Alexander Dobrynin Date: Wed, 3 May 2023 12:56:52 +0400 Subject: [PATCH 3/3] fix gh actions pull_request event trigger --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 511710b..3fb09bb 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -2,7 +2,7 @@ on: push: paths-ignore: - "**/*.md" - pull_request: + pull_request: jobs: test: runs-on: windows-2019