Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the Project to dot net 8 #82

Merged
merged 9 commits into from
Feb 16, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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/**/*
path: artifacts/**/*
16 changes: 2 additions & 14 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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/**/*
8 changes: 2 additions & 6 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -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 }
exec { & dotnet pack .\src\AutoMapper.Collection.EntityFrameworkCore\AutoMapper.Collection.EntityFrameworkCore.csproj -c Release -o $artifacts --no-build }
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>AutoMapper.Collection.EntityFrameworkCore.Tests</AssemblyName>
<IsPackable>false</IsPackable>
</PropertyGroup>
@@ -11,8 +11,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
<PackageReference Include="AutoMapper" Version="14.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
</ItemGroup>

<ItemGroup>
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Collection updating support for EntityFrameworkCore with AutoMapper. Extends DBSet&lt;T&gt; with Persist&lt;TDto&gt;().InsertUpdate(dto) and Persist&lt;TDto&gt;().Delete(dto). Will find the matching object and will Insert/Update/Delete.</Description>
<Authors>Tyler Carlson</Authors>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>AutoMapper.Collection.EntityFrameworkCore</AssemblyName>
<PackageId>AutoMapper.Collection.EntityFrameworkCore</PackageId>
<PackageIcon>icon.png</PackageIcon>
@@ -24,9 +24,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper.Collection" Version="[10.0.0,11.0.0)" />
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[7.0.0,8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="AutoMapper.Collection" Version="[11.0.0,12.0.0)" />
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[8.0.0,9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
</ItemGroup>

<ItemGroup>