From 0dd1dcca32d8ea0f14c8c31c7072b2a5a722f6a9 Mon Sep 17 00:00:00 2001 From: Stephan van Rooij <1292510+svrooij@users.noreply.github.com> Date: Tue, 5 Sep 2023 15:30:33 +0200 Subject: [PATCH 1/2] Dotnet 6/7 upgrade, no more preview packages --- .../NuGetKeyVaultSignTool.Core.csproj | 18 +++++++++++------- .../NuGetKeyVaultSignTool.csproj | 13 +++++++++---- azure-pipelines.yml | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj b/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj index 82cb6ea..dda1026 100644 --- a/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj +++ b/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj @@ -1,21 +1,25 @@  - netcoreapp3.1;net5.0 + net6.0;net7.0 - - - + + - + - - + + + + + + + diff --git a/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj b/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj index ca02693..3ece863 100644 --- a/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj +++ b/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj @@ -2,17 +2,22 @@ Exe - netcoreapp3.1;net5.0;net6.0 + net7.0;net6.0 true Major - - - + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a2b8663..f6edcdc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,7 @@ stages: - task: UseDotNet@2 displayName: 'Use .NET Core SDK 6.x' inputs: - version: 6.x + version: 7.x includePreviewVersions: true - task: DotNetCoreCLI@2 From 64f444d561a3b54aef9959e93563fed036ae28f3 Mon Sep 17 00:00:00 2001 From: Stephan van Rooij <1292510+svrooij@users.noreply.github.com> Date: Tue, 5 Sep 2023 15:34:01 +0200 Subject: [PATCH 2/2] chore: Fixed references --- .../NuGetKeyVaultSignTool.Core.csproj | 10 ++-------- NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj | 5 +---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj b/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj index dda1026..a0bf3b3 100644 --- a/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj +++ b/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj @@ -10,14 +10,8 @@ - - - - - - - - + + diff --git a/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj b/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj index 3ece863..acfc06d 100644 --- a/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj +++ b/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj @@ -12,12 +12,9 @@ - - - - +