Permalink
Browse files

Marking 5.2, removing PCL junk

  • Loading branch information...
1 parent d856694 commit ad3b65dead9878847ca612e6fc19b4d6b0a51609 @jbogard jbogard committed Aug 12, 2016
View
@@ -11,7 +11,7 @@ build_script:
- cmd: .\psake.bat ci
test: off
artifacts:
-- path: artifacts\*.nupkg
+- path: src\AutoMapper\bin\release\*.nupkg
name: NuGet
deploy:
- provider: NuGet
View
@@ -30,16 +30,11 @@ task release {
task compile -depends clean {
$version = if ($env:APPVEYOR_BUILD_NUMBER -ne $NULL) { $env:APPVEYOR_BUILD_NUMBER } else { '0' }
$version = "{0:D5}" -f [convert]::ToInt32($version, 10)
- $version = "5.1.1-alpha-" + $version
- $version = "5.1.1"
exec { & $source_dir\.nuget\Nuget.exe restore $source_dir\AutoMapper.sln }
exec { msbuild /t:Clean /t:Build /p:Configuration=$config /v:q /p:NoWarn=1591 /nologo $source_dir\AutoMapper.sln }
- New-Item -ItemType Directory -Force .\artifacts
-
- exec { & $source_dir\.nuget\Nuget.exe pack AutoMapper.nuspec -Version $version -Symbols -OutputDirectory .\artifacts }
exec { dotnet pack $source_dir\AutoMapper -c $config --version-suffix $version}
}
@@ -25,9 +25,7 @@ public static class MapperRegistry
new EnumerableMapper(),
new StringMapper(),
new AssignableMapper(),
-#if !PORTABLE
new TypeConverterMapper(),
-#endif
new NullableSourceMapper(),
new ImplicitConversionOperatorMapper(),
new ExplicitConversionOperatorMapper(),
@@ -1,4 +1,3 @@
-#if !PORTABLE
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
@@ -58,4 +57,3 @@ private static TypeConverter GetTypeConverter(Type type)
}
}
}
-#endif
@@ -1,5 +1,5 @@
{
- "version": "5.1.1",
+ "version": "5.2.0-alpha.*",
"authors": [ "Jimmy Bogard" ],
"description": "A convention-based object-object mapper. AutoMapper uses a fluent configuration API to define an object-object mapping strategy. AutoMapper uses a convention-based matching algorithm to match up source to destination values. Currently, AutoMapper is designed for model projection scenarios to flatten complex object models to DTOs and other simple objects, whose design is better suited for serialization, communication, messaging, or simply an anti-corruption layer between the domain and application layer.",
"packOptions": {
@@ -38,31 +38,6 @@
}
},
"net45": {
- },
- ".NETPortable,Version=v4.5,Profile=Profile111": {
- "frameworkAssemblies": {
- "Microsoft.CSharp": "",
- "System.ComponentModel": "",
- "System.Diagnostics.Debug": "",
- "System.Dynamic.Runtime": "",
- "System.Runtime": "",
- "System.Runtime.Extensions": "",
- "System.Globalization": "",
- "System.Linq": "",
- "System.Linq.Expressions": "",
- "System.Linq.Queryable": "",
- "System.ObjectModel": "",
- "System.Reflection": "",
- "System.Reflection.Extensions": "",
- "System.Collections": "",
- "System.Collections.Concurrent": "",
- "System.Text.RegularExpressions": "",
- "System.Threading": "",
- "System.Threading.Tasks": ""
- },
- "buildOptions": {
- "define": ["PORTABLE"]
- }
- }
+ }
}
}
@@ -200,7 +200,6 @@ public void Should_map_new_values()
}
}
-#if !PORTABLE
public class When_mapping_from_an_anonymous_type_to_an_interface : NonValidatingSpecBase
{
private IDestination _result;
@@ -223,6 +222,5 @@ public void Should_allow_dynamic_mapping()
protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => cfg.CreateMissingTypeMaps = true);
}
-#endif
}
}
@@ -162,7 +162,6 @@ public void Should_map_ChildProperty_to_child_property_value()
}
}
-#if !PORTABLE
public class When_mapping_a_concrete_type_to_an_interface_type : AutoMapperSpecBase
{
private IDestination _result;
@@ -274,7 +273,6 @@ public void Should_detach_event_handler()
_count++;
}
}
-#endif
public class When_mapping_a_derived_interface_to_an_derived_concrete_type : AutoMapperSpecBase
{
@@ -1,5 +1,4 @@
-#if !PORTABLE
-using System;
+using System;
using System.Collections.Specialized;
using AutoMapper.Mappers;
using Should;
@@ -85,4 +84,3 @@ public void ReturnsMappedObjectWithExpectedValuesWhenSourceCollectionHasOneItem(
}
}
-#endif
@@ -41,13 +41,11 @@ public void ShouldMapToExistingObject()
destination.Container.MyProperty.ShouldEqual(3);
}
-#if !PORTABLE
[Fact]
public void ShouldMapToNewObject()
{
var destination = (IMyInterface<ContainerClass>) Mapper.Map(source, typeof(MyClass<ContainerClass>), typeof(ImplementedClass));
destination.Container.MyProperty.ShouldEqual(3);
}
-#endif
}
}
@@ -221,7 +221,6 @@ public void Should_convert_type_using_expression()
}
}
-#if !PORTABLE
public class When_specifying_mapping_with_the_BCL_type_converter_class : NonValidatingSpecBase
{
protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg => { });
@@ -285,7 +284,6 @@ public void Should_convert_to_type_using_the_custom_type_converter()
destination.Value.ShouldEqual(5);
}
}
-#endif
public class When_specifying_a_type_converter_for_a_non_generic_configuration : NonValidatingSpecBase
{

0 comments on commit ad3b65d

Please sign in to comment.