Merge pull request #129 from Tasteful/feature/ef63

Add support for EF 6.3

Author: TylerCarlson1

AutoMapper.Collection.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29411.108
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19AAEE83-5EEC-4EAA-9CF7-16F8ED58B50E}"
 	ProjectSection(SolutionItems) = preProject
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19AAEE
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{578F2483-CF08-409D-A316-31BCB7C5D9D0}"
 	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
 		Directory.Build.props = Directory.Build.props
 		global.json = global.json
 		README.md = README.md
@@ -22,9 +23,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Collection.Entit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Collection.LinqToSQL", "src\AutoMapper.Collection.LinqToSQL\AutoMapper.Collection.LinqToSQL.csproj", "{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoMapper.Collection.Tests", "src\AutoMapper.Collection.Tests\AutoMapper.Collection.Tests.csproj", "{2D3D34AD-6A0A-4382-9A2F-894F52D184A7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Collection.Tests", "src\AutoMapper.Collection.Tests\AutoMapper.Collection.Tests.csproj", "{2D3D34AD-6A0A-4382-9A2F-894F52D184A7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoMapper.Collection.EntityFramework.Tests", "src\AutoMapper.Collection.EntityFramework.Tests\AutoMapper.Collection.EntityFramework.Tests.csproj", "{BDE127AB-AC3F-44DF-BC33-210DAFD12E15}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Collection.EntityFramework.Tests", "src\AutoMapper.Collection.EntityFramework.Tests\AutoMapper.Collection.EntityFramework.Tests.csproj", "{BDE127AB-AC3F-44DF-BC33-210DAFD12E15}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Directory.Build.props

@@ -2,10 +2,18 @@
   <Import Project="version.props" />
 
   <PropertyGroup>
-    <EFVersion>6.1.3</EFVersion>
     <FluentAssertions>4.15.0</FluentAssertions>
     <TestSDKVersion>15.5.0</TestSDKVersion>
-    <xUnitVersion>2.3.1</xUnitVersion>
-    <SqlServerCompactVersion>4.0.8876.1</SqlServerCompactVersion>
+    <xUnitVersion>2.4.1</xUnitVersion>
+    <EffortVersion>2.2.1</EffortVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <EFVersion>6.1.3</EFVersion>
   </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.0' ">
+    <EFVersion>6.3.0</EFVersion>
+  </PropertyGroup>
+
 </Project>

appveyor.yml

@@ -5,9 +5,12 @@ branches:
   only:
     - master
     - development
-image: Visual Studio 2017
+image: Visual Studio 2019
 nuget:
   disable_publish_on_pr: true
+environment:
+  DOTNET_CLI_VERSION: 3.0.100
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
 build_script:
 - cmd: .\build.cmd
 test: off

build.ps1

@@ -38,9 +38,9 @@ task compile -depends clean {
 	$buildParam = @{ $true = ""; $false = "--version-suffix=$buildSuffix"}[$tag -ne $NULL -and $revision -ne "local"]
 	$packageParam = @{ $true = ""; $false = "--version-suffix=$suffix"}[$tag -ne $NULL -and $revision -ne "local"]
 
-	echo "build: Tag is $tag"
-	echo "build: Package version suffix is $suffix"
-	echo "build: Build version suffix is $buildSuffix" 
+	Write-Output "build: Tag is $tag"
+	Write-Output "build: Package version suffix is $suffix"
+	Write-Output "build: Build version suffix is $buildSuffix" 
 
 	# restore all project references (creating project.assets.json for each project)
 	exec { dotnet restore $base_dir\AutoMapper.Collection.sln /nologo }
@@ -60,29 +60,30 @@ task test {
 
 function Install-Dotnet
 {
-    $dotnetcli = where-is('dotnet')
+	$dotnetCli = (where-is "dotnet" | Select-Object -First 1)
+	$install = ($null -eq $dotnetCli -or ($null -ne $env:DOTNET_CLI_VERSION -and $null -eq (&"$dotnetCli" --info | Where-Object { $_ -like "  $env:DOTNET_CLI_VERSION*" })))
 
-    if($dotnetcli -eq $null)
-    {
+	if ($install)
+	{
 		$dotnetPath = "$pwd\.dotnet"
-		$dotnetCliVersion = if ($env:DOTNET_CLI_VERSION -eq $null) { 'Latest' } else { $env:DOTNET_CLI_VERSION }
-		$dotnetInstallScriptUrl = 'https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1'
-		$dotnetInstallScriptPath = '.\scripts\obtain\install.ps1'
+		$dotnetCliVersion = if ($null -eq $env:DOTNET_CLI_VERSION) { 'Latest' } else { $env:DOTNET_CLI_VERSION }
+		$dotnetInstallScriptUrl = 'https://raw.githubusercontent.com/dotnet/cli/v2.1.4/scripts/obtain/dotnet-install.ps1'
+		$dotnetInstallScriptPath = '.\scripts\obtain\dotnet-install.ps1'
 
-		md -Force ".\scripts\obtain\" | Out-Null
-		curl $dotnetInstallScriptUrl -OutFile $dotnetInstallScriptPath
-		& .\scripts\obtain\install.ps1 -Channel "preview" -version $dotnetCliVersion -InstallDir $dotnetPath -NoPath
+		mkdir -Force ".\scripts\obtain\" | Out-Null
+		Invoke-WebRequest $dotnetInstallScriptUrl -OutFile $dotnetInstallScriptPath
+		& .\scripts\obtain\dotnet-install.ps1 -Channel "preview" -version $dotnetCliVersion -InstallDir $dotnetPath -NoPath
 		$env:Path = "$dotnetPath;$env:Path"
 	}
 }
 
 function where-is($command) {
-    (ls env:\path).Value.split(';') | `
-        where { $_ } | `
-        %{ [System.Environment]::ExpandEnvironmentVariables($_) } | `
-        where { test-path $_ } |`
-        %{ ls "$_\*" -include *.bat,*.exe,*cmd } | `
-        %{  $file = $_.Name; `
+    (Get-ChildItem env:\path).Value.split(';') | `
+        Where-Object { $_ } | `
+        ForEach-Object{ [System.Environment]::ExpandEnvironmentVariables($_) } | `
+        Where-Object { test-path $_ } |`
+        ForEach-Object{ Get-ChildItem "$_\*" -include *.bat,*.exe,*cmd } | `
+        ForEach-Object{  $file = $_.Name; `
             if($file -and ($file -eq $command -or `
 			   $file -eq ($command + '.exe') -or  `
 			   $file -eq ($command + '.bat') -or  `
@@ -91,5 +92,5 @@ function where-is($command) {
                 $_.FullName `
             } `
         } | `
-        select -unique
+        Select-Object -unique
 }

src/AutoMapper.Collection.EntityFramework.Tests/App.config

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection.EntityFramework.Tests</AssemblyName>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -10,18 +10,12 @@
     <ProjectReference Include="..\AutoMapper.Collection.EntityFramework\AutoMapper.Collection.EntityFramework.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertions)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSDKVersion)" />
     <PackageReference Include="xunit" Version="$(xUnitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitVersion)" />
-    <PackageReference Include="EntityFramework.SqlServerCompact" Version="$(EfVersion)" />
-    <PackageReference Include="Microsoft.SqlServer.Compact" Version="$(SqlServerCompactVersion)" />
+    <PackageReference Include="Effort.EF6" Version="$(EffortVersion)" />
   </ItemGroup>
 
   <ItemGroup>

src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
-using System.Data.SqlServerCe;
 using System.Linq;
 using AutoMapper.EntityFramework;
 using AutoMapper.EquivalencyExpression;
@@ -69,7 +68,7 @@ public void Should_Persist_To_Insert()
         public class DB : DbContext
         {
             public DB()
-                : base(new SqlCeConnection($"Data Source={Guid.NewGuid()}.sdf;Persist Security Info=False;"), contextOwnsConnection: true)
+                : base(Effort.DbConnectionFactory.CreateTransient(), contextOwnsConnection: true)
             {
                 Things.RemoveRange(Things);
                 SaveChanges();

src/AutoMapper.Collection.EntityFramework.Tests/EntityFramworkTests.cs

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Collection updating support for EntityFramework 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>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.1</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection.EntityFramework</AssemblyName>
     <PackageId>AutoMapper.Collection.EntityFramework</PackageId>
     <PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
@@ -23,9 +23,4 @@
     <PackageReference Include="EntityFramework" Version="$(EfVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>