huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ifdef to make stuff compile on both platforms.

This commit is contained in:
David Fowler 2014-01-24 02:20:46 -08:00
parent b0933fdd35
commit a0de7048b5
19 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/MvcSample/Startup.cs
View File

@ -1,4 +1,4 @@
#if NET45
#if OWIN
using System;
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;

4
samples/MvcSample/ViewMetadata.cs
View File

@ -1,4 +1,5 @@
using System;
#if VIEWMETADATA
using System;
using System.Collections.Generic;
public class ViewMetadata
@ -21,3 +22,4 @@ public class ViewMetadata
}
}
}
#endif

4
src/Microsoft.AspNet.Mvc.Forms/CryptoUtil.cs
View File

@ -1,4 +1,5 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
#if NET45
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
@ -52,3 +53,4 @@ namespace Microsoft.AspNet.Mvc
}
}
}
#endif

4
src/Microsoft.AspNet.Mvc.Forms/Html/HtmlHelper.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System;
using System.Reflection;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
@ -67,8 +68,7 @@ namespace Microsoft.AspNet.Mvc
if (htmlAttributes != null)
{
PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(htmlAttributes);
foreach (PropertyDescriptor prop in properties)
foreach (var prop in htmlAttributes.GetType().GetRuntimeProperties())
{
object val = prop.GetValue(htmlAttributes);
result.Add(prop.Name, val);

4
src/Microsoft.AspNet.Mvc.Forms/TypeHelpers.cs
View File

@ -1,4 +1,5 @@
using System;
#if NET45
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@ -170,3 +171,4 @@ namespace Microsoft.AspNet.Mvc
}
}
}
#endif

5
src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs
View File

@ -1,4 +1,5 @@
using System;
#if NET45
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@ -110,4 +111,4 @@ namespace Microsoft.AspNet.Mvc.Razor
}
}
#endif

4
src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.k10.csproj
View File

@ -66,6 +66,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140124091736\lib\k10\Microsoft.AspNet.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.DependencyInjection, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.AspNet.DependencyInjection.0.1-alpha-t140123020341\lib\k10\Microsoft.AspNet.DependencyInjection.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNet.Mvc\Microsoft.AspNet.Mvc.k10.csproj">

4
src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.net45.csproj
View File

@ -46,6 +46,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.AspNet.Abstractions.0.1-alpha-t140124091736\lib\net45\Microsoft.AspNet.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.DependencyInjection, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.AspNet.DependencyInjection.0.1-alpha-t140123020341\lib\net45\Microsoft.AspNet.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.1.0\lib\net45\System.Web.Razor.dll</HintPath>

4
src/Microsoft.AspNet.Mvc.Razor/Razor/MvcCSharpRazorCodeGenerator.cs
View File

@ -1,4 +1,5 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
#if NET45
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System.CodeDom;
using System.Web.Razor;
@ -27,3 +28,4 @@ namespace Microsoft.AspNet.Mvc.Razor
}
}
}
#endif

4
src/Microsoft.AspNet.Mvc.Razor/Razor/MvcRazorHost.cs
View File

@ -1,4 +1,5 @@
using System.Web.Razor;
#if NET45
using System.Web.Razor;
using System.Web.Razor.Generator;
using System.Web.Razor.Parser;
@ -51,3 +52,4 @@ namespace Microsoft.AspNet.Mvc.Razor
}
}
}
#endif

4
src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
View File

@ -1,4 +1,5 @@
using System.CodeDom.Compiler;
#if NET45
using System.CodeDom.Compiler;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
@ -59,3 +60,4 @@ namespace Microsoft.AspNet.Mvc.Razor
}
}
}
#endif

4
src/Microsoft.AspNet.Mvc.Razor/Razor/SetModelTypeCodeGenerator.cs
View File

@ -1,4 +1,5 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
#if NET45
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System;
using System.Globalization;
@ -25,3 +26,4 @@ namespace Microsoft.AspNet.Mvc.Razor
}
}
}
#endif

2
src/Microsoft.AspNet.Mvc.Razor/RazorView.cs
View File

@ -71,7 +71,9 @@ namespace Microsoft.AspNet.Mvc.Razor
}
else
{
#if NET45
WebUtility.HtmlEncode(content.ToString(), writer);
#endif
}
}
}

6
src/Microsoft.AspNet.Mvc.Razor/ViewEngine/MetadataVirtualPathViewFactory.cs
View File

@ -15,17 +15,19 @@ namespace Microsoft.AspNet.Mvc.Razor
var metadataType = assembly.GetType("ViewMetadata");
if (metadataType != null)
{
object metadata = metadataType.GetProperty("Metadata", BindingFlags.Static | BindingFlags.Public)
object metadata = metadataType.GetRuntimeProperties().First(prop => prop.Name == "Metadata")
.GetValue(obj: null);
_viewMetadata = new Dictionary<string, Type>((Dictionary<string, Type>)metadata, StringComparer.OrdinalIgnoreCase);
}
else
{
#if NET45
// Code to support precompiled views generated via RazorGenerator
_viewMetadata = assembly.GetExportedTypes()
.Where(type => typeof(RazorView).IsAssignableFrom(type))
.ToDictionary(type => GetVirtualPath(type), StringComparer.OrdinalIgnoreCase);
#endif
}
}
@ -42,7 +44,7 @@ namespace Microsoft.AspNet.Mvc.Razor
private static string GetVirtualPath(Type type)
{
VirtualPathAttribute attribute = type.GetCustomAttribute<VirtualPathAttribute>();
VirtualPathAttribute attribute = type.GetTypeInfo().GetCustomAttribute<VirtualPathAttribute>();
return attribute.VirtualPath;
}
}

1
src/Microsoft.AspNet.Mvc.Razor/project.json
View File

@ -3,6 +3,7 @@
"dependencies": {
"Microsoft.AspNet.FileSystems": "0.1-alpha-*",
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
"Microsoft.AspNet.Razor" : "3.1.0",
"Microsoft.AspNet.Mvc" : "",
"Microsoft.AspNet.Mvc.Forms" : ""

4
src/Microsoft.AspNet.Mvc/ActionResults/NoContentResult.cs
View File

@ -17,7 +17,11 @@ namespace Microsoft.AspNet.Mvc
HttpResponse response = context.HttpContext.Response;
#if NET45
response.StatusCode = (int)HttpStatusCode.NoContent;
#else
response.StatusCode = 204;
#endif
await Task.FromResult(false);

6
src/Microsoft.AspNet.Mvc/ControllerActionInvoker.cs
View File

@ -38,7 +38,7 @@ namespace Microsoft.AspNet.Mvc
Initialize(controller);
var method = controller.GetType().GetMethod(_descriptor.ActionName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
var method = controller.GetType().GetRuntimeMethods().FirstOrDefault(m => m.Name.Equals(_descriptor.ActionName, StringComparison.OrdinalIgnoreCase));
if (method == null)
{
@ -57,7 +57,7 @@ namespace Microsoft.AspNet.Mvc
{
var controllerType = controller.GetType();
foreach (var prop in controllerType.GetProperties())
foreach (var prop in controllerType.GetRuntimeProperties())
{
if (prop.Name == "Context")
{
@ -68,7 +68,7 @@ namespace Microsoft.AspNet.Mvc
}
}
var method = controllerType.GetMethod("Initialize");
var method = controllerType.GetTypeInfo().GetDeclaredMethod("Initialize");
if (method == null)
{

6
src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs
View File

@ -24,8 +24,10 @@ namespace Microsoft.AspNet.Mvc
foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
{
var type = a.GetType(controllerName) ??
a.GetType(a.GetName().Name + "." + controllerName) ??
a.GetTypes().FirstOrDefault(t => t.Name.Equals(controllerName, StringComparison.OrdinalIgnoreCase));
a.GetType(a.GetName().Name + "." + controllerName);
#if NET45
type = type ?? a.GetTypes().FirstOrDefault(t => t.Name.Equals(controllerName, StringComparison.OrdinalIgnoreCase));
#endif
if (type != null)
{

12
src/Microsoft.AspNet.Mvc/Extensions/TypeExtensions.cs
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Mvc
{
internal static class TypeExtensions
{
#if NETFX_CORE
#if NETFX_CORE || K10
private static bool EqualTo(this Type[] t1, Type[] t2)
{
if (t1.Length != t2.Length)
@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc
return (matchesInterface(queryType)) ? queryType : queryType.GetInterfaces().FirstOrDefault(matchesInterface);
}
#if NETFX_CORE
#if NETFX_CORE || K10
public static Type[] GetGenericArguments(this Type type)
{
return type.GetTypeInfo().GenericTypeArguments;
@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Mvc
}
#endif
#if NETFX_CORE
#if NETFX_CORE || K10
public static bool IsAssignableFrom(this Type type, Type c)
{
return type.GetTypeInfo().IsAssignableFrom(c.GetTypeInfo());
@ -63,7 +63,7 @@ namespace Microsoft.AspNet.Mvc
public static bool IsGenericType(this Type type)
{
#if NETFX_CORE
#if NETFX_CORE || K10
return type.GetTypeInfo().IsGenericType;
#else
return type.IsGenericType;
@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Mvc
public static bool IsInterface(this Type type)
{
#if NETFX_CORE
#if NETFX_CORE || K10
return type.GetTypeInfo().IsInterface;
#else
return type.IsInterface;
@ -81,7 +81,7 @@ namespace Microsoft.AspNet.Mvc
public static bool IsValueType(this Type type)
{
#if NETFX_CORE
#if NETFX_CORE || K10
return type.GetTypeInfo().IsValueType;
#else
return type.IsValueType;