From 7fa954e1a2137f136b803b87b4a63fc739b45b3e Mon Sep 17 00:00:00 2001 From: Eric Renken Date: Tue, 31 Dec 2024 01:04:59 -0500 Subject: [PATCH 1/2] Update project files for multi-targeting and dependencies - Updated `QuerySample`, `myNOC.EntityFramework.Query`, and `myNOC.Tests.EntityFramework.Query` to target `net8.0` and `net9.0`, with language version set to `13.0`. - Upgraded `Microsoft.EntityFrameworkCore` and `Microsoft.EntityFrameworkCore.InMemory` packages from `8.0.3` to `9.0.0`. - Updated copyright year in `myNOC.EntityFramework.Query` from `2023` to `2025`. - Revised versions of testing-related packages in `myNOC.Tests.EntityFramework.Query`. - Made minor structural adjustments for consistency in project files. --- sample/QuerySample/QuerySample.csproj | 29 ++++++------ .../myNOC.EntityFramework.Query.csproj | 8 ++-- .../myNOC.Tests.EntityFramework.Query.csproj | 45 ++++++++++--------- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/sample/QuerySample/QuerySample.csproj b/sample/QuerySample/QuerySample.csproj index 5209dfc..70b1076 100644 --- a/sample/QuerySample/QuerySample.csproj +++ b/sample/QuerySample/QuerySample.csproj @@ -1,19 +1,20 @@ - + - - Exe - net8.0 - enable - enable - + + net8.0;net9.0 + 13.0 + Exe + enable + enable + - - - - + + + + - - - + + + diff --git a/src/myNOC.EntityFramework.Query/myNOC.EntityFramework.Query.csproj b/src/myNOC.EntityFramework.Query/myNOC.EntityFramework.Query.csproj index 107b6c2..c92b641 100644 --- a/src/myNOC.EntityFramework.Query/myNOC.EntityFramework.Query.csproj +++ b/src/myNOC.EntityFramework.Query/myNOC.EntityFramework.Query.csproj @@ -1,8 +1,8 @@ - net8.0 - 12.0 + net8.0;net9.0 + 13.0 enable enable snupkg @@ -17,7 +17,7 @@ Implements a Query Pattern to be used with EntityFramework README.md LICENSE.txt - Copyright © myNOC LLC 2023 + Copyright © myNOC LLC 2025 $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb @@ -33,7 +33,7 @@ - + diff --git a/tests/myNOC.Tests.EntityFramework.Query/myNOC.Tests.EntityFramework.Query.csproj b/tests/myNOC.Tests.EntityFramework.Query/myNOC.Tests.EntityFramework.Query.csproj index ae0b1aa..f1a654a 100644 --- a/tests/myNOC.Tests.EntityFramework.Query/myNOC.Tests.EntityFramework.Query.csproj +++ b/tests/myNOC.Tests.EntityFramework.Query/myNOC.Tests.EntityFramework.Query.csproj @@ -1,28 +1,29 @@ - + - - net8.0 - enable - enable + + net8.0;net9.0 + 13.0 + enable + enable - false - true - + false + true + - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - - + + + From 0cebb6e8c871a4a2543ff348558e5784e0a06705 Mon Sep 17 00:00:00 2001 From: Eric Renken Date: Tue, 31 Dec 2024 01:07:33 -0500 Subject: [PATCH 2/2] Add support for .NET Core 9 in workflows This commit adds a new step to set up .NET Core 9 in both the `build-tests.yml` and `release.yml` files, while retaining the existing setup for .NET Core 8. This update enables the workflows to support both .NET Core 8 and 9 during build and release processes. --- .github/workflows/build-tests.yml | 7 ++++++- .github/workflows/release.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml index 63dc3dc..26cb16e 100644 --- a/.github/workflows/build-tests.yml +++ b/.github/workflows/build-tests.yml @@ -11,11 +11,16 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core + - name: Setup .NET Core 8 uses: actions/setup-dotnet@v1 with: dotnet-version: 8.x + - name: Setup .NET Core 9 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 9.x + - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5fa2e08..e2e3f00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,11 +24,16 @@ jobs: with: useConfigFile: true - - name: Setup .NET Core + - name: Setup .NET Core 8 uses: actions/setup-dotnet@v1 with: dotnet-version: 8.x + - name: Setup .NET Core 9 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 9.x + - name: Install dependencies run: dotnet restore