From db42b8e07ca16550effb32a350df52a5f1358671 Mon Sep 17 00:00:00 2001
From: chaowlert <chaowlert@gmail.com>
Date: Sat, 18 Jun 2016 21:32:32 +0700
Subject: [PATCH] upgrade to rc2

---
 .gitignore                             |  1 +
 src/Mapster/Mapster.nuget.targets      |  6 ------
 src/Mapster/Mapster.xproj              |  2 +-
 src/Mapster/Properties/AssemblyInfo.cs |  3 ++-
 src/Mapster/global.json                |  8 ++++----
 src/Mapster/project.json               | 28 +++++++++++++++-----------
 6 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 src/Mapster/Mapster.nuget.targets

diff --git a/.gitignore b/.gitignore
index 2d48506b..d802d3fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,3 +178,4 @@ deploy/archive
 deploy/output
 /src/.vs/config
 project.lock.json
+/src/.vs
diff --git a/src/Mapster/Mapster.nuget.targets b/src/Mapster/Mapster.nuget.targets
deleted file mode 100644
index e69ce0e6..00000000
--- a/src/Mapster/Mapster.nuget.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
-    <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/Mapster/Mapster.xproj b/src/Mapster/Mapster.xproj
index 17295e8c..b0372c1e 100644
--- a/src/Mapster/Mapster.xproj
+++ b/src/Mapster/Mapster.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>c1137dae-26d6-47bd-985a-ba619549e633</ProjectGuid>
     <RootNamespace>Mapster</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/src/Mapster/Properties/AssemblyInfo.cs b/src/Mapster/Properties/AssemblyInfo.cs
index 54aeddb0..c09b287e 100644
--- a/src/Mapster/Properties/AssemblyInfo.cs
+++ b/src/Mapster/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/src/Mapster/global.json b/src/Mapster/global.json
index 9b4209c2..820d7b14 100644
--- a/src/Mapster/global.json
+++ b/src/Mapster/global.json
@@ -1,6 +1,6 @@
 {
-  "projects": [ ],
-  "sdk": {
-    "version": "1.0.0-rc1-update1"
-  }
+    "projects": [ ],
+    "sdk": {
+        "version": "1.0.0-preview1-002702"
+    }
 }
diff --git a/src/Mapster/project.json b/src/Mapster/project.json
index 527dfa17..d8afd0db 100644
--- a/src/Mapster/project.json
+++ b/src/Mapster/project.json
@@ -1,28 +1,32 @@
 {
-    "version": "2.3.0",
+    "version": "2.4.0",
     "description": "A fast, fun and stimulating object to object mapper.  Kind of like AutoMapper, just simpler and way, way faster.",
-    "summary": "A fast, fun and stimulating object to object mapper.  Kind of like AutoMapper, but simpler and way faster.",
-    "iconUrl": "http://www.fancyicons.com/free-icons/103/pretty-office-5/png/128/order_128.png",
+    "packOptions": {
+        "summary": "A fast, fun and stimulating object to object mapper.  Kind of like AutoMapper, but simpler and way faster.",
+        "iconUrl": "http://www.fancyicons.com/free-icons/103/pretty-office-5/png/128/order_128.png",
+        "tags": [ "Mapper", "AutoMapper", "Fast", "Mapping" ],
+        "projectUrl": "https://github.com/chaowlert/Mapster",
+        "licenseUrl": "https://github.com/chaowlert/Mapster/blob/master/LICENSE"
+    },
     "authors": [ "chaowlert", "eric_swann" ],
-    "tags": [ "Mapper", "AutoMapper", "Fast", "Mapping" ],
-    "projectUrl": "https://github.com/chaowlert/Mapster",
-    "licenseUrl": "https://github.com/chaowlert/Mapster/blob/master/LICENSE",
     "copyright": "Copyright (c) 2016 Chaowlert Chaisrichalermpol, Eric Swann",
-    "compilationOptions": {
+    "buildOptions": {
         "keyFile": "Mapster.snk"
     },
     "frameworks": {
         "net4": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "NET4" ]
             }
         },
         "net45": { },
-        "dotnet5.4": {
+        "netstandard1.3": {
             "dependencies": {
-                "Microsoft.CSharp": "4.0.0",
-                "System.Collections.NonGeneric": "4.0.0",
-                "System.Linq.Queryable": "4.0.0"
+                "Microsoft.CSharp": "4.0.1-rc2-24027",
+                "NETStandard.Library": "1.5.0-rc2-24027",
+                "System.Collections.NonGeneric": "4.0.1-rc2-24027",
+                "System.Linq.Queryable": "4.0.1-rc2-24027",
+                "System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
             }
         }
     }