From 598a2bc046d92f99b3f977db0377f856f0266234 Mon Sep 17 00:00:00 2001 From: Ruben Schmidmeister <4602612+bash@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:02:03 +0100 Subject: [PATCH 1/3] Update SDK and Language version to 7.0/11 --- .../Funcky.EntityFrameworkCore.Test.csproj | 2 +- Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj | 2 +- global.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj b/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj index 39af522..d90a712 100644 --- a/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj +++ b/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj @@ -1,7 +1,7 @@ net6.0 - 10.0 + 11.0 enable enable false diff --git a/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj b/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj index 2bed365..40a0b5d 100644 --- a/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj +++ b/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ netstandard2.0 - 10.0 + 11.0 enable enable Interoperability between Funcky and EF Core diff --git a/global.json b/global.json index bf6fe95..b88bd2a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.201", + "version": "7.0.100", "rollForward": "latestFeature" }, "msbuild-sdks": { From 3f66971cd96387200ebff68f91a6c35c9a5d28d7 Mon Sep 17 00:00:00 2001 From: Ruben Schmidmeister <4602612+bash@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:04:22 +0100 Subject: [PATCH 2/3] Use NuGet's central package management feature --- Directory.Packages.props | 24 +++++++++++++++++++ .../Funcky.EntityFrameworkCore.Test.csproj | 2 +- Funcky.EntityFrameworkCore.sln | 3 ++- .../Funcky.EntityFrameworkCore.csproj | 2 +- NuGet.config | 12 ++++++++++ Packages.props | 21 ---------------- global.json | 3 --- 7 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 NuGet.config delete mode 100644 Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..210e84c --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,24 @@ + + + + true + + + + + + + + + + + + + + + + + + + + diff --git a/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj b/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj index d90a712..bf5a7ca 100644 --- a/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj +++ b/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj @@ -1,4 +1,4 @@ - + net6.0 11.0 diff --git a/Funcky.EntityFrameworkCore.sln b/Funcky.EntityFrameworkCore.sln index 8c33085..7da0f6b 100644 --- a/Funcky.EntityFrameworkCore.sln +++ b/Funcky.EntityFrameworkCore.sln @@ -16,7 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Confi ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props global.json = global.json - Packages.props = Packages.props + Directory.Packages.props = Directory.Packages.props + NuGet.config = NuGet.config EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Funcky.EntityFrameworkCore", "Funcky.EntityFrameworkCore\Funcky.EntityFrameworkCore.csproj", "{BB5D39BA-57A3-4C41-BDB8-77CA97D0EBC9}" diff --git a/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj b/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj index 40a0b5d..ead5195 100644 --- a/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj +++ b/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 11.0 diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 0000000..68edd0e --- /dev/null +++ b/NuGet.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Packages.props b/Packages.props deleted file mode 100644 index 04d4a66..0000000 --- a/Packages.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/global.json b/global.json index b88bd2a..857e668 100644 --- a/global.json +++ b/global.json @@ -2,8 +2,5 @@ "sdk": { "version": "7.0.100", "rollForward": "latestFeature" - }, - "msbuild-sdks": { - "Microsoft.Build.CentralPackageVersions": "2.1.3" } } From d1345eb19903132bf15f15b9b40d31debfa780e3 Mon Sep 17 00:00:00 2001 From: Ruben Schmidmeister <4602612+bash@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:05:52 +0100 Subject: [PATCH 3/3] Run tests against net7.0 runtime --- .../Funcky.EntityFrameworkCore.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj b/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj index bf5a7ca..08d72a9 100644 --- a/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj +++ b/Funcky.EntityFrameworkCore.Test/Funcky.EntityFrameworkCore.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 11.0 enable enable