From 4b112191917369d49dbc635be9721caf79a6a2ff Mon Sep 17 00:00:00 2001 From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com> Date: Fri, 19 May 2023 20:12:02 +0200 Subject: [PATCH 1/5] Add NET 7.0 --- .github/workflows/build.yml | 12 ++++-------- src/Directory.Build.props | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6097be0..096f05d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,15 +38,11 @@ jobs: echo ("Copyright=" + $Copyright) >> $Env:GITHUB_ENV shell: pwsh - - name: Setup .NET Core SDK 5.0.x + - name: Setup .NET Core SDK uses: actions/setup-dotnet@v1.7.2 - with: - dotnet-version: 5.0.x - - - name: Setup .NET Core SDK 6.0.x - uses: actions/setup-dotnet@v1.7.2 - with: - dotnet-version: 6.0.x + with: | + 6.0.x + 7.0.x - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.9 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b790428..d7f3dc9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - + https://github.com/Shazwazza/Smidge true true @@ -23,6 +23,6 @@ 4.0.0 - net6.0;net5.0;netcoreapp3.1 + net7.0;net6.0 From 83152d8b72a704d182896efe62f2474c32b9daa5 Mon Sep 17 00:00:00 2001 From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com> Date: Fri, 19 May 2023 21:31:39 +0200 Subject: [PATCH 2/5] Update build.yml --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 096f05d..b778d20 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,9 +40,10 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v1.7.2 - with: | - 6.0.x - 7.0.x + with: + dotnet-version: | + 6.0.x + 7.0.x - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.9 From 044fe7eaeac8226e35c34cb2c70869b978e8a15d Mon Sep 17 00:00:00 2001 From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com> Date: Fri, 19 May 2023 21:35:06 +0200 Subject: [PATCH 3/5] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b778d20..b2ac2e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -39,7 +39,7 @@ jobs: shell: pwsh - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 6.0.x From 651952316325766f5248d3e4ed6e64ce6428bd2c Mon Sep 17 00:00:00 2001 From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com> Date: Fri, 19 May 2023 21:36:38 +0200 Subject: [PATCH 4/5] Update Directory.Build.props --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index d7f3dc9..a0f6ec9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -23,6 +23,6 @@ 4.0.0 - net7.0;net6.0 + net7.0;net6.0;net5.0 From 22594b417887903c6d4d1a4b1974c9df6db6ce3b Mon Sep 17 00:00:00 2001 From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com> Date: Fri, 19 May 2023 21:38:17 +0200 Subject: [PATCH 5/5] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2ac2e9..00a30ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | + 5.0.x 6.0.x 7.0.x