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/**/* 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/**/* diff --git a/build.ps1 b/build.ps1 index 5a228c5..9e80216 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.Collection.EntityFrameworkCore\AutoMapper.Collection.EntityFrameworkCore.csproj -c Release -o $artifacts --no-build } 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..766ceec 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..b5a934d 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 @@ - - - + + +