Skip to content

Commit d45e218

Browse files
TylerCarlson1TylerCarlson1
committed
Merge branch 'master'
Conflicts: src/AutoMapper.Collection.LinqToSQL/GetLinqToSQLPrimaryKeyExpression.cs src/AutoMapper.Collection/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj src/AutoMapper.Collection/AutoMapper.Collection.EntityFramework/Properties/AssemblyInfo.cs src/AutoMapper.Collection/AutoMapper.Collection.EntityFramework/packages.config src/AutoMapper.Collection/AutoMapper.Collection.LinqToSQL/AutoMapper.Collection.LinqToSQL.csproj src/AutoMapper.Collection/AutoMapper.Collection.LinqToSQL/GetLinqToSQLPrimaryKeyExpression.cs src/AutoMapper.Collection/AutoMapper.Collection.LinqToSQL/Properties/AssemblyInfo.cs src/AutoMapper.Collection/AutoMapper.Collection.LinqToSQL/packages.config src/AutoMapper.Collection/AutoMapper.Collection/AutoMapper.Collection.csproj src/AutoMapper.Collection/AutoMapper.Collection/Mappers/EquivlentExpressionAddRemoveCollectionMapper.cs src/AutoMapper.Collection/AutoMapper.Collection/Properties/AssemblyInfo.cs src/AutoMapper.Collection/AutoMapper.Collection/ReflectionHelper.cs src/AutoMapper.Collection/AutoMapper.Collection/packages.config src/AutoMapper.Collection/Mappers/EquivlentExpressionAddRemoveCollectionMapper.cs src/AutoMapper.Collection/ReflectionHelper.cs
2 parents 1898267 + 14708f4 commit d45e218

56 files changed

Lines changed: 327 additions & 697 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ FakesAssemblies/
187187
GeneratedArtifacts/
188188
_Pvt_Extensions/
189189
ModelManifest.xml
190-
*.dll
191-
src/AutoMapper.Collection/packages/AutoMapper.3.3.1/lib/wpa81/AutoMapper.xml
192-
src/AutoMapper.Collection/packages/
193-
/src/AutoMapper.Collection/AutoMapper.Collection.sln.GhostDoc.xml
190+
/packages/
191+
/.vs
192+
*.GhostDoc.xml
193+
/artifacts
194+
*.lock.json

src/AutoMapper.Collection/.nuget/NuGet.Config renamed to .nuget/NuGet.Config

File renamed without changes.

‎AutoMapper.Collection.sln‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25123.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19AAEE83-5EEC-4EAA-9CF7-16F8ED58B50E}"
7+
ProjectSection(SolutionItems) = preProject
8+
.nuget\NuGet.Config = .nuget\NuGet.Config
9+
EndProjectSection
10+
EndProject
11+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{578F2483-CF08-409D-A316-31BCB7C5D9D0}"
12+
ProjectSection(SolutionItems) = preProject
13+
global.json = global.json
14+
EndProjectSection
15+
EndProject
16+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection", "src\AutoMapper.Collection\AutoMapper.Collection.xproj", "{37AD667A-8080-476C-88FD-20310AC7CAF3}"
17+
EndProject
18+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection.EntityFramework", "src\AutoMapper.Collection.EntityFramework\AutoMapper.Collection.EntityFramework.xproj", "{E0FD41FD-AF5B-4BEC-970F-8412E7B6C914}"
19+
EndProject
20+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection.LinqToSQL", "src\AutoMapper.Collection.LinqToSQL\AutoMapper.Collection.LinqToSQL.xproj", "{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}"
21+
EndProject
22+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection-Signed", "src\AutoMapper.Collection-Signed\AutoMapper.Collection-Signed.xproj", "{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}"
23+
EndProject
24+
Global
25+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
26+
Debug|Any CPU = Debug|Any CPU
27+
Release|Any CPU = Release|Any CPU
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{37AD667A-8080-476C-88FD-20310AC7CAF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{37AD667A-8080-476C-88FD-20310AC7CAF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{37AD667A-8080-476C-88FD-20310AC7CAF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{37AD667A-8080-476C-88FD-20310AC7CAF3}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{E0FD41FD-AF5B-4BEC-970F-8412E7B6C914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{E0FD41FD-AF5B-4BEC-970F-8412E7B6C914}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{E0FD41FD-AF5B-4BEC-970F-8412E7B6C914}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{E0FD41FD-AF5B-4BEC-970F-8412E7B6C914}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Release|Any CPU.Build.0 = Release|Any CPU
46+
EndGlobalSection
47+
GlobalSection(SolutionProperties) = preSolution
48+
HideSolutionNode = FALSE
49+
EndGlobalSection
50+
EndGlobal

‎build.cmd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@ECHO OFF
2+
PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"

‎build.ps1‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
$version_suffix="$env:DOTNET_BUILD_VERSION"
2+
3+
if ((get-command dotnet.exe -ErrorAction SilentlyContinue) -eq $null) {
4+
Write-Error "You need to have dotnet installed and added to your path, download from http://dot.net"
5+
exit 255
6+
}
7+
8+
9+
Get-ChildItem src\*\project.json | % {
10+
11+
if ($version_suffix -ne ""){
12+
&dotnet pack --output "artifacts" --configuration Release --version-suffix $version_suffix "$_"
13+
} else {
14+
&dotnet pack --output "artifacts" --configuration Release "$_"
15+
}
16+
}

‎global.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "1.0.0-preview1-002702"
4+
}
5+
}

‎src/AutoMapper.Collection-Signed/AutoMapper.Collection-Signed.xproj‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<PropertyGroup Label="Globals">
8+
<ProjectGuid>17cbafe0-f758-47fb-86a1-f3afeb0389b0</ProjectGuid>
9+
<RootNamespace>AutoMapper.Collection</RootNamespace>
10+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
11+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
12+
</PropertyGroup>
13+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<AssemblyName>AutoMapper.Collection</AssemblyName>
15+
</PropertyGroup>
16+
<PropertyGroup>
17+
<SchemaVersion>2.0</SchemaVersion>
18+
</PropertyGroup>
19+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
20+
<ProjectExtensions>
21+
<VisualStudio>
22+
<UserProperties />
23+
</VisualStudio>
24+
</ProjectExtensions>
25+
</Project>

‎src/AutoMapper.Collection-Signed/project.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"version": "2.0.0-*",
3+
"authors": [ "Tyler Carlson" ],
4+
"description": "Collection updating support for AutoMapper.",
5+
"packOptions": {
6+
"owners": [ "Tyler Carlson" ],
7+
"licenseUrl": "https://raw.githubusercontent.com/TylerCarlson1/Automapper.Collection/master/LICENSE",
8+
"projectUrl": "https://github.com/TylerCarlson1/Automapper.Collection",
9+
"requireLicenseAcceptance": false
10+
},
11+
12+
"buildOptions": {
13+
"keyFile": "../Key.snk",
14+
"compile": {
15+
"include": [ "../AutoMapper.Collection/**/*.cs" ],
16+
"exclude": [ "../AutoMapper.Collection/**/obj/*", "../AutoMapper.Collection/**/bin/*" ]
17+
}
18+
},
19+
20+
"dependencies": {
21+
"AutoMapper": "5.0.0-beta-1"
22+
},
23+
24+
"frameworks": {
25+
"net45": {
26+
},
27+
"netstandard1.1": {
28+
"dependencies": {
29+
"NETStandard.Library": "1.5.0-rc2-24027",
30+
"System.Linq.Expressions": "4.0.11-rc2-24027"
31+
},
32+
"imports": [
33+
"portable-net45+win8+dnxcore50",
34+
"portable-net45+win8"
35+
]
36+
}
37+
}
38+
}

‎src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.xproj‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<PropertyGroup Label="Globals">
8+
<ProjectGuid>e0fd41fd-af5b-4bec-970f-8412e7b6c914</ProjectGuid>
9+
<RootNamespace>AutoMapper.Collection.EntityFramework</RootNamespace>
10+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
11+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
12+
</PropertyGroup>
13+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<AssemblyName>AutoMapper.Collection</AssemblyName>
15+
</PropertyGroup>
16+
<PropertyGroup>
17+
<SchemaVersion>2.0</SchemaVersion>
18+
</PropertyGroup>
19+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
20+
<ProjectExtensions>
21+
<VisualStudio>
22+
<UserProperties />
23+
</VisualStudio>
24+
</ProjectExtensions>
25+
</Project>

src/AutoMapper.Collection/AutoMapper.Collection.EntityFramework/Extensions.cs renamed to src/AutoMapper.Collection.EntityFramework/Extensions.cs

File renamed without changes.

0 commit comments

Comments
 (0)