maintenance: update T4MVC

Disco.Web/Disco.Web.csproj

@@ -185,8 +185,7 @@
     <Reference Include="System.Net.Http.WebRequest">
     </Reference>
     <Reference Include="T4MVCExtensions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\T4MVCExtensions.3.17.5\lib\net40\T4MVCExtensions.dll</HintPath>
-      <HintPath>..\packages\T4MVCExtensions.3.9.1\lib\net40\T4MVCExtensions.dll</HintPath>
     </Reference>
     <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

Disco.Web/Extensions/T4MVC/API.AuthorizationRoleController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -102,7 +104,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "AuthorizationRole";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "AuthorizationRole";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -294,4 +296,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.BootstrapperController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -78,7 +80,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "Bootstrapper";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Bootstrapper";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -160,4 +162,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.DeviceBatchController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -216,7 +218,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "DeviceBatch";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DeviceBatch";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -891,4 +893,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.DeviceCertificateController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "DeviceCertificate";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DeviceCertificate";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -132,4 +134,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.DeviceController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -228,7 +230,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "Device";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Device";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -933,4 +935,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.DeviceModelController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -138,7 +140,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "DeviceModel";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DeviceModel";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -505,4 +507,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.DeviceProfileController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -192,7 +194,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "DeviceProfile";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DeviceProfile";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -772,4 +774,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.DocumentTemplateController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -173,6 +175,48 @@ namespace Disco.Web.Areas.API.Controllers
         }
         [NonAction]
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerateDownload()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateDownload);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerateAddUsers()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddUsers);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerateAddGroupMembers()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddGroupMembers);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerateAddUserFlag()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddUserFlag);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerateAddDeviceProfile()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddDeviceProfile);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerateAddDeviceBatch()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddDeviceBatch);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerateAddDocumentAttachment()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddDocumentAttachment);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public virtual System.Web.Mvc.ActionResult Generate()
         {
             return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Generate);
@@ -183,6 +227,18 @@ namespace Disco.Web.Areas.API.Controllers
         {
             return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Delete);
         }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult GenerateDocumentHandlerUi()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.GenerateDocumentHandlerUi);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult DocumentHandlers()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.DocumentHandlers);
+        }
 
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public DocumentTemplateController Actions { get { return MVC.API.DocumentTemplate; } }
@@ -192,7 +248,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "DocumentTemplate";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DocumentTemplate";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -219,8 +275,17 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string ImporterUndetectedAssign = "ImporterUndetectedAssign";
             public readonly string ImporterUndetectedDelete = "ImporterUndetectedDelete";
             public readonly string BulkGenerate = "BulkGenerate";
+            public readonly string BulkGenerateDownload = "BulkGenerateDownload";
+            public readonly string BulkGenerateAddUsers = "BulkGenerateAddUsers";
+            public readonly string BulkGenerateAddGroupMembers = "BulkGenerateAddGroupMembers";
+            public readonly string BulkGenerateAddUserFlag = "BulkGenerateAddUserFlag";
+            public readonly string BulkGenerateAddDeviceProfile = "BulkGenerateAddDeviceProfile";
+            public readonly string BulkGenerateAddDeviceBatch = "BulkGenerateAddDeviceBatch";
+            public readonly string BulkGenerateAddDocumentAttachment = "BulkGenerateAddDocumentAttachment";
             public readonly string Generate = "Generate";
             public readonly string Delete = "Delete";
+            public readonly string GenerateDocumentHandlerUi = "GenerateDocumentHandlerUi";
+            public readonly string DocumentHandlers = "DocumentHandlers";
         }
 
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -246,8 +311,17 @@ namespace Disco.Web.Areas.API.Controllers
             public const string ImporterUndetectedAssign = "ImporterUndetectedAssign";
             public const string ImporterUndetectedDelete = "ImporterUndetectedDelete";
             public const string BulkGenerate = "BulkGenerate";
+            public const string BulkGenerateDownload = "BulkGenerateDownload";
+            public const string BulkGenerateAddUsers = "BulkGenerateAddUsers";
+            public const string BulkGenerateAddGroupMembers = "BulkGenerateAddGroupMembers";
+            public const string BulkGenerateAddUserFlag = "BulkGenerateAddUserFlag";
+            public const string BulkGenerateAddDeviceProfile = "BulkGenerateAddDeviceProfile";
+            public const string BulkGenerateAddDeviceBatch = "BulkGenerateAddDeviceBatch";
+            public const string BulkGenerateAddDocumentAttachment = "BulkGenerateAddDocumentAttachment";
             public const string Generate = "Generate";
             public const string Delete = "Delete";
+            public const string GenerateDocumentHandlerUi = "GenerateDocumentHandlerUi";
+            public const string DocumentHandlers = "DocumentHandlers";
         }
 
 
@@ -439,6 +513,64 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string DataIds = "DataIds";
             public readonly string InsertBlankPage = "InsertBlankPage";
         }
+        static readonly ActionParamsClass_BulkGenerateDownload s_params_BulkGenerateDownload = new ActionParamsClass_BulkGenerateDownload();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerateDownload BulkGenerateDownloadParams { get { return s_params_BulkGenerateDownload; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerateDownload
+        {
+            public readonly string id = "id";
+            public readonly string fileName = "fileName";
+        }
+        static readonly ActionParamsClass_BulkGenerateAddUsers s_params_BulkGenerateAddUsers = new ActionParamsClass_BulkGenerateAddUsers();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerateAddUsers BulkGenerateAddUsersParams { get { return s_params_BulkGenerateAddUsers; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerateAddUsers
+        {
+            public readonly string userIds = "userIds";
+        }
+        static readonly ActionParamsClass_BulkGenerateAddGroupMembers s_params_BulkGenerateAddGroupMembers = new ActionParamsClass_BulkGenerateAddGroupMembers();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerateAddGroupMembers BulkGenerateAddGroupMembersParams { get { return s_params_BulkGenerateAddGroupMembers; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerateAddGroupMembers
+        {
+            public readonly string groupId = "groupId";
+        }
+        static readonly ActionParamsClass_BulkGenerateAddUserFlag s_params_BulkGenerateAddUserFlag = new ActionParamsClass_BulkGenerateAddUserFlag();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerateAddUserFlag BulkGenerateAddUserFlagParams { get { return s_params_BulkGenerateAddUserFlag; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerateAddUserFlag
+        {
+            public readonly string flagId = "flagId";
+        }
+        static readonly ActionParamsClass_BulkGenerateAddDeviceProfile s_params_BulkGenerateAddDeviceProfile = new ActionParamsClass_BulkGenerateAddDeviceProfile();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerateAddDeviceProfile BulkGenerateAddDeviceProfileParams { get { return s_params_BulkGenerateAddDeviceProfile; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerateAddDeviceProfile
+        {
+            public readonly string deviceProfileId = "deviceProfileId";
+        }
+        static readonly ActionParamsClass_BulkGenerateAddDeviceBatch s_params_BulkGenerateAddDeviceBatch = new ActionParamsClass_BulkGenerateAddDeviceBatch();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerateAddDeviceBatch BulkGenerateAddDeviceBatchParams { get { return s_params_BulkGenerateAddDeviceBatch; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerateAddDeviceBatch
+        {
+            public readonly string deviceBatchId = "deviceBatchId";
+        }
+        static readonly ActionParamsClass_BulkGenerateAddDocumentAttachment s_params_BulkGenerateAddDocumentAttachment = new ActionParamsClass_BulkGenerateAddDocumentAttachment();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerateAddDocumentAttachment BulkGenerateAddDocumentAttachmentParams { get { return s_params_BulkGenerateAddDocumentAttachment; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerateAddDocumentAttachment
+        {
+            public readonly string documentTemplateId = "documentTemplateId";
+            public readonly string threshold = "threshold";
+        }
         static readonly ActionParamsClass_Generate s_params_Generate = new ActionParamsClass_Generate();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionParamsClass_Generate GenerateParams { get { return s_params_Generate; } }
@@ -457,6 +589,25 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string id = "id";
             public readonly string redirect = "redirect";
         }
+        static readonly ActionParamsClass_GenerateDocumentHandlerUi s_params_GenerateDocumentHandlerUi = new ActionParamsClass_GenerateDocumentHandlerUi();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_GenerateDocumentHandlerUi GenerateDocumentHandlerUiParams { get { return s_params_GenerateDocumentHandlerUi; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_GenerateDocumentHandlerUi
+        {
+            public readonly string templateId = "templateId";
+            public readonly string targetId = "targetId";
+            public readonly string handlerId = "handlerId";
+        }
+        static readonly ActionParamsClass_DocumentHandlers s_params_DocumentHandlers = new ActionParamsClass_DocumentHandlers();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_DocumentHandlers DocumentHandlersParams { get { return s_params_DocumentHandlers; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_DocumentHandlers
+        {
+            public readonly string templateId = "templateId";
+            public readonly string targetId = "targetId";
+        }
         static readonly ViewsClass s_views = new ViewsClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ViewsClass Views { get { return s_views; } }
@@ -763,6 +914,92 @@ namespace Disco.Web.Areas.API.Controllers
             return callInfo;
         }
 
+        [NonAction]
+        partial void BulkGenerateDownloadOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string fileName);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerateDownload(string id, string fileName)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateDownload);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "fileName", fileName);
+            BulkGenerateDownloadOverride(callInfo, id, fileName);
+            return callInfo;
+        }
+
+        [NonAction]
+        partial void BulkGenerateAddUsersOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string userIds);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerateAddUsers(string userIds)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddUsers);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "userIds", userIds);
+            BulkGenerateAddUsersOverride(callInfo, userIds);
+            return callInfo;
+        }
+
+        [NonAction]
+        partial void BulkGenerateAddGroupMembersOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string groupId);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerateAddGroupMembers(string groupId)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddGroupMembers);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "groupId", groupId);
+            BulkGenerateAddGroupMembersOverride(callInfo, groupId);
+            return callInfo;
+        }
+
+        [NonAction]
+        partial void BulkGenerateAddUserFlagOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int flagId);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerateAddUserFlag(int flagId)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddUserFlag);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "flagId", flagId);
+            BulkGenerateAddUserFlagOverride(callInfo, flagId);
+            return callInfo;
+        }
+
+        [NonAction]
+        partial void BulkGenerateAddDeviceProfileOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int deviceProfileId);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerateAddDeviceProfile(int deviceProfileId)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddDeviceProfile);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "deviceProfileId", deviceProfileId);
+            BulkGenerateAddDeviceProfileOverride(callInfo, deviceProfileId);
+            return callInfo;
+        }
+
+        [NonAction]
+        partial void BulkGenerateAddDeviceBatchOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int deviceBatchId);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerateAddDeviceBatch(int deviceBatchId)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddDeviceBatch);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "deviceBatchId", deviceBatchId);
+            BulkGenerateAddDeviceBatchOverride(callInfo, deviceBatchId);
+            return callInfo;
+        }
+
+        [NonAction]
+        partial void BulkGenerateAddDocumentAttachmentOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string documentTemplateId, System.DateTime? threshold);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerateAddDocumentAttachment(string documentTemplateId, System.DateTime? threshold)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerateAddDocumentAttachment);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "documentTemplateId", documentTemplateId);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "threshold", threshold);
+            BulkGenerateAddDocumentAttachmentOverride(callInfo, documentTemplateId, threshold);
+            return callInfo;
+        }
+
         [NonAction]
         partial void GenerateOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string TargetId);
 
@@ -789,8 +1026,35 @@ namespace Disco.Web.Areas.API.Controllers
             return callInfo;
         }
 
+        [NonAction]
+        partial void GenerateDocumentHandlerUiOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string templateId, string targetId, string handlerId);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult GenerateDocumentHandlerUi(string templateId, string targetId, string handlerId)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.GenerateDocumentHandlerUi);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "templateId", templateId);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "targetId", targetId);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "handlerId", handlerId);
+            GenerateDocumentHandlerUiOverride(callInfo, templateId, targetId, handlerId);
+            return callInfo;
+        }
+
+        [NonAction]
+        partial void DocumentHandlersOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string templateId, string targetId);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult DocumentHandlers(string templateId, string targetId)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.DocumentHandlers);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "templateId", templateId);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "targetId", targetId);
+            DocumentHandlersOverride(callInfo, templateId, targetId);
+            return callInfo;
+        }
+
     }
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.DocumentTemplatePackageController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -138,7 +140,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "DocumentTemplatePackage";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DocumentTemplatePackage";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -486,4 +488,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.ExpressionsController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "Expressions";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Expressions";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -132,4 +134,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.JobController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -456,7 +458,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "Job";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Job";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -2158,4 +2160,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.JobPreferencesController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -114,7 +116,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "JobPreferences";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "JobPreferences";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -348,4 +350,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.JobQueueController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -132,7 +134,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "JobQueue";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "JobQueue";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -458,4 +460,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.JobQueueJobController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -114,7 +116,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "JobQueueJob";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "JobQueueJob";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -368,4 +370,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.LoggingController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -78,7 +80,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "Logging";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Logging";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -183,4 +185,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.PluginController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -96,7 +98,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "Plugin";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Plugin";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -283,4 +285,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.SearchController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -78,7 +80,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "Search";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Search";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -164,4 +166,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.SystemController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -150,7 +152,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "System";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "System";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -644,4 +646,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.UserController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -120,7 +122,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "User";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "User";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -370,4 +372,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.UserFlagAssignmentController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -90,7 +92,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "UserFlagAssignment";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "UserFlagAssignment";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -230,4 +232,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/API.UserFlagController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -144,7 +146,7 @@ namespace Disco.Web.Areas.API.Controllers
         public readonly string Name = "UserFlag";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "UserFlag";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -524,4 +526,4 @@ namespace Disco.Web.Areas.API.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.AuthorizationRoleController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "AuthorizationRole";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "AuthorizationRole";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -171,4 +173,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.ConfigController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "Config";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Config";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -119,4 +121,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.DeviceBatchController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "DeviceBatch";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DeviceBatch";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -186,4 +188,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.DeviceModelController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "DeviceModel";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DeviceModel";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -153,4 +155,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.DeviceProfileController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "DeviceProfile";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DeviceProfile";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -190,4 +192,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.DocumentTemplateController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -71,6 +73,12 @@ namespace Disco.Web.Areas.Config.Controllers
         }
         [NonAction]
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult BulkGenerate()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerate);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public virtual System.Web.Mvc.ActionResult ExpressionBrowser()
         {
             return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.ExpressionBrowser);
@@ -84,7 +92,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "DocumentTemplate";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "DocumentTemplate";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -97,6 +105,7 @@ namespace Disco.Web.Areas.Config.Controllers
             public readonly string UndetectedPages = "UndetectedPages";
             public readonly string Create = "Create";
             public readonly string CreatePackage = "CreatePackage";
+            public readonly string BulkGenerate = "BulkGenerate";
             public readonly string ExpressionBrowser = "ExpressionBrowser";
         }
 
@@ -109,6 +118,7 @@ namespace Disco.Web.Areas.Config.Controllers
             public const string UndetectedPages = "UndetectedPages";
             public const string Create = "Create";
             public const string CreatePackage = "CreatePackage";
+            public const string BulkGenerate = "BulkGenerate";
             public const string ExpressionBrowser = "ExpressionBrowser";
         }
 
@@ -120,6 +130,8 @@ namespace Disco.Web.Areas.Config.Controllers
         public class ActionParamsClass_Index
         {
             public readonly string id = "id";
+            public readonly string bulkGenerateId = "bulkGenerateId";
+            public readonly string bulkGenerateFilename = "bulkGenerateFilename";
         }
         static readonly ActionParamsClass_ShowPackage s_params_ShowPackage = new ActionParamsClass_ShowPackage();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -145,6 +157,14 @@ namespace Disco.Web.Areas.Config.Controllers
         {
             public readonly string model = "model";
         }
+        static readonly ActionParamsClass_BulkGenerate s_params_BulkGenerate = new ActionParamsClass_BulkGenerate();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_BulkGenerate BulkGenerateParams { get { return s_params_BulkGenerate; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_BulkGenerate
+        {
+            public readonly string id = "id";
+        }
         static readonly ActionParamsClass_ExpressionBrowser s_params_ExpressionBrowser = new ActionParamsClass_ExpressionBrowser();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionParamsClass_ExpressionBrowser ExpressionBrowserParams { get { return s_params_ExpressionBrowser; } }
@@ -165,6 +185,7 @@ namespace Disco.Web.Areas.Config.Controllers
             public class _ViewNamesClass
             {
                 public readonly string _ExpressionsTable = "_ExpressionsTable";
+                public readonly string BulkGenerate = "BulkGenerate";
                 public readonly string Create = "Create";
                 public readonly string CreatePackage = "CreatePackage";
                 public readonly string ExpressionBrowser = "ExpressionBrowser";
@@ -175,6 +196,7 @@ namespace Disco.Web.Areas.Config.Controllers
                 public readonly string UndetectedPages = "UndetectedPages";
             }
             public readonly string _ExpressionsTable = "~/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.cshtml";
+            public readonly string BulkGenerate = "~/Areas/Config/Views/DocumentTemplate/BulkGenerate.cshtml";
             public readonly string Create = "~/Areas/Config/Views/DocumentTemplate/Create.cshtml";
             public readonly string CreatePackage = "~/Areas/Config/Views/DocumentTemplate/CreatePackage.cshtml";
             public readonly string ExpressionBrowser = "~/Areas/Config/Views/DocumentTemplate/ExpressionBrowser.cshtml";
@@ -192,14 +214,16 @@ namespace Disco.Web.Areas.Config.Controllers
         public T4MVC_DocumentTemplateController() : base(Dummy.Instance) { }
 
         [NonAction]
-        partial void IndexOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id);
+        partial void IndexOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string bulkGenerateId, string bulkGenerateFilename);
 
         [NonAction]
-        public override System.Web.Mvc.ActionResult Index(string id)
+        public override System.Web.Mvc.ActionResult Index(string id, string bulkGenerateId, string bulkGenerateFilename)
         {
             var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Index);
             ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
-            IndexOverride(callInfo, id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "bulkGenerateId", bulkGenerateId);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "bulkGenerateFilename", bulkGenerateFilename);
+            IndexOverride(callInfo, id, bulkGenerateId, bulkGenerateFilename);
             return callInfo;
         }
 
@@ -283,6 +307,18 @@ namespace Disco.Web.Areas.Config.Controllers
             return callInfo;
         }
 
+        [NonAction]
+        partial void BulkGenerateOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult BulkGenerate(string id)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.BulkGenerate);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            BulkGenerateOverride(callInfo, id);
+            return callInfo;
+        }
+
         [NonAction]
         partial void ExpressionBrowserOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string type, bool StaticDeclaredMembersOnly);
 
@@ -300,4 +336,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.EnrolmentController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "Enrolment";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Enrolment";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -134,4 +136,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.ExpressionsController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "Expressions";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Expressions";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -119,4 +121,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.JobPreferencesController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "JobPreferences";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "JobPreferences";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -138,4 +140,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.JobQueueController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "JobQueue";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "JobQueue";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -171,4 +173,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.LoggingController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "Logging";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Logging";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -149,4 +151,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.OrganisationController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "Organisation";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Organisation";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -119,4 +121,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.PluginsController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "Plugins";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Plugins";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -178,4 +180,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.SharedController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -51,4 +53,4 @@ namespace T4MVC.Config
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.SystemConfigController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "SystemConfig";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "SystemConfig";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -119,4 +121,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Config.UserFlagController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
         public readonly string Name = "UserFlag";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "UserFlag";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -171,4 +173,4 @@ namespace Disco.Web.Areas.Config.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/DeviceController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -96,7 +98,7 @@ namespace Disco.Web.Controllers
         public readonly string Name = "Device";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Device";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -335,4 +337,4 @@ namespace Disco.Web.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/InitialConfigController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -84,7 +86,7 @@ namespace Disco.Web.Controllers
         public readonly string Name = "InitialConfig";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "InitialConfig";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -373,4 +375,4 @@ namespace Disco.Web.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/JobController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -108,7 +110,7 @@ namespace Disco.Web.Controllers
         public readonly string Name = "Job";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Job";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -611,4 +613,4 @@ namespace Disco.Web.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/PluginWebHandlerController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -78,7 +80,7 @@ namespace Disco.Web.Controllers
         public readonly string Name = "PluginWebHandler";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "PluginWebHandler";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -166,4 +168,4 @@ namespace Disco.Web.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Public.HeldDevicesController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -78,7 +80,7 @@ namespace Disco.Web.Areas.Public.Controllers
         public readonly string Name = "HeldDevices";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "HeldDevices";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -235,4 +237,4 @@ namespace Disco.Web.Areas.Public.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Public.PublicController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Areas.Public.Controllers
         public readonly string Name = "Public";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Public";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -149,4 +151,4 @@ namespace Disco.Web.Areas.Public.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Public.UserHeldDevicesController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -78,7 +80,7 @@ namespace Disco.Web.Areas.Public.Controllers
         public readonly string Name = "UserHeldDevices";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "UserHeldDevices";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -235,4 +237,4 @@ namespace Disco.Web.Areas.Public.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/SearchController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Controllers
         public readonly string Name = "Search";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Search";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -138,4 +140,4 @@ namespace Disco.Web.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/Services.ClientController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -84,7 +86,7 @@ namespace Disco.Web.Areas.Services.Controllers
         public readonly string Name = "Client";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Client";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -218,4 +220,4 @@ namespace Disco.Web.Areas.Services.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/SharedController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -71,4 +73,4 @@ namespace T4MVC
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/T4MVC.tt

@@ -1,10 +1,10 @@
 <#
 /*
-T4MVC Version 3.9.1
+T4MVC Version 3.17.5
-Find latest version and documentation at http://mvccontrib.codeplex.com/wikipage?title=T4MVC
+Find latest version and documentation at https://github.com/T4MVC/T4MVC/wiki/Documentation
-Discuss on StackOverflow or on Codeplex (https://t4mvc.codeplex.com/discussions)
+Discuss on StackOverflow or on GitHub (https://github.com/T4MVC/T4MVC/issues)
 
-T4MVC is part of the MvcContrib project, but in a different Codeplex location (http://t4mvc.codeplex.com)
+T4MVC is part of the MvcContrib project, but in a different GitHub site (https://github.com/T4MVC/T4MVC)
 Maintained by David Ebbo, with much feedback from the MVC community (thanks all!)
 david.ebbo@microsoft.com
 http://twitter.com/davidebbo
@@ -12,14 +12,11 @@ http://blog.davidebbo.com/ (previously: http://blogs.msdn.com/davidebb)
 
 Related blog posts: http://blogs.msdn.com/davidebb/archive/tags/T4MVC/default.aspx
 
-Please use in accordance to the MvcContrib license (http://mvccontrib.codeplex.com/license)
+Please use in accordance to the license (https://github.com/T4MVC/T4MVC/blob/master/License.txt)
 */
 #>
 <#@ template language="C#" debug="true" hostspecific="true" #>
 <#@ assembly name="System.Core" #>
-<#@ assembly name="Microsoft.VisualStudio.Shell.Interop" #>
-<#@ assembly name="EnvDTE" #>
-<#@ assembly name="EnvDTE80" #>
 <#@ assembly name="VSLangProj" #>
 <#@ assembly name="System.Xml" #>
 <#@ assembly name="System.Xml.Linq" #>
@@ -44,8 +41,10 @@ Please use in accordance to the MvcContrib license (http://mvccontrib.codeplex.c
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -134,17 +133,33 @@ internal partial class T4MVC_<#=resultType.UniqueName #> : <#=resultType.FullNam
 namespace <#=settings.LinksNamespace #>
 {
 <#
-foreach (string folder in settings.StaticFilesFolders.Concat(GetStaticFilesViewFolders())) {
+var inAreas = Areas
+    .Where(a => !string.IsNullOrEmpty(a.Name))
+    .SelectMany(a => settings.StaticFilesFolders.Select(b => settings.AreasFolder + "\\" + a.Name + "\\" + b));
+
+foreach (string folder in settings.StaticFilesFolders
+    .Concat(GetStaticFilesViewFolders())
+    .Concat(inAreas)
+    ) {
     ProcessStaticFiles(Project, folder);
 }
+
+PushIndent("    ");
+#>
+
+[<#= GeneratedCode #>, DebuggerNonUserCode]
+public static partial class Bundles
+{
+<#
+	foreach (string folder in settings.StaticFilesFolders
+		.Concat(GetStaticFilesViewFolders())
+		.Concat(inAreas)
+		) {
+            ProcessBundles(Project, folder);
+        }
+    
+        PopIndent();
 #>
-    [<#= GeneratedCode #>, DebuggerNonUserCode]
-    public static partial class Bundles
-    {
-        [<#= GeneratedCode #>, DebuggerNonUserCode]
-        public static partial class Scripts {}
-        [<#= GeneratedCode #>, DebuggerNonUserCode]
-        public static partial class Styles {}
     }
 }
 
@@ -220,9 +235,9 @@ namespace <#=controller.Namespace #>
         [<#= GeneratedCode #>, DebuggerNonUserCode]
         public virtual <#=method.ReturnTypeFullName #> <#=method.Name #>()
         {
-<#if (method.ReturnTypeFullName == "System.Threading.Tasks.Task<System.Web.Mvc.ActionResult>") { #>
+<#if (method.IsTaskBased) { #>
             var callInfo = new T4MVC_<#=method.ReturnTypeUniqueName #>(Area, Name, ActionNames.<#=method.ActionName #><# if (method.ActionUrlHttps) {#>, "https"<#}#>);
-            return System.Threading.Tasks.Task.FromResult(callInfo as ActionResult);
+            return System.Threading.Tasks.Task.FromResult(callInfo as <#=method.TaskActionTypeFullName #>);
 <#} else { #>
             return new T4MVC_<#=method.ReturnTypeUniqueName #>(Area, Name, ActionNames.<#=method.ActionName #><# if (method.ActionUrlHttps) {#>, "https"<#}#>);
 <#} #>
@@ -247,8 +262,8 @@ namespace <#=controller.Namespace #>
             ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, <#=p.RouteNameExpression #>, <#=p.Name #>);
 <#} #>
 <#}#>
-<#if (method.ReturnTypeFullName == "System.Threading.Tasks.Task<System.Web.Mvc.ActionResult>") { #>
+<#if (method.IsTaskBased) { #>
-            return System.Threading.Tasks.Task.FromResult(callInfo as ActionResult);
+            return System.Threading.Tasks.Task.FromResult(callInfo as <#=method.TaskActionTypeFullName #>);
 <#} else { #>
             return callInfo;
 <#} #>
@@ -263,7 +278,7 @@ namespace <#=controller.Namespace #>
         public readonly string Name = "<#=ProcessAreaOrControllerName(controller.Name) #>";
         [<#= GeneratedCode #>]
         public const string NameConst = "<#=ProcessAreaOrControllerName(controller.Name) #>";
-
+        [<#= GeneratedCode #>]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [<#= GeneratedCode #>, DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -358,8 +373,8 @@ foreach (var group in controller.UniqueParameterNamesGroupedByActionName) if (gr
 <#} #>
 <#}#>
             <#=method.Name #>Override(callInfo<#if (method.Parameters.Count > 0) { #><#foreach (var p in method.Parameters) { #>, <#=p.Name #><#}}#>);
-<#if (method.ReturnTypeFullName == "System.Threading.Tasks.Task<System.Web.Mvc.ActionResult>") { #>
+<#if (method.IsTaskBased) { #>
-            return System.Threading.Tasks.Task.FromResult(callInfo as ActionResult);
+            return System.Threading.Tasks.Task.FromResult(callInfo as <#=method.TaskActionTypeFullName #>);
 <#} else { #>
             return callInfo;
 <#} #>
@@ -410,7 +425,7 @@ namespace System.Web.Mvc {
 
 <#manager.StartFooter(); #>
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114
 <#manager.EndBlock(); #>
 <#settings.SaveChanges(manager); #>
 <#manager.Process(settings.SplitIntoMultipleFiles); #>
@@ -434,6 +449,39 @@ static string GeneratedCode = @"GeneratedCode(""T4MVC"", ""2.0"")";
 static Microsoft.CSharp.CSharpCodeProvider codeProvider = new Microsoft.CSharp.CSharpCodeProvider();
 List<string> virtualPathesForStaticFiles = new List<string>();
 
+static CodeTypeRef TryCreateActionResultDerivedCodeTypeRef(CodeType codeType) {
+    return codeType.get_IsDerivedFrom("System.Web.Mvc.ActionResult")
+        ? Project.CodeModel.CreateCodeTypeRef(codeType.FullName)
+        : null;
+}
+
+enum ActionTypeMatch {
+    None = 0,
+    Direct = 1,
+    TaskBased = 2
+}
+
+static ActionTypeMatch TryGetActionType(CodeType codeType, out CodeTypeRef actionTypeRef) {
+    // check for task based
+    Match match = Regex.Match(codeType.FullName, "^System.Threading.Tasks.Task<(.+)>$");
+    if (match == null || !match.Success) {
+        actionTypeRef = TryCreateActionResultDerivedCodeTypeRef(codeType);
+        return actionTypeRef != null
+            ? ActionTypeMatch.Direct
+            : ActionTypeMatch.None;
+    } else {
+        CodeTypeRef typeRef = Project.CodeModel.CreateCodeTypeRef(match.Groups[1].Value);
+        if (typeRef.CodeType.get_IsDerivedFrom("System.Web.Mvc.ActionResult"))
+            actionTypeRef = typeRef;
+        else
+            actionTypeRef = null;
+        return actionTypeRef != null
+            ? ActionTypeMatch.TaskBased
+            : ActionTypeMatch.None;
+    }
+}
+
+
 IEnumerable<ControllerInfo> GetControllers()
 {
     var controllers = new List<ControllerInfo>();
@@ -514,7 +562,7 @@ void PrepareDataToRender(TextTransformation tt)
     var serviceProvider = Host as IServiceProvider;
     if (serviceProvider != null)
     {
-        Dte = (EnvDTE.DTE)serviceProvider.GetService(typeof(EnvDTE.DTE));
+        Dte = (EnvDTE.DTE)serviceProvider.GetCOMService(typeof(EnvDTE.DTE));
     }
 
     // Fail if we couldn't get the DTE. This can happen when trying to run in TextTransform.exe
@@ -693,8 +741,8 @@ void ProcessControllerType(CodeClass2 type, AreaInfo area, DateTime controllerLa
     if (!IsController(type))
         return;
 
-    // Don't process generic classes (their concrete derived classes will be processed)
+    // Only process "processable" controllers
-    if (type.IsGeneric)
+    if (!IsProcessableController(type))
         return;
 
     //Ignore references to controllers we create
@@ -744,7 +792,11 @@ void ProcessControllerType(CodeClass2 type, AreaInfo area, DateTime controllerLa
     if (type.IsAbstract)
     {
         // If it's abstract, set a flag and don't process action methods (derived classes will)
-        target.IsAbstract = true;
+        if (!HasControllerAttribute(type))
+            target.IsAbstract = true;
+        // ...unless it has the [T4MVC] attribute, then process all the action methods in the controller
+        else
+            ProcessControllerActionMethods(target, type);
     }
     else
     {
@@ -851,9 +903,12 @@ void ProcessControllerActionMethods(ControllerInfo controllerInfo, CodeClass2 cu
                 continue;
 
             // We only support action methods that return an ActionResult and Task<ActionResult> derived types
-            if (!method.Type.CodeType.get_IsDerivedFrom("System.Web.Mvc.ActionResult") && method.Type.CodeType.FullName !="System.Threading.Tasks.Task<System.Web.Mvc.ActionResult>")
+            CodeTypeRef methodType;
+            ActionTypeMatch match = TryGetActionType(method.Type.CodeType, out methodType);
+            if (match == ActionTypeMatch.None)
             {
-                Warning(String.Format("{0} doesn't support {1}.{2} because it doesn't return a supported {3} type", T4FileName, type.Name, method.Name, method.Type.CodeType.FullName));
+                // Comment out warning, as it's more annoying than helpful
+                //Warning(String.Format("{0} doesn't support {1}.{2} because it doesn't return a supported {3} type", T4FileName, type.Name, method.Name, method.Type.CodeType.FullName));
                 continue;
             }
 
@@ -862,10 +917,6 @@ void ProcessControllerActionMethods(ControllerInfo controllerInfo, CodeClass2 cu
             if (isAsyncController && method.Name.EndsWith("Completed", StringComparison.OrdinalIgnoreCase))
                 continue;
 
-            var methodType = method.Type;
-            if(method.Type.CodeType.FullName == "System.Threading.Tasks.Task<System.Web.Mvc.ActionResult>")
-                methodType = Project.CodeModel.CreateCodeTypeRef("System.Web.Mvc.ActionResult");
-
             // If we haven't yet seen this return type, keep track of it
             var resTypeInfo2 = new ResultTypeInfo(methodType);
             if (!ResultTypes.ContainsKey(resTypeInfo2.FullName))
@@ -890,7 +941,7 @@ void ProcessControllerActionMethods(ControllerInfo controllerInfo, CodeClass2 cu
             }
 
             // Collect misc info about the action method and add it to the collection
-            controllerInfo.ActionMethods.Add(new ActionMethodInfo(method, current));
+            controllerInfo.ActionMethods.Add(new ActionMethodInfo(method, current, null, match == ActionTypeMatch.TaskBased ?  methodType : null));
         }
     }
 }
@@ -916,7 +967,7 @@ void ProcessAllViews(ProjectItem viewsProjectItem, AreaInfo area)
                 Area = area,
                 NotRealController = true,
                 Namespace = MakeClassName(settings.T4MVCNamespace, area.Name),
-                ClassName = item.Name + ControllerSuffix
+                ClassName = Sanitize(item.Name) + ControllerSuffix
             };
             area.Controllers.Add(controller);
         }
@@ -1051,6 +1102,160 @@ IEnumerable<string> GetStaticFilesViewFolders()
     }
 }
 
+// Start of Bundles
+
+void ProcessBundles(Project project, string folder)
+{
+    ProjectItem folderProjectItem = GetProjectItem(project, folder);
+    if (folderProjectItem != null)
+    {
+        var rootPath = "~";
+        if (folder.Contains("\\"))
+        {
+            rootPath += "/" + folder.Replace("\\", "/");
+            rootPath = rootPath.Substring(0, rootPath.LastIndexOf("/"));
+        }
+        ProcessBundleFilesRecursive(folderProjectItem, rootPath);
+    }
+}
+
+void ProcessBundleFilesRecursive(ProjectItem projectItem, string path)
+{
+    int nestedLevel = BuildBundleClassStructureForProvidedPath(path);
+    ProcessBundleFilesRecursive(projectItem, path, new HashSet<String>());
+    for(int i = 0; i < nestedLevel; ++i) 
+    { 
+#>
+}
+<#+
+        PopIndent();
+    }
+}
+
+void ProcessBundleFilesRecursive(ProjectItem projectItem, string path, HashSet<String> nameSet)
+{
+    // The passed in HashSet is to guarantee uniqueness with our parent and siblings
+    string name = SanitizeWithNoConflicts(projectItem.Name, nameSet);
+
+    // This HashSet is to guarantee uniqueness of our direct children
+    // We add our own name to it to avoid class name conflicts (http://mvccontrib.codeplex.com/workitem/7153)
+    var childrenNameSet = new HashSet<String>(StringComparer.OrdinalIgnoreCase);
+
+    childrenNameSet.Add(settings.AssetsNamespace);
+    childrenNameSet.Add(name);
+
+    var files = new List<ProjectItem>();
+
+    if (IsFolder(projectItem))
+    {
+        PushIndent("    ");
+#>
+public static partial class <#=EscapeID(name)#> 
+{
+<#+
+        // Recurse into all the items in the folder
+        foreach (ProjectItem item in projectItem.ProjectItems)
+        {
+            if (IsFolder(item))
+            {
+                ProcessBundleFilesRecursive(
+                    item,
+                    path + "/" + projectItem.Name,
+                    childrenNameSet);
+            }
+
+            if (IsFile(item))
+            {
+                files.Add(item);
+            }
+        }
+
+        BuildBundleConstants(files, path + "/" + projectItem.Name, childrenNameSet);
+#>
+}
+<#+
+        PopIndent();
+    }    
+}
+
+void BuildBundleConstants(List<ProjectItem> projectItems, string path, HashSet<String> childrenNameSet)
+{
+    PushIndent("    ");
+#>
+public static class <#= settings.AssetsNamespace #>
+{
+<#+
+    PushIndent("    ");
+    foreach (var projectItem in projectItems)
+    {
+        // The passed in HashSet is to guarantee uniqueness with our parent and siblings
+        string name = SanitizeWithNoConflicts(projectItem.Name, childrenNameSet);
+
+        if (!settings.ExcludedStaticFileExtensions.Any(extension => projectItem.Name.EndsWith(extension, StringComparison.OrdinalIgnoreCase))) {
+            var bundleAssetPath = String.Format("{0}/{1}", path, projectItem.Name);
+    
+            // if it's a non-minified javascript file
+            if (projectItem.Name.EndsWith(".js")  && !projectItem.Name.Contains("-vsdoc")) 
+            {
+#>
+public const string <#=name#> = "<#=bundleAssetPath#>"; 
+<#+
+            }
+            else if (projectItem.Name.EndsWith(".css")) 
+            { 
+#>
+public const string <#=name#> = "<#=bundleAssetPath#>";
+<#+
+            }
+        } 
+
+        // Non folder items may also have children (virtual folders, Class.cs -> Class.Designer.cs, template output)
+        // Just register them on the same path as their parent item
+        foreach (ProjectItem item in projectItem.ProjectItems)
+        {
+            ProcessBundleFilesRecursive(item, path, childrenNameSet);
+        } 
+    }
+    PopIndent();
+#>
+}
+<#+
+    PopIndent();
+}
+
+int BuildBundleClassStructureForProvidedPath(string path)
+{
+    var folders = path.Split(new char[] {'/', '~'}, StringSplitOptions.RemoveEmptyEntries);
+    var parentFolder = String.Empty;
+    var currentPath = "~";
+    foreach(var folder in folders)
+    {
+        currentPath += "/" + folder;
+        string className = EscapeID(Sanitize(folder));
+        // If the folder name is the same as the parent, add a modifier to avoid class name conflicts
+        // http://mvccontrib.codeplex.com/workitem/7153
+        if (parentFolder == folder)
+        {
+            className += "_";
+        }
+
+        if(!virtualPathesForStaticFiles.Contains(currentPath))
+        {
+            virtualPathesForStaticFiles.Add(currentPath);
+        }
+        
+        PushIndent("    "); 
+#>
+public static partial class <#=className #> 
+{
+<#+
+        parentFolder = folder;
+    }
+    return folders.Length;
+}
+
+// End of Bundles
+
 void ProcessStaticFiles(Project project, string folder)
 {
     ProjectItem folderProjectItem = GetProjectItem(project, folder);
@@ -1092,9 +1297,9 @@ void ProcessStaticFilesRecursive(ProjectItem projectItem, string path, HashSet<S
         #>
     [<#= GeneratedCode #>, DebuggerNonUserCode]
     public static class <#=EscapeID(name)#> {
-        private const string URLPATH = "<#=path#>/<#=projectItem.Name#>";
+        public const string UrlPath = "<#=path#>/<#=projectItem.Name#>";
-        public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
+        public static string Url() { return T4MVCHelpers.ProcessVirtualPath(UrlPath); }
-        public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
+        public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(UrlPath + "/" + fileName); }
 <#+
 PushIndent("    ");
 
@@ -1115,36 +1320,38 @@ PopIndent();
 }
     else { #>
 <#+
+    var mapping = new Dictionary<string, Tuple<string, string>>();
+    mapping.Add(".ts", Tuple.Create(".js", ".min.js"));
+    mapping.Add(".tsx", Tuple.Create(".js", ".min.js"));
+    mapping.Add(".js", Tuple.Create(".js", ".min.js"));
+    mapping.Add(".css", Tuple.Create(".css", ".min.css"));
+
 if (!settings.ExcludedStaticFileExtensions.Any(extension => projectItem.Name.EndsWith(extension, StringComparison.OrdinalIgnoreCase))) {
-    // if it's a Typescript file
+
-    if (projectItem.Name.EndsWith(".ts")) {
+    var extension = Path.GetExtension(projectItem.Name);
-        string tsJavascriptName =  projectItem.Name.Replace(".ts", ".js");
+
-        string minifiedName = projectItem.Name.Replace(".ts", ".min.js");
+    if(mapping.ContainsKey(extension))
+    {
+        var map = mapping[extension];
+
+        if (!projectItem.Name.EndsWith(map.Item2)) {
+        string nonMinifiedName = projectItem.Name.Replace(extension, map.Item1);
+        string minifiedName = projectItem.Name.Replace(extension, map.Item2);
         if (AddTimestampToStaticLink(projectItem)) { #>
-    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/<#=minifiedName#>") ? Url("<#=minifiedName#>")+"?"+T4MVCHelpers.TimestampString(URLPATH + "/<#=minifiedName#>") : Url("<#=tsJavascriptName#>")+"?"+T4MVCHelpers.TimestampString(URLPATH + "/<#=tsJavascriptName#>");
+    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(UrlPath + "/<#=minifiedName#>") ? Url("<#=minifiedName#>")+"?"+T4MVCHelpers.TimestampString(UrlPath + "/<#=minifiedName#>") : Url("<#=nonMinifiedName#>")+"?"+T4MVCHelpers.TimestampString(UrlPath + "/<#=nonMinifiedName#>");
         <#+} else {#>
-    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/<#=minifiedName#>") ? Url("<#=minifiedName#>") : Url("<#=tsJavascriptName#>");
+    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(UrlPath + "/<#=minifiedName#>") ? Url("<#=minifiedName#>") : Url("<#=nonMinifiedName#>");
 <#+}  #>
 <#+}
-    // if it's a non-minified javascript file
+else if (AddTimestampToStaticLink(projectItem)) { #>
-    else if (projectItem.Name.EndsWith(".js") && !projectItem.Name.EndsWith(".min.js")) {
+    public static readonly string <#=name#> = Url("<#=projectItem.Name#>")+"?"+T4MVCHelpers.TimestampString(UrlPath + "/<#=projectItem.Name#>");
-        string minifiedName = projectItem.Name.Replace(".js", ".min.js");
-        if (AddTimestampToStaticLink(projectItem)) { #>
-    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/<#=minifiedName#>") ? Url("<#=minifiedName#>")+"?"+T4MVCHelpers.TimestampString(URLPATH + "/<#=minifiedName#>") : Url("<#=projectItem.Name#>")+"?"+T4MVCHelpers.TimestampString(URLPATH + "/<#=projectItem.Name#>");
-        <#+} else {#>
-    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/<#=minifiedName#>") ? Url("<#=minifiedName#>") : Url("<#=projectItem.Name#>");
-<#+}  #>
 <#+}
-    else if (projectItem.Name.EndsWith(".css") && !projectItem.Name.EndsWith(".min.css")) { 
+    else { #>
-        string minifiedName = projectItem.Name.Replace(".css", ".min.css");
+    public static readonly string <#=name#> = Url("<#=projectItem.Name#>");
-        if (AddTimestampToStaticLink(projectItem)) { #>
-    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/<#=minifiedName#>") ? Url("<#=minifiedName#>")+"?"+T4MVCHelpers.TimestampString(URLPATH + "/<#=minifiedName#>") : Url("<#=projectItem.Name#>")+"?"+T4MVCHelpers.TimestampString(URLPATH + "/<#=projectItem.Name#>");
-        <#+} else {#>
-    public static readonly string <#=name#> = T4MVCHelpers.IsProduction() && T4Extensions.FileExists(URLPATH + "/<#=minifiedName#>") ? Url("<#=minifiedName#>") : Url("<#=projectItem.Name#>");
-        <#+}  #> 
 <#+}
+    }
     else if (AddTimestampToStaticLink(projectItem)) { #>
-    public static readonly string <#=name#> = Url("<#=projectItem.Name#>")+"?"+T4MVCHelpers.TimestampString(URLPATH + "/<#=projectItem.Name#>");
+    public static readonly string <#=name#> = Url("<#=projectItem.Name#>")+"?"+T4MVCHelpers.TimestampString(UrlPath + "/<#=projectItem.Name#>");
 <#+}
     else { #>
     public static readonly string <#=name#> = Url("<#=projectItem.Name#>");
@@ -1182,9 +1389,9 @@ int BuildClassStructureForProvidedPath(string path)
 
     [<#= GeneratedCode #>, DebuggerNonUserCode]
     public static partial class <#=className #> {
-        private const string URLPATH = "<#=currentPath#>";
+        public const string UrlPath = "<#=currentPath#>";
-        public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
+        public static string Url() { return T4MVCHelpers.ProcessVirtualPath(UrlPath); }
-        public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
+        public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(UrlPath + "/" + fileName); }
 <#+     } else {
             #>
 
@@ -1209,15 +1416,18 @@ ProjectItem GetProjectItem(ProjectItems items, string subPath)
     {
         try
         {
-            // ProjectItems.Item() throws when it doesn't exist, so catch the exception
+            // ProjectItems.Item() sometimes throws when it doesn't exist, so catch the exception
             // to return null instead.
             current = items.Item(name);
+
+            if (current == null) return null;
         }
         catch
         {
             // If any chunk couldn't be found, fail
             return null;
         }
+
         items = current.ProjectItems;
     }
 
@@ -1226,9 +1436,6 @@ ProjectItem GetProjectItem(ProjectItems items, string subPath)
 
 static bool IsController(CodeClass2 type)
 {
-    // Ignore any class which name doesn't end with "Controller"
-    if (!type.FullName.EndsWith(ControllerSuffix)) return false;
-
     for (; type.FullName != "System.Web.Mvc.Controller"; type = (CodeClass2)type.Bases.Item(1))
     {
         if (type.Bases.Count == 0)
@@ -1247,13 +1454,58 @@ static bool IsAsyncController(CodeClass2 type)
     return true;
 }
 
+static bool IsProcessableController(CodeClass2 type)
+{
+    // try get the [T4MVC] attribute
+    var attribute = GetAttribute(type.Attributes, "System.Web.Mvc.T4MVCAttribute");
+
+    // if [T4MVC(false)] was specified, then ignore this controller
+    if ((attribute != null) && (attribute.Value == "false")) return false;
+
+    // if [T4MVC] or [T4MVC(true)] was specified, then process this controller
+    if ((attribute != null) && (attribute.Value == "" || attribute.Value == "true")) return true;
+
+    // ...else attribute was not specified
+
+    // ignore any class whose name doesn't end with "Controller"
+    if (!type.FullName.EndsWith(ControllerSuffix)) return false;
+
+    // don't process a generic controller (its concrete derived classes will be processed)
+    if (type.IsGeneric)
+        return false;
+
+    return true;
+}
+
+static bool HasControllerAttribute(CodeClass2 type)
+{
+    // try get the [T4MVC] attribute
+    var attribute = GetAttribute(type.Attributes, "System.Web.Mvc.T4MVCAttribute");
+
+    // see whether [T4MVC] or [T4MVC(true)] were specified
+    if (attribute != null)
+        if (attribute.Value == "" || attribute.Value == "true")
+            return true;
+
+    return false;
+}
+
 static string GetVirtualPath(ProjectItem item)
 {
     string fileFullPath = item.get_FileNames(0);
 
-    // Ignore files that are not under the app root (e.g. they could be linked files)
+    // update full path for files that are not under the app root (e.g. they could be linked files)
     if (!fileFullPath.StartsWith(AppRoot, StringComparison.OrdinalIgnoreCase))
-        return null;
+    {
+        try
+        {
+            fileFullPath = ((ProjectItem)item.Collection.Parent).Properties.Item("FullPath").Value.ToString() + item.Name;
+        }
+        catch
+        {
+            return null;
+        }
+    }
 
     // Make a virtual path from the physical path
     return "~/" + fileFullPath.Substring(AppRoot.Length).Replace('\\', '/');
@@ -1269,21 +1521,21 @@ static IEnumerable<CodeFunction2> GetMethods(CodeClass2 codeClass)
 {
     // Only look at regular method (e.g. ignore things like contructors)
     return codeClass.Members.OfType<CodeFunction2>()
-        .Where(f => f.FunctionKind == vsCMFunction.vsCMFunctionFunction);
+        .Where(f => TestFunctionKind(f, vsCMFunction.vsCMFunctionFunction));
 }
 
 // Check if the class has any explicit constructor
 static bool HasExplicitConstructor(CodeClass2 codeClass)
 {
     return codeClass.Members.OfType<CodeFunction2>().Any(
-        f => !f.IsShared && f.FunctionKind == vsCMFunction.vsCMFunctionConstructor);
+        f => !f.IsShared && TestFunctionKind(f, vsCMFunction.vsCMFunctionConstructor));
 }
 
 // Check if the class has a default (i.e. no params) constructor
 static bool HasExplicitDefaultConstructor(CodeClass2 codeClass)
 {
     return codeClass.Members.OfType<CodeFunction2>().Any(
-        f => !f.IsShared && f.FunctionKind == vsCMFunction.vsCMFunctionConstructor && f.Parameters.Count == 0);
+        f => !f.IsShared && TestFunctionKind(f, vsCMFunction.vsCMFunctionConstructor) && f.Parameters.Count == 0);
 }
 
 // Find a method with a given name
@@ -1327,9 +1579,22 @@ static CodeAttribute2 GetAttribute(CodeClass2 type, string attributeType)
     return null;
 }
 
+static bool TestFunctionKind(CodeFunction2 f, vsCMFunction kind)
+{
+    try
+    {
+        return f.FunctionKind == kind;
+    }
+    catch
+    {
+        // FunctionKind blows up in some cases. Just ignore.
+        return false;
+    }
+}
+
 static string UniqueFullName(CodeTypeRef codeType)
 {
-	return UniqueFullName(codeType.CodeType);
+    return UniqueFullName(codeType.CodeType);
 }
 
 static string UniqueFullName(CodeType codeType)
@@ -1372,6 +1637,12 @@ static bool IsFeatureFolderArea(string areaName, ProjectItem areaFolder)
     }
 }
 
+static bool IsFile(ProjectItem item)
+{
+    return (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile);
+}
+
+
 static string MakeClassName(string ns, string classname)
 {
     return String.IsNullOrEmpty(ns) ? classname :
@@ -1414,6 +1685,23 @@ static string EscapeID(string id)
     return codeProvider.CreateEscapedIdentifier(id);
 }
 
+static string SanitizeDefaultValue(string defaultValue, string type)
+{
+    // Normalize default values that are
+    // 1. default(T) for some type T
+    // 2. The parameterless constructor of a value type
+    if (Regex.IsMatch(defaultValue, @"^\s*default\s*\(.*?\)"))
+    {
+        defaultValue = string.Format("default({0})", type);
+    }
+    else if(Regex.IsMatch(defaultValue, @"^\s*new\s*.*?\s*\(\s*\)"))
+    {
+        defaultValue = string.Format("new {0}()", type);
+    }
+
+    return defaultValue;
+}
+
 // Data structure to collect data about an area
 class AreaInfo
 {
@@ -1507,8 +1795,13 @@ class ControllerInfo
     {
         get
         {
-            // Trim the Controller suffix
+            // remove controller suffix (if it exists)
-            return ClassName.Substring(0, ClassName.Length - ControllerSuffix.Length);
+            string className = ClassName;
+            if (ClassName.EndsWith(ControllerSuffix)) {
+                className = className.Substring(0, ClassName.Length - ControllerSuffix.Length);
+            }
+
+            return className;
         }
     }
 
@@ -1687,7 +1980,7 @@ class ViewsFolderInfo
         string virtualPath = GetVirtualPath(item);
         if (virtualPath != null)
         {
-	        Views[viewFieldName] = useNonQualifiedViewName ? Path.GetFileNameWithoutExtension(viewName) : virtualPath;
+            Views[viewFieldName] = useNonQualifiedViewName ? Path.GetFileNameWithoutExtension(viewName) : virtualPath;
         }
     }
 
@@ -1702,9 +1995,12 @@ class FunctionInfo
 {
     protected CodeFunction2 _method;
     private string _signature;
+    protected CodeTypeRef _taskActionType;
 
-    public FunctionInfo(CodeFunction2 method)
+    public FunctionInfo(CodeFunction2 method, CodeTypeRef taskActionType = null)
     {
+        _taskActionType = taskActionType;
+
         Parameters = new List<MethodParamInfo>();
 
         // Can be null when an custom ActionResult has no ctor
@@ -1759,12 +2055,12 @@ class FunctionInfo
     public string Name { get { return _method.Name; } }
     public string ReturnType { get { return ReturnTypeImpl.AsString; } }
     public string ReturnTypeFullName { get { return ReturnTypeImpl.AsFullName; } }
-    public string ReturnTypeUniqueName { get { return IsTaskBased ? "System_Web_Mvc_ActionResult" : UniqueFullName(ReturnTypeImpl); } }
+    public string ReturnTypeUniqueName { get { return IsTaskBased ?  UniqueFullName(_taskActionType) : UniqueFullName(ReturnTypeImpl); } }
     public bool IsPublic { get { return _method.Access == vsCMAccess.vsCMAccessPublic; } }
     public List<MethodParamInfo> Parameters { get; private set; }
     public bool CanBeCalledWithoutParameters { get; private set; }
 
-    private bool IsTaskBased { get {return ReturnTypeImpl.AsFullName == "System.Threading.Tasks.Task<System.Web.Mvc.ActionResult>"; } }
+    public bool IsTaskBased { get {return _taskActionType != null; } }
 
     // Write out all the parameters as part of a method declaration
     public void WriteFormalParameters(bool first, bool includeDefaults = false)
@@ -1827,15 +2123,19 @@ class FunctionInfo
 // Data structure to collect data about an action method
 class ActionMethodInfo : FunctionInfo
 {
-    public ActionMethodInfo(CodeFunction2 method, CodeClass2 controller, CodeTypeRef asyncType = null)
+    public ActionMethodInfo(CodeFunction2 method, CodeClass2 controller, CodeTypeRef asyncType = null, CodeTypeRef taskActionType = null)
-        : base(method)
+        : base(method, taskActionType)
     {
-        if(asyncType != null) 
+        if (taskActionType != null) {
-        {
+            _taskActionType = taskActionType;
-            // Remove the Async from the end of the name to match the actual Action routing would use.
+        } else {
-            // This also separates the Action Calls from the implementation
+            if(asyncType != null)
-            _actionName = method.Name.Remove(method.Name.Length - 5);
+            {
-            _returnType = asyncType;
+                // Remove the Async from the end of the name to match the actual Action routing would use.
+                // This also separates the Action Calls from the implementation
+                _actionName = method.Name.Remove(method.Name.Length - 5);
+                _returnType = asyncType;
+            }
         }
         // Normally, the action name is the method name. But if there is an [ActionName] on
         // the method, get the expression from that instead
@@ -1855,7 +2155,15 @@ class ActionMethodInfo : FunctionInfo
 
     string _actionName;
     CodeTypeRef _returnType;
-    protected override CodeTypeRef ReturnTypeImpl { get { return _returnType ?? base.ReturnTypeImpl; } }
+    protected override CodeTypeRef ReturnTypeImpl { 
+        get {
+            if (IsTaskBased)
+                return Project.CodeModel.CreateCodeTypeRef("System.Threading.Tasks.Task<" + _taskActionType.AsFullName + ">");
+            return _returnType ?? base.ReturnTypeImpl;
+        }
+    }
+
+    public string TaskActionTypeFullName { get { return IsTaskBased ? _taskActionType.AsFullName : null; } }
 
     public string ActionName { get { return _actionName ?? base.Name; } }
     public string ActionNameValueExpression { get; set; }
@@ -1875,7 +2183,7 @@ class ResultTypeInfo
 
         // Use the constructor with the least number of parameters
         var ctor = _codeType.CodeType.Members.OfType<CodeFunction2>()
-            .Where(f => f.FunctionKind == vsCMFunction.vsCMFunctionConstructor)
+            .Where(f => TestFunctionKind(f, vsCMFunction.vsCMFunctionConstructor))
             .OrderBy(f => f.Parameters.Count)
             .FirstOrDefault();
         Constructor = new FunctionInfo(ctor);
@@ -1894,7 +2202,12 @@ class ResultTypeInfo
         }
     }
 
-    private bool IsTaskBased { get {return _codeType.AsFullName == "System.Threading.Tasks.Task<System.Web.Mvc.ActionResult>"; } }
+    private bool IsTaskBased { 
+        get {
+            CodeTypeRef methodType;
+            return TryGetActionType(_codeType.CodeType, out methodType) == ActionTypeMatch.TaskBased;
+        }
+    }
 }
 
 class MethodParamInfo
@@ -1936,6 +2249,7 @@ class MvcSettings : XmlSettings
         this.SupportAsyncActions = false;
         this.UseLowercaseRoutes = false;
         this.LinksNamespace = "Links";
+        this.AssetsNamespace = "Assets";
         this.AddTimestampToStaticLinks = false;
         this.StaticFilesFolders = new XmlStringArray(new string[] {
             "Scripts",
@@ -2006,6 +2320,9 @@ class MvcSettings : XmlSettings
     [System.ComponentModel.Description("The namespace that the links are generated in (e.g. \"Links\", as in Links.Content.nerd_jpg)")]
     public string LinksNamespace { get; set; }
 
+    [System.ComponentModel.Description("The namespace that raw URLS used for bundles are generated")]
+    public string AssetsNamespace { get; set; }
+
     [System.ComponentModel.Description("If true, links to static files include a query string containing the file's last change time.\r\nThis way, when the static file changes, the link changes and guarantees that the client will re-request the resource.\r\ne.g. when true, the link looks like: \"/Content/nerd.jpg?2009-09-04T12:25:48\"\r\nSee http://mvccontrib.codeplex.com/workitem/7163 for potential issues with this feature")]
     public bool AddTimestampToStaticLinks { get; set; }
 
@@ -2217,7 +2534,7 @@ class XmlStringArray : XmlSettingsBase, IEnumerable<string>
     }
 }
 
-/// This is the base class for the standard settings, the main settigns class should inherit from this
+/// This is the base class for the standard settings, the main settings class should inherit from this
 /// one since it provides the methods to interact with the T4 system and EnvDTE. Sub-properties can
 /// just inherit from XmlSettingsBase.
 abstract class XmlSettings : XmlSettingsBase

Disco.Web/Extensions/T4MVC/T4MVC.tt.settings.xml

@@ -46,6 +46,8 @@ This breaks the Go To Definition function for async actions.-->
   <UseLowercaseRoutes>False</UseLowercaseRoutes>
   <!--The namespace that the links are generated in (e.g. "Links", as in Links.Content.nerd_jpg)-->
   <LinksNamespace>Links</LinksNamespace>
+  <!--The namespace that raw URLS used for bundles are generated-->
+  <AssetsNamespace>Assets</AssetsNamespace>
   <!--If true, links to static files include a query string containing the file's last change time.
 This way, when the static file changes, the link changes and guarantees that the client will re-request the resource.
 e.g. when true, the link looks like: "/Content/nerd.jpg?2009-09-04T12:25:48"

Disco.Web/Extensions/T4MVC/UpdateController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -66,7 +68,7 @@ namespace Disco.Web.Controllers
         public readonly string Name = "Update";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "Update";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -121,4 +123,4 @@ namespace Disco.Web.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/Extensions/T4MVC/UserController.generated.cs

@@ -3,8 +3,10 @@
 // Don't change it directly as your change would get overwritten.  Instead, make changes
 // to the .tt file (i.e. the T4 template) and save it to regenerate this file.
 
-// Make sure the compiler doesn't complain about missing Xml comments
+// Make sure the compiler doesn't complain about missing Xml comments and CLS compliance
-#pragma warning disable 1591
+// 0108: suppress "Foo hides inherited member Foo. Use the new keyword if hiding was intended." when a controller and its abstract parent are both processed
+// 0114: suppress "Foo.BarController.Baz()' hides inherited member 'Qux.BarController.Baz()'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword." when an action (with an argument) overrides an action in a parent controller
+#pragma warning disable 1591, 3008, 3009, 0108, 0114
 #region T4MVC
 
 using System;
@@ -72,7 +74,7 @@ namespace Disco.Web.Controllers
         public readonly string Name = "User";
         [GeneratedCode("T4MVC", "2.0")]
         public const string NameConst = "User";
-
+        [GeneratedCode("T4MVC", "2.0")]
         static readonly ActionNamesClass s_actions = new ActionNamesClass();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionNamesClass ActionNames { get { return s_actions; } }
@@ -178,4 +180,4 @@ namespace Disco.Web.Controllers
 }
 
 #endregion T4MVC
-#pragma warning restore 1591
+#pragma warning restore 1591, 3008, 3009, 0108, 0114

Disco.Web/packages.config

@@ -43,8 +43,8 @@
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net45" />
-  <package id="T4MVC" version="3.9.1" targetFramework="net45" />
+  <package id="T4MVC" version="3.17.5" targetFramework="net45" />
-  <package id="T4MVCExtensions" version="3.9.1" targetFramework="net45" />
+  <package id="T4MVCExtensions" version="3.17.5" targetFramework="net45" />
   <package id="TinyMCE.jQuery" version="4.1.2" targetFramework="net45" />
   <package id="WebActivatorEx" version="2.0.5" targetFramework="net45" />
 </packages>