From 7f55de1d2025df69c37a6972c6f4155e9b8079af Mon Sep 17 00:00:00 2001 From: Marcel Juen Date: Fri, 19 Nov 2021 01:54:06 +0100 Subject: [PATCH 1/3] Updated NuGet dependencies to latest version, switched Enum.Ext.EFCore from .NET Standard to .NET 6 to support newest EF Core Version --- .../Enum.Ext.AutoFixture.Tests.csproj | 10 +++++----- .../Enum.Ext.AutoFixture.csproj | 4 ++-- .../Enum.Ext.EFCore.Tests.csproj | 16 ++++++++-------- Enum.Ext/Enum.Ext.EFCore/Enum.Ext.EFCore.csproj | 6 +++--- .../Enum.Ext.NewtonsoftJson.Tests.csproj | 10 +++++----- .../Enum.Ext.NewtonsoftJson.csproj | 4 ++-- .../Enum.Ext.SystemTextJson.Tests.csproj | 10 +++++----- .../Enum.Ext.SystemTextJson.csproj | 5 +++-- Enum.Ext/Enum.Ext.Tests/Enum.Ext.Tests.csproj | 10 +++++----- 9 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Enum.Ext/Enum.Ext.AutoFixture.Tests/Enum.Ext.AutoFixture.Tests.csproj b/Enum.Ext/Enum.Ext.AutoFixture.Tests/Enum.Ext.AutoFixture.Tests.csproj index 7cb37ec..de1db99 100644 --- a/Enum.Ext/Enum.Ext.AutoFixture.Tests/Enum.Ext.AutoFixture.Tests.csproj +++ b/Enum.Ext/Enum.Ext.AutoFixture.Tests/Enum.Ext.AutoFixture.Tests.csproj @@ -1,20 +1,20 @@  - netcoreapp3.1 + net6.0 false 8.0 enable - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Enum.Ext/Enum.Ext.AutoFixture/Enum.Ext.AutoFixture.csproj b/Enum.Ext/Enum.Ext.AutoFixture/Enum.Ext.AutoFixture.csproj index eb9e07a..0bffb53 100644 --- a/Enum.Ext/Enum.Ext.AutoFixture/Enum.Ext.AutoFixture.csproj +++ b/Enum.Ext/Enum.Ext.AutoFixture/Enum.Ext.AutoFixture.csproj @@ -3,7 +3,7 @@ netstandard2.0 true - 1.0.6.0 + 1.0.7 Mauracher Simon, Juen Marcel https://github.com/simonmau/enum_ext https://github.com/simonmau/enum_ext @@ -22,7 +22,7 @@ - + diff --git a/Enum.Ext/Enum.Ext.EFCore.Tests/Enum.Ext.EFCore.Tests.csproj b/Enum.Ext/Enum.Ext.EFCore.Tests/Enum.Ext.EFCore.Tests.csproj index ef72c46..205443b 100644 --- a/Enum.Ext/Enum.Ext.EFCore.Tests/Enum.Ext.EFCore.Tests.csproj +++ b/Enum.Ext/Enum.Ext.EFCore.Tests/Enum.Ext.EFCore.Tests.csproj @@ -1,26 +1,26 @@  - netcoreapp3.1 + net6.0 false 8.0 enable - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Enum.Ext/Enum.Ext.EFCore/Enum.Ext.EFCore.csproj b/Enum.Ext/Enum.Ext.EFCore/Enum.Ext.EFCore.csproj index dc17ebe..1f0b8de 100644 --- a/Enum.Ext/Enum.Ext.EFCore/Enum.Ext.EFCore.csproj +++ b/Enum.Ext/Enum.Ext.EFCore/Enum.Ext.EFCore.csproj @@ -1,9 +1,9 @@  - netstandard2.0 + net6.0 true - 1.0.6.0 + 1.0.7 Mauracher Simon, Juen Marcel https://github.com/simonmau/enum_ext https://github.com/simonmau/enum_ext @@ -23,7 +23,7 @@ - + diff --git a/Enum.Ext/Enum.Ext.NewtonsoftJson.Tests/Enum.Ext.NewtonsoftJson.Tests.csproj b/Enum.Ext/Enum.Ext.NewtonsoftJson.Tests/Enum.Ext.NewtonsoftJson.Tests.csproj index 8f47c2d..4825b97 100644 --- a/Enum.Ext/Enum.Ext.NewtonsoftJson.Tests/Enum.Ext.NewtonsoftJson.Tests.csproj +++ b/Enum.Ext/Enum.Ext.NewtonsoftJson.Tests/Enum.Ext.NewtonsoftJson.Tests.csproj @@ -1,19 +1,19 @@  - netcoreapp3.1 + net6.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Enum.Ext/Enum.Ext.NewtonsoftJson/Enum.Ext.NewtonsoftJson.csproj b/Enum.Ext/Enum.Ext.NewtonsoftJson/Enum.Ext.NewtonsoftJson.csproj index c57bae2..2b4e50b 100644 --- a/Enum.Ext/Enum.Ext.NewtonsoftJson/Enum.Ext.NewtonsoftJson.csproj +++ b/Enum.Ext/Enum.Ext.NewtonsoftJson/Enum.Ext.NewtonsoftJson.csproj @@ -3,7 +3,7 @@ netstandard2.0 true - 1.0.6.0 + 1.0.7 Mauracher Simon, Juen Marcel https://github.com/simonmau/enum_ext https://github.com/simonmau/enum_ext @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/Enum.Ext/Enum.Ext.SystemTextJson.Tests/Enum.Ext.SystemTextJson.Tests.csproj b/Enum.Ext/Enum.Ext.SystemTextJson.Tests/Enum.Ext.SystemTextJson.Tests.csproj index 3739b3d..af46188 100644 --- a/Enum.Ext/Enum.Ext.SystemTextJson.Tests/Enum.Ext.SystemTextJson.Tests.csproj +++ b/Enum.Ext/Enum.Ext.SystemTextJson.Tests/Enum.Ext.SystemTextJson.Tests.csproj @@ -1,19 +1,19 @@ - netcoreapp3.1 + net6.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Enum.Ext/Enum.Ext.SystemTextJson/Enum.Ext.SystemTextJson.csproj b/Enum.Ext/Enum.Ext.SystemTextJson/Enum.Ext.SystemTextJson.csproj index be6607c..a349fdb 100644 --- a/Enum.Ext/Enum.Ext.SystemTextJson/Enum.Ext.SystemTextJson.csproj +++ b/Enum.Ext/Enum.Ext.SystemTextJson/Enum.Ext.SystemTextJson.csproj @@ -3,13 +3,14 @@ netstandard2.0 true - 1.0.6.0 + 1.0.7 Mauracher Simon, Juen Marcel https://github.com/simonmau/enum_ext https://github.com/simonmau/enum_ext LICENSE https://github.com/simonmau/enum_ext/blob/master/Resources/Logo/EXT_64.png?raw=true This package adds System.Text.Json converters for Enum.Ext + abd1bbdc-afb7-474a-96a5-5d9850cb8551 @@ -21,7 +22,7 @@ - + diff --git a/Enum.Ext/Enum.Ext.Tests/Enum.Ext.Tests.csproj b/Enum.Ext/Enum.Ext.Tests/Enum.Ext.Tests.csproj index 3624e21..ce41319 100644 --- a/Enum.Ext/Enum.Ext.Tests/Enum.Ext.Tests.csproj +++ b/Enum.Ext/Enum.Ext.Tests/Enum.Ext.Tests.csproj @@ -1,20 +1,20 @@  - netcoreapp3.1 + net6.0 false 8.0 enable - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 3c2df9ac4644bfb1e884b76c53a5afae1a1fc1f4 Mon Sep 17 00:00:00 2001 From: Marcel Juen Date: Fri, 19 Nov 2021 01:54:41 +0100 Subject: [PATCH 2/3] Updated version number --- Enum.Ext/Enum.Ext/Enum.Ext.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Enum.Ext/Enum.Ext/Enum.Ext.csproj b/Enum.Ext/Enum.Ext/Enum.Ext.csproj index b20e5de..7d8d7a7 100644 --- a/Enum.Ext/Enum.Ext/Enum.Ext.csproj +++ b/Enum.Ext/Enum.Ext/Enum.Ext.csproj @@ -3,7 +3,7 @@ netstandard2.0 true - 1.0.6 + 1.0.7 Mauracher Simon, Juen Marcel https://github.com/simonmau/enum_ext https://github.com/simonmau/enum_ext From 66a0d8e26feaea3e991c24b37ba2384703efc266 Mon Sep 17 00:00:00 2001 From: Marcel Juen Date: Fri, 19 Nov 2021 02:02:47 +0100 Subject: [PATCH 3/3] Updated pipeline to use .NET 6 SDK --- azure-pipelines.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1bf809d..f7996c5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,24 +1,24 @@ trigger: -- master + - master pool: vmImage: 'ubuntu-latest' steps: -- task: UseDotNet@2 - inputs: - version: '3.1.100' - packageType: 'sdk' + - task: UseDotNet@2 + inputs: + version: '6.x' + packageType: 'sdk' -- task: DotNetCoreCLI@2 - displayName: Build - inputs: - command: build - projects: '**/*.csproj' - arguments: '--configuration Release' # Update this to match your need + - task: DotNetCoreCLI@2 + displayName: Build + inputs: + command: build + projects: '**/*.csproj' + arguments: '--configuration Release' # Update this to match your need -- task: DotNetCoreCLI@2 - inputs: - command: test - projects: '**/*Test*/*.csproj' - arguments: '--configuration $(buildConfiguration) --collect "Code coverage"' \ No newline at end of file + - task: DotNetCoreCLI@2 + inputs: + command: test + projects: '**/*Test*/*.csproj' + arguments: '--configuration $(buildConfiguration) --collect "Code coverage"' \ No newline at end of file