From 7dd69598a02cb27c18758713fced78d824094ec3 Mon Sep 17 00:00:00 2001 From: jericho Date: Mon, 6 Nov 2023 21:24:13 -0500 Subject: [PATCH 1/5] Upgrade from netstandard2.0 to netstandard2.1 and drop net48 --- src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj | 2 +- .../GitReleaseManager.Core.Tests.csproj | 2 +- src/GitReleaseManager.Core/GitReleaseManager.Core.csproj | 4 ++-- .../GitReleaseManager.IntegrationTests.csproj | 2 +- src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj index cc06b907..eef6e0f8 100644 --- a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj +++ b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj @@ -3,7 +3,7 @@ 8.0 Exe GitReleaseManager - net48;net6.0;net7.0 + net6.0;net7.0 GitReleaseManager.Cli Create release notes in markdown given a milestone false diff --git a/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj b/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj index 4ae08b93..69bd1943 100644 --- a/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj +++ b/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj @@ -1,7 +1,7 @@ 8.0 - net48;net6.0;net7.0 + net6.0;net7.0 GitReleaseManager.Core.Tests Test Project for GitReleaseManager.Core $(NoWarn);CA1707;Serilog004; diff --git a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj index e25f50b6..4b6d1ca3 100644 --- a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj +++ b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj @@ -4,7 +4,7 @@ 8.0 - netstandard2.0 + netstandard2.1 GitReleaseManager.Core Create release notes in markdown given a milestone false @@ -27,7 +27,7 @@ - + diff --git a/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj b/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj index d4cd1cdd..b3cbb460 100644 --- a/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj +++ b/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj @@ -1,7 +1,7 @@ 8.0 - net48;net6.0;net7.0 + net6.0;net7.0 GitReleaseManager.IntegrationTests Integration Test Project for GitReleaseManager $(NoWarn);CA1707;Serilog004; diff --git a/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj b/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj index ebd09584..b57ee53e 100644 --- a/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj +++ b/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj @@ -1,7 +1,7 @@ 8.0 - net48;net6.0;net7.0 + net6.0;net7.0 GitReleaseManager.Tests Test Project for GitReleaseManager $(NoWarn);CA1707;Serilog004; From 3052df371e5f2cec8eee507a9f773b79076c0ad2 Mon Sep 17 00:00:00 2001 From: jericho Date: Sat, 11 Nov 2023 11:27:25 -0500 Subject: [PATCH 2/5] Switch Cli to only net6.0 and Core to net6.0 and net7.0 --- src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj | 2 +- src/GitReleaseManager.Core/GitReleaseManager.Core.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj index eef6e0f8..8c49e310 100644 --- a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj +++ b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj @@ -3,7 +3,7 @@ 8.0 Exe GitReleaseManager - net6.0;net7.0 + net6.0 GitReleaseManager.Cli Create release notes in markdown given a milestone false diff --git a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj index 4b6d1ca3..14b5c543 100644 --- a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj +++ b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj @@ -4,7 +4,7 @@ 8.0 - netstandard2.1 + net6.0;net7.0 GitReleaseManager.Core Create release notes in markdown given a milestone false From 2a4bbd06aea2cd5dc99059401717a33974376271 Mon Sep 17 00:00:00 2001 From: jericho Date: Sat, 11 Nov 2023 11:34:56 -0500 Subject: [PATCH 3/5] Adjust the nuget nuspec and the chocolatey nuspec to reflect the fact the GitReleaseMAnager.Cli targets net6.0 --- nuspec/chocolatey/GitReleaseManager.Portable.nuspec | 8 ++++---- nuspec/nuget/GitReleaseManager.nuspec | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nuspec/chocolatey/GitReleaseManager.Portable.nuspec b/nuspec/chocolatey/GitReleaseManager.Portable.nuspec index 9fd8a10b..cc7b43d7 100644 --- a/nuspec/chocolatey/GitReleaseManager.Portable.nuspec +++ b/nuspec/chocolatey/GitReleaseManager.Portable.nuspec @@ -19,10 +19,10 @@ github release notes create export - - - - + + + + diff --git a/nuspec/nuget/GitReleaseManager.nuspec b/nuspec/nuget/GitReleaseManager.nuspec index cb39cbff..fc5e4065 100644 --- a/nuspec/nuget/GitReleaseManager.nuspec +++ b/nuspec/nuget/GitReleaseManager.nuspec @@ -20,11 +20,11 @@ github release notes create export - - - - - + + + + + \ No newline at end of file From f4265e2fe91eb3a3887b91b85c23af7318944d6f Mon Sep 17 00:00:00 2001 From: Jericho <112710+Jericho@users.noreply.github.com> Date: Sat, 11 Nov 2023 16:53:22 -0500 Subject: [PATCH 4/5] Update src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj I'll commit your suggestion and we can change the runtime identifier if necessary Co-authored-by: Gary Ewan Park --- src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj index 8c49e310..834a37e4 100644 --- a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj +++ b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj @@ -4,6 +4,9 @@ Exe GitReleaseManager net6.0 + true + true + win-x64 GitReleaseManager.Cli Create release notes in markdown given a milestone false From 7b973194729f2a1da85b938c7d122fe23a44d24e Mon Sep 17 00:00:00 2001 From: jericho Date: Sat, 11 Nov 2023 16:59:31 -0500 Subject: [PATCH 5/5] Remove unnecessary entries in nuspec files --- nuspec/chocolatey/GitReleaseManager.Portable.nuspec | 2 -- nuspec/nuget/GitReleaseManager.nuspec | 2 -- 2 files changed, 4 deletions(-) diff --git a/nuspec/chocolatey/GitReleaseManager.Portable.nuspec b/nuspec/chocolatey/GitReleaseManager.Portable.nuspec index cc7b43d7..23b0efde 100644 --- a/nuspec/chocolatey/GitReleaseManager.Portable.nuspec +++ b/nuspec/chocolatey/GitReleaseManager.Portable.nuspec @@ -20,9 +20,7 @@ - - diff --git a/nuspec/nuget/GitReleaseManager.nuspec b/nuspec/nuget/GitReleaseManager.nuspec index fc5e4065..27de86f7 100644 --- a/nuspec/nuget/GitReleaseManager.nuspec +++ b/nuspec/nuget/GitReleaseManager.nuspec @@ -21,9 +21,7 @@ - -