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

Updated missed dnx name changes.

This commit is contained in:
N. Taylor Mullen 2015-03-09 02:17:58 -07:00
parent 39db3ffc2b
commit 35fc8279dd
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/WebSites/PrecompilationWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
View File

@ -1,9 +1,9 @@
@{
string message =
#if ASPNET50
"Value set inside ASPNET50 " + GetType().Assembly.FullName;
#elif ASPNETCORE50
"Value set inside ASPNETCORE50 " + System.Reflection.IntrospectionExtensions.GetTypeInfo(GetType()).Assembly.FullName;
#if DNX451
"Value set inside DNX451 " + GetType().Assembly.FullName;
#elif DNXCORE50
"Value set inside DNXCORE50 " + System.Reflection.IntrospectionExtensions.GetTypeInfo(GetType()).Assembly.FullName;
#endif
}
@message

4
test/WebSites/PrecompilationWebSite/project.json
View File

@ -17,12 +17,12 @@
"frameworks": {
"dnx451": {
"compilationOptions": {
"define": [ "CUSTOM_ASPNET50_DEFINE" ]
"define": [ "CUSTOM_DNX451_DEFINE" ]
}
},
"dnxcore50": {
"compilationOptions": {
"define": [ "CUSTOM_ASPNETCORE50_DEFINE" ]
"define": [ "CUSTOM_DNXCORE50_DEFINE" ]
}
}
},

4
test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
View File

@ -15,14 +15,14 @@ namespace RazorWebSite
}
#if DNX451_CUSTOM_DEFINE
public string ExecuteAspNet50Operation()
public string ExecuteDnx451Operation()
{
return "This method is only defined in DNX451";
}
#endif
#if DNXCORE50_CUSTOM_DEFINE
public string ExecuteAspNetCore50Operation()
public string ExecuteDnxCore50Operation()
{
return "This method is only defined in DNXCORE50";
}

8
test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
View File

@ -1,11 +1,11 @@
@inject FrameworkSpecificHelper MyHelper
@{
string value =
#if ASPNET50_CUSTOM_DEFINE
MyHelper.ExecuteAspNet50Operation();
#if DNX451_CUSTOM_DEFINE
MyHelper.ExecuteDnx451Operation();
#endif
#if ASPNETCORE50_CUSTOM_DEFINE
MyHelper.ExecuteAspNetCore50Operation();
#if DNXCORE50_CUSTOM_DEFINE
MyHelper.ExecuteDnxCore50Operation();
#endif
}
@value

4
test/WebSites/RazorWebSite/project.json
View File

@ -14,12 +14,12 @@
"frameworks": {
"dnx451": {
"compilationOptions": {
"define": [ "ASPNET50_CUSTOM_DEFINE" ]
"define": [ "DNX451_CUSTOM_DEFINE" ]
}
},
"dnxcore50": {
"compilationOptions": {
"define": [ "ASPNETCORE50_CUSTOM_DEFINE" ]
"define": [ "DNXCORE50_CUSTOM_DEFINE" ]
}
}
},