From 41e9ec24011526777eda9e48092c94d465bb83a5 Mon Sep 17 00:00:00 2001 From: Ahmed Abdel-Razek Date: Sun, 16 Feb 2025 13:55:52 +0200 Subject: [PATCH 1/9] Update the Project to dot net 8 --- ...AutoMapper.Collection.EntityFrameworkCore.Tests.csproj | 6 +++--- .../AutoMapper.Collection.EntityFrameworkCore.csproj | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj index 5dfdd57..519b9e0 100644 --- a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj +++ b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 AutoMapper.Collection.EntityFrameworkCore.Tests false @@ -11,8 +11,8 @@ - - + + diff --git a/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj b/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj index f166c59..0a99925 100644 --- a/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj +++ b/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ Collection updating support for EntityFrameworkCore with AutoMapper. Extends DBSet<T> with Persist<TDto>().InsertUpdate(dto) and Persist<TDto>().Delete(dto). Will find the matching object and will Insert/Update/Delete. Tyler Carlson - net6.0 + net8.0 AutoMapper.Collection.EntityFrameworkCore AutoMapper.Collection.EntityFrameworkCore icon.png @@ -24,9 +24,9 @@ - - - + + + From f5e00ea1719e552e55fabcbb86391725daa212a7 Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 14:37:53 +0200 Subject: [PATCH 2/9] hard code the latest EF version --- .../AutoMapper.Collection.EntityFrameworkCore.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj index 519b9e0..766ceec 100644 --- a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj +++ b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj @@ -12,7 +12,7 @@ - + From 1aee4e49a507efcd311c439c664b245dfa9a02cc Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 14:38:26 +0200 Subject: [PATCH 3/9] hard code the latest EF version --- .../AutoMapper.Collection.EntityFrameworkCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj b/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj index 0a99925..b5a934d 100644 --- a/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj +++ b/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj @@ -26,7 +26,7 @@ - + From 23d3317ccce509e8622be17f0cb0a4406e09ae80 Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 14:41:36 +0200 Subject: [PATCH 4/9] upgrade actions --- .github/workflows/ci.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5030ee0..255665a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,21 +14,9 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup .NET Core 3.1 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.x - - name: Setup .NET Core 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.x' - include-prerelease: true - - name: Dotnet info - run: dotnet --info - shell: pwsh - name: Build and Test run: ./Build.ps1 shell: pwsh @@ -39,8 +27,8 @@ jobs: run: ./Push.ps1 shell: pwsh - name: Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: artifacts - path: artifacts/**/* \ No newline at end of file + path: artifacts/**/* From 7610b6c37f770d8231f026a2bfa39c45321d6503 Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 14:42:21 +0200 Subject: [PATCH 5/9] upgrade actions --- .github/workflows/release.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5ac9c5..1b7b78f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,21 +11,9 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup .NET Core 3.1 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.x - - name: Setup .NET Core 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.x' - include-prerelease: true - - name: Dotnet info - run: dotnet --info - shell: pwsh - name: Build and Test run: ./Build.ps1 shell: pwsh @@ -42,7 +30,7 @@ jobs: run: ./Push.ps1 shell: pwsh - name: Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: artifacts path: artifacts/**/* From 9ea984c59163cd37042181a56a87449b24389dde Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 14:51:04 +0200 Subject: [PATCH 6/9] Update for .net 9 SDK --- build.ps1 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build.ps1 b/build.ps1 index 5a228c5..f78e52a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -26,10 +26,6 @@ $artifacts = ".\artifacts" if(Test-Path $artifacts) { Remove-Item $artifacts -Force -Recurse } -exec { & dotnet clean -c Release } +exec { & dotnet test -c Release --results-directory $artifacts -l trx } -exec { & dotnet build -c Release } - -exec { & dotnet test -c Release -r $artifacts --no-build -l trx --verbosity=normal } - -exec { & dotnet pack .\AutoMapper.Collection.EFCore.sln -c Release -o $artifacts --no-build } \ No newline at end of file +exec { & dotnet pack .\src\AutoMapper\AutoMapper.csproj -c Release -o $artifacts --no-build } From d513f8439324afd78db6ad962581ce49460d5445 Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 14:57:37 +0200 Subject: [PATCH 7/9] the right project name --- build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index f78e52a..467d22a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -28,4 +28,4 @@ if(Test-Path $artifacts) { Remove-Item $artifacts -Force -Recurse } exec { & dotnet test -c Release --results-directory $artifacts -l trx } -exec { & dotnet pack .\src\AutoMapper\AutoMapper.csproj -c Release -o $artifacts --no-build } +exec { & dotnet pack .\src\AutoMapper\AutoMapper.Collection.EFCore.csproj -c Release -o $artifacts --no-build } From 171cb57ce6a2d9b64b5aba536b754b4d3ae0185b Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 15:00:44 +0200 Subject: [PATCH 8/9] the right project path --- build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index 467d22a..08291ad 100644 --- a/build.ps1 +++ b/build.ps1 @@ -28,4 +28,4 @@ if(Test-Path $artifacts) { Remove-Item $artifacts -Force -Recurse } exec { & dotnet test -c Release --results-directory $artifacts -l trx } -exec { & dotnet pack .\src\AutoMapper\AutoMapper.Collection.EFCore.csproj -c Release -o $artifacts --no-build } +exec { & dotnet pack .\src\AutoMapper.Collection.EFCore\AutoMapper.Collection.EFCore.csproj -c Release -o $artifacts --no-build } From f68fdcf1581d33d8dd8c82c2b355864369d839b4 Mon Sep 17 00:00:00 2001 From: Lucian Bargaoanu Date: Sun, 16 Feb 2025 15:06:41 +0200 Subject: [PATCH 9/9] fix the project path --- build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index 08291ad..9e80216 100644 --- a/build.ps1 +++ b/build.ps1 @@ -28,4 +28,4 @@ if(Test-Path $artifacts) { Remove-Item $artifacts -Force -Recurse } exec { & dotnet test -c Release --results-directory $artifacts -l trx } -exec { & dotnet pack .\src\AutoMapper.Collection.EFCore\AutoMapper.Collection.EFCore.csproj -c Release -o $artifacts --no-build } +exec { & dotnet pack .\src\AutoMapper.Collection.EntityFrameworkCore\AutoMapper.Collection.EntityFrameworkCore.csproj -c Release -o $artifacts --no-build }