Added aspnet50 to the list of targets

davidfowl · davidfowl · commit d866ee52cd00 · 2014-09-11T15:08:23.000-07:00
diff --git a/src/Microsoft.Framework.OptionsModel/OptionsServices.cs b/src/Microsoft.Framework.OptionsModel/OptionsServices.cs
@@ -30,7 +30,7 @@ public static IEnumerable<IServiceDescriptor> GetDefaultServices(IConfiguration
         public static void ReadProperties(object obj, IConfiguration config)
         {
             // No convert on portable
-#if NET45 || ASPNETCORE50
+#if NET45 || ASPNET50|| ASPNETCORE50
             if (obj == null || config == null)
             {
                 return;
diff --git a/src/Microsoft.Framework.OptionsModel/project.json b/src/Microsoft.Framework.OptionsModel/project.json
@@ -5,7 +5,8 @@
     "Microsoft.Framework.DependencyInjection": "1.0.0-*"
   },
   "frameworks": {
-    "net45": {},
+    "net45": { },
+    "aspnet50": { },
     "aspnetcore50": {
       "dependencies": {
         "System.Collections": "4.0.10.0",
diff --git a/test/Microsoft.Framework.OptionsModel.Test/project.json b/test/Microsoft.Framework.OptionsModel.Test/project.json
@@ -6,7 +6,7 @@
     "Xunit.KRunner": "1.0.0-*"
   },
   "frameworks": {
-    "net45": {}
+    "aspnet50": {}
   },
   "commands": {
     "test": "Xunit.KRunner"

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static IEnumerable<IServiceDescriptor> GetDefaultServices(IConfiguration`
`30`	`30`	`public static void ReadProperties(object obj, IConfiguration config)`
`31`	`31`	`{`
`32`	`32`	`// No convert on portable`
`33`		`-#if NET45 \|\| ASPNETCORE50`
	`33`	`+#if NET45 \|\| ASPNET50\|\| ASPNETCORE50`
`34`	`34`	`if (obj == null \|\| config == null)`
`35`	`35`	`{`
`36`	`36`	`return;`