From 35fc8279dd2fd45d9d7bf0fd110d79cd38987240 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Mon, 9 Mar 2015 02:17:58 -0700 Subject: [PATCH] Updated missed dnx name changes. --- .../Views/ViewsConsumingCompilationOptions/Index.cshtml | 8 ++++---- test/WebSites/PrecompilationWebSite/project.json | 4 ++-- .../RazorWebSite/Services/FrameworkSpecificHelper.cs | 4 ++-- .../ViewsConsumingCompilationOptions/_Partial.cshtml | 8 ++++---- test/WebSites/RazorWebSite/project.json | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/WebSites/PrecompilationWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml b/test/WebSites/PrecompilationWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml index 58b2a8d961..6a7cfb5347 100644 --- a/test/WebSites/PrecompilationWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml +++ b/test/WebSites/PrecompilationWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml @@ -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 diff --git a/test/WebSites/PrecompilationWebSite/project.json b/test/WebSites/PrecompilationWebSite/project.json index 200410d6a8..fd52ae222f 100644 --- a/test/WebSites/PrecompilationWebSite/project.json +++ b/test/WebSites/PrecompilationWebSite/project.json @@ -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" ] } } }, diff --git a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs index ef98c820d6..5da2898989 100644 --- a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs +++ b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs @@ -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"; } diff --git a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml b/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml index 9234f21545..18c5f2a0fb 100644 --- a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml +++ b/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml @@ -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 \ No newline at end of file diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json index 1f7ba6151b..7ab20ca4cc 100644 --- a/test/WebSites/RazorWebSite/project.json +++ b/test/WebSites/RazorWebSite/project.json @@ -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" ] } } },