Merge remote-tracking branch 'origin/aspnet-project-wizard'

Conflicts:
	main/src/addins/AspNet/MonoDevelop.AspNet.csproj
	main/src/addins/AspNet/packages.config
	main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj

2 files changed, 12 insertions, 5 deletions

diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs
index 9425f6dae8..69a6f6a5c7 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs
@@ -1094,6 +1094,7 @@ namespace Mono.TextTemplating
 			var initializeCodeGenerator = GetInitializeCodeGeneratorAction (cgType);
 			var cgFieldGen = cgType.GetMethod ("GenerateField", BindingFlags.NonPublic | BindingFlags.Instance);
 			var cgPropGen = cgType.GetMethod ("GenerateProperty", BindingFlags.NonPublic | BindingFlags.Instance);
+			var cgMethGen = cgType.GetMethod ("GenerateMethod", BindingFlags.NonPublic | BindingFlags.Instance);
 
 			#pragma warning disable 0618
 			var generator = (CodeGenerator) provider.CreateGenerator ();
@@ -1113,6 +1114,12 @@ namespace Mono.TextTemplating
 					cgPropGen.Invoke (generator, new object[] { p, dummy });
 					continue;
 				}
+				var m = member as CodeMemberMethod;
+				if (m != null) {
+					initializeCodeGenerator (generator, sw, options);
+					cgMethGen.Invoke (generator, new object[] { m, dummy });
+					continue;
+				}
 			}
 		}
 
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs
index 7d0c9eb9c8..df1bb81309 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.

 

 using System;

-using System.Collections.Generic;

+using System.CodeDom.Compiler;
 using System.IO;

+using System.Linq;
 using System.Xml;

 using MonoDevelop.Core;

-using MonoDevelop.Ide.Templates;

 using MonoDevelop.Core.StringParsing;

-using Microsoft.VisualStudio.TextTemplating;

+using MonoDevelop.Ide.Templates;
 

 namespace MonoDevelop.TextTemplating

 {

@@ -66,11 +66,11 @@ namespace MonoDevelop.TextTemplating
 				if (host.Errors.HasErrors) {

 					foreach (var err in host.Errors)

 						LoggingService.LogError ("Error in template generator: {0}", err.ToString());

-					throw new Exception ("Failed to generate file");

+					var firstError = host.Errors.OfType<CompilerError> ().First (f => !f.IsWarning);
+					throw new Exception ("Failed to generate file: " + firstError.ErrorText);
 				}

 				return output;

 			}

 		}

 	}

 }

-