Replacing RazorGenerator custom tool with msbuild task

3rdParty/RazorGenerator/RazorGenerator.targets

@@ -0,0 +1,23 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <RazorGeneratorMsBuildPath Condition=" '$(RazorGeneratorMsBuildPath)' == '' ">$(MSBuildThisFileDirectory)\RazorGenerator.MsBuild.dll</RazorGeneratorMsBuildPath>
+
+        <CompileDependsOn>
+            PrecompileRazorFiles;
+            $(CompileDependsOn);
+        </CompileDependsOn>
+    </PropertyGroup>
+
+    <UsingTask AssemblyFile="$(RazorGeneratorMsBuildPath)" TaskName="RazorCodeGen" />
+    <Target Name="PrecompileRazorFiles" Returns="@(FilesGenerated)">
+        <ItemGroup>
+            <RazorSrcFiles Include="**\*.cshtml" />
+        </ItemGroup>
+        <RazorCodeGen ProjectRoot="$(MsBuildProjectDirectory)" FilesToPrecompile="@(RazorSrcFiles)" RootNamespace="$(RootNamespace)">
+            <Output TaskParameter="GeneratedFiles" ItemName="FilesGenerated" />
+        </RazorCodeGen>
+        <ItemGroup>
+            <Compile Include="@(FilesGenerated)" />
+        </ItemGroup>
+    </Target>
+</Project>

Scripts/NuGetGallery.msbuild

@@ -28,12 +28,8 @@
     <UpdateDatabase />
   </Target>
 
-  <Target Name="BuildViews" DependsOnTargets="Build">
-    <MSBuild Projects="..\Website\Website.csproj" Targets="MvcBuildViews" Properties="MvcBuildViews=true" />
-  </Target>
-
   <Target Name="CIBuild" DependsOnTargets="RunFacts" />
 
-  <Target Name="FullBuild" DependsOnTargets="RunFacts;UpdateDatabase;BuildViews" />
+  <Target Name="FullBuild" DependsOnTargets="RunFacts;UpdateDatabase" />
 
 </Project>

Website/Views/Helpers/ViewHelpers.cshtml → Website/App_Code/ViewHelpers.cshtml

@@ -1,93 +1,95 @@
- @* Generator: MvcHelper *@
-
-@using System.Linq;
-@using System.Collections;
-@using NuGetGallery;
-
-@helper PreviousNextPager(IPreviousNextPager pager) {
-    if (pager.HasNextPage || pager.HasPreviousPage) {
-        <ul class="pager">
-            <li class="previous">
-                @if (pager.HasPreviousPage) { 
-                    <a href="@pager.PreviousPageUrl" title="Go to the previous page.">Previous</a>
-                }
-                else {
-                    <text>Previous</text>
-                }
-            </li>
-            <li class="next">
-                @if (pager.HasNextPage) { 
-                    <a href="@pager.NextPageUrl" title="Go to the next page.">Next</a>
-                }
-                else {
-                    <text>Next</text>
-                }
-            </li>
-        </ul>
-    }
-}
-
-@helper Option(string value, string label, string currentValue) {
-    <option value="@value" @if (value == currentValue) {<text>selected="selected"</text>}>@label</option>    
-}
-
-@helper UploadSequence(int currentStep) {
-    <ol class="sequence">
-        @SequenceStep(1, "Upload", currentStep)
-        @SequenceStep(2, "Verify Details", currentStep)
-        @SequenceStep(3, "Enjoy", currentStep)
-    </ol>
-    <div class="clear-fix"><!--Sad Panda--></div>
-}
-
-@helper SequenceStep(int step, string caption, int currentStep) {
-    if (currentStep > step) {
-        <li class="past">@caption</li>
-    }
-    else if (currentStep == step) {
-        <li class="current">@caption</li>
-    }
-    else {
-        <li>@caption</li>
-    }    
-}
-
-@helper OwnersGravatar(IEnumerable<User> owners, int size, UrlHelper url, bool showName = true) {
-    <ul class="owners">
-    @foreach (var owner in owners) {
-        <li>
-            @ViewHelpers.OwnerGravatar(owner, size, url, showName)
-        </li>
-    }  
-    </ul>  
-}
-
-@helper OwnerGravatar(User owner, int size, UrlHelper url, bool showName = true) {
-    <a class="owner" href="@url.Action(MVC.Users.Profiles(owner.Username))" title="@owner.Username">
-        @GravatarImage(owner.EmailAddress, owner.Username, size)
-        @if (showName) {
-            <text>@owner.Username</text>
-        }
-    </a>
-}
-
-@helper GravatarImage(string email, string username, int size) {
-    <text>
-    @Gravatar.GetHtml(email, size, "retro", GravatarRating.G, attributes: new { width = size, height = size, title = username, @class = "owner-image" })
-    </text>
-}
-
-@helper ReleaseTag(){
-    string name = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseName"];
-    string sha = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseSha"];
-    string branch = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseBranch"];
-    string time = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseTime"];
-    if(!String.IsNullOrEmpty(name) && !String.IsNullOrEmpty(sha) && !String.IsNullOrEmpty(branch) && !String.IsNullOrEmpty(time)){
-    <p id="releaseTag">
-        @name - 
-        Deployed from <a href="https://github.com/NuGet/NuGetGallery/commit/@sha" title="View the commit.">@sha.Substring(0,10)</a>
-        on <a href="https://github.com/NuGet/NuGetGallery/branches/@branch" title="View the branch.">@branch</a> 
-        at @time.
-    </p>
-    }
+ @* Generator: MvcHelper *@
+
+@using System.Linq;
+@using System.Collections;
+@using System.Web.Mvc;
+@using Microsoft.Web.Helpers;
+@using NuGetGallery;
+
+@helper PreviousNextPager(IPreviousNextPager pager) {
+    if (pager.HasNextPage || pager.HasPreviousPage) {
+        <ul class="pager">
+            <li class="previous">
+                @if (pager.HasPreviousPage) { 
+                    <a href="@pager.PreviousPageUrl" title="Go to the previous page.">Previous</a>
+                }
+                else {
+                    <text>Previous</text>
+                }
+            </li>
+            <li class="next">
+                @if (pager.HasNextPage) { 
+                    <a href="@pager.NextPageUrl" title="Go to the next page.">Next</a>
+                }
+                else {
+                    <text>Next</text>
+                }
+            </li>
+        </ul>
+    }
+}
+
+@helper Option(string value, string label, string currentValue) {
+    <option value="@value" @if (value == currentValue) {<text>selected="selected"</text>}>@label</option>    
+}
+
+@helper UploadSequence(int currentStep) {
+    <ol class="sequence">
+        @SequenceStep(1, "Upload", currentStep)
+        @SequenceStep(2, "Verify Details", currentStep)
+        @SequenceStep(3, "Enjoy", currentStep)
+    </ol>
+    <div class="clear-fix"><!--Sad Panda--></div>
+}
+
+@helper SequenceStep(int step, string caption, int currentStep) {
+    if (currentStep > step) {
+        <li class="past">@caption</li>
+    }
+    else if (currentStep == step) {
+        <li class="current">@caption</li>
+    }
+    else {
+        <li>@caption</li>
+    }    
+}
+
+@helper OwnersGravatar(IEnumerable<User> owners, int size, UrlHelper url, bool showName = true) {
+    <ul class="owners">
+    @foreach (var owner in owners) {
+        <li>
+            @ViewHelpers.OwnerGravatar(owner, size, url, showName)
+        </li>
+    }  
+    </ul>  
+}
+
+@helper OwnerGravatar(User owner, int size, UrlHelper url, bool showName = true) {
+    <a class="owner" href="@url.Action(MVC.Users.Profiles(owner.Username))" title="@owner.Username">
+        @GravatarImage(owner.EmailAddress, owner.Username, size)
+        @if (showName) {
+            <text>@owner.Username</text>
+        }
+    </a>
+}
+
+@helper GravatarImage(string email, string username, int size) {
+    <text>
+    @Gravatar.GetHtml(email, size, "retro", GravatarRating.G, attributes: new { width = size, height = size, title = username, @class = "owner-image" })
+    </text>
+}
+
+@helper ReleaseTag(){
+    string name = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseName"];
+    string sha = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseSha"];
+    string branch = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseBranch"];
+    string time = System.Configuration.ConfigurationManager.AppSettings["Gallery:ReleaseTime"];
+    if(!String.IsNullOrEmpty(name) && !String.IsNullOrEmpty(sha) && !String.IsNullOrEmpty(branch) && !String.IsNullOrEmpty(time)){
+    <p id="releaseTag">
+        @name - 
+        Deployed from <a href="https://github.com/NuGet/NuGetGallery/commit/@sha" title="View the commit.">@sha.Substring(0,10)</a>
+        on <a href="https://github.com/NuGet/NuGetGallery/branches/@branch" title="View the branch.">@branch</a> 
+        at @time.
+    </p>
+    }
 }

Website/AuthenticationController.generated.cs

@@ -20,14 +20,8 @@
 using System.Web.Mvc.Html;
 using System.Web.Routing;
 using T4MVC;
-
-
-
 namespace NuGetGallery {
-
     public partial class AuthenticationController {
-
-
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         protected AuthenticationController(Dummy d) { }
 
@@ -37,14 +31,12 @@ public partial class AuthenticationController {
             return RedirectToRoute(callInfo.RouteValueDictionary);
         }
 
-
         [NonAction]
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public System.Web.Mvc.ActionResult LogOff() {
             return new T4MVC_ActionResult(Area, Name, ActionNames.LogOff);
         }
 
-
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public AuthenticationController Actions { get { return MVC.Authentication; } }
         [GeneratedCode("T4MVC", "2.0")]
@@ -57,70 +49,44 @@ public partial class AuthenticationController {
         public ActionNamesClass ActionNames { get { return s_actions; } }
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public class ActionNamesClass {
-
-
             public readonly string LogOn = "LogOn";
-
-
             public readonly string LogOff = "LogOff";
-
         }
 
 
-
         static readonly ViewNames s_views = new ViewNames();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ViewNames Views { get { return s_views; } }
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public class ViewNames {
-public readonly string LogOn = "~/Views/Authentication/LogOn.cshtml";
-
+            public readonly string LogOn = "~/Views/Authentication/LogOn.cshtml";
         }
     }
 
-
     [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
     public class T4MVC_AuthenticationController: NuGetGallery.AuthenticationController {
         public T4MVC_AuthenticationController() : base(Dummy.Instance) { }
 
-
         public override System.Web.Mvc.ActionResult LogOn() {
             var callInfo = new T4MVC_ActionResult(Area, Name, ActionNames.LogOn);
-
             return callInfo;
         }
 
-
         public override System.Web.Mvc.ActionResult LogOn(NuGetGallery.SignInRequest request, string returnUrl) {
             var callInfo = new T4MVC_ActionResult(Area, Name, ActionNames.LogOn);
-
-
             callInfo.RouteValueDictionary.Add("request", request);
-
             callInfo.RouteValueDictionary.Add("returnUrl", returnUrl);
-
-
             return callInfo;
         }
 
-
         public override System.Web.Mvc.ActionResult LogOff(string returnUrl) {
             var callInfo = new T4MVC_ActionResult(Area, Name, ActionNames.LogOff);
-
-
             callInfo.RouteValueDictionary.Add("returnUrl", returnUrl);
-
-
             return callInfo;
         }
 
-
     }
-
-
 }
 
-
-
 #endregion T4MVC
 #pragma warning restore 1591