Skip to content

Commit

Permalink
Merge pull request #2 from threenine/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
garywoodfine committed Jan 5, 2020
2 parents da2f2fb + 0be091e commit 8f06c33
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 29 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ or using the Dotnet Core CLI

`dotnet add package Threenine.Map`

The package will install Automapper 8.1.0.

*** Do not attempt to use the library with Automapper 9.X + breaking with the removal of the static API

## Documentation

We are currently compiling comprehensive documentation and examples of use of available on [Threenine.Map - Read the Docs](http://threeninemap.readthedocs.io/en/latest/Getting-started.html).
Expand Down
8 changes: 4 additions & 4 deletions Threenine.Map.sln
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Threenine.Map", "src\Threenine.Map.csproj", "{1CDD5884-E7D3-435B-B0FC-30DAC41B3B94}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{1F5C8EB2-12EE-4ACE-9084-1F9C4474CC84}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1F5C8EB2-12EE-4ACE-9084-1F9C4474CC84}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapperTests", "UnitTests\MapperTests\MapperTests.csproj", "{9BF2645A-007C-4402-9AAB-08F813CBF680}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapperTests", "tests\MapperTests\MapperTests.csproj", "{9BF2645A-007C-4402-9AAB-08F813CBF680}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DomainObjects", "UnitTests\DomainObjects\DomainObjects.csproj", "{8A8B8DD5-7961-49C6-A2A9-F91954236396}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DomainObjects", "tests\DomainObjects\DomainObjects.csproj", "{8A8B8DD5-7961-49C6-A2A9-F91954236396}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityObjects", "UnitTests\EntityObjects\EntityObjects.csproj", "{36A8C934-D5DB-4153-86D3-DC8975421E78}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityObjects", "tests\EntityObjects\EntityObjects.csproj", "{36A8C934-D5DB-4153-86D3-DC8975421E78}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
5 changes: 4 additions & 1 deletion src/MapConfigurationFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static void Scan<TType>(Func<AssemblyName, bool> assemblyFilter = null)
LoadMapsFromAssemblies(assembliesToLoad.ToArray());
}

public static void LoadMapsFromAssemblies(params Assembly[] assemblies)
private static void LoadMapsFromAssemblies(params Assembly[] assemblies)
{
var types = assemblies.SelectMany(a => a.GetExportedTypes()).ToArray();
LoadAllMappings(types);
Expand All @@ -33,6 +33,9 @@ public static void LoadMapsFromAssemblies(params Assembly[] assemblies)

public static void LoadAllMappings(IList<Type> types)
{



Mapper.Initialize(
cfg =>
{
Expand Down
2 changes: 1 addition & 1 deletion src/Threenine.Map.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@


<ItemGroup>
<PackageReference Include="AutoMapper" Version="8.0.0" />
<PackageReference Include="AutoMapper" Version="8.1.1" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
</ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Threenine.Map.csproj" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Threenine.Map.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System;


namespace EntityObjects
{
public class SimpleEntity
{
public string Name { get; set; }
public string Description { get; set; }
public int Age { get; set; }
}
}
using System;


namespace EntityObjects
{
public class SimpleEntity
{
public string Name { get; set; }
public string Description { get; set; }
public int Age { get; set; }
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file removed website/website.md
Empty file.

0 comments on commit 8f06c33

Please sign in to comment.