[Ide] Update .NET Core templating engine to 1.0.0-beta2-20170430-208

Updated from the beta1 templating engine to the beta2 version. This
allows the beta2 template NuGet packages to be used. The beta1
template NuGet packages do not allow the .NET Core 1.x project
templates to be used at the same time as the .NET Core 2.0 project
templates since they both have the same template ids. The beta2
template NuGet packages do support this since the template ids have
been changed for the .NET Core 2.0 project template NuGet packages.

2 files changed, 9 insertions, 8 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineProjectTemplatingProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineProjectTemplatingProvider.cs
index d032d940f3..13aabd621c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineProjectTemplatingProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineProjectTemplatingProvider.cs
@@ -77,14 +77,14 @@ namespace MonoDevelop.Ide.Templates
 			//TODO: Uncomment this IF, but also add logic to invalidate/check if new templates were added from newly installed AddOns...
 			//if (!paths.Exists (paths.User.BaseDir) || !paths.Exists (paths.User.FirstRunCookie)) {
 			paths.DeleteDirectory (paths.User.BaseDir);//Delete cache
-			var _templateCache = new TemplateCache (environmentSettings);
+			var settingsLoader = (SettingsLoader)environmentSettings.SettingsLoader;
 			foreach (var scanPath in TemplatesNodes.Select (t => t.ScanPath).Distinct ()) {
-				_templateCache.Scan (scanPath);
+				settingsLoader.UserTemplateCache.Scan (scanPath);
 			}
-			_templateCache.WriteTemplateCaches ();
+			settingsLoader.Save ();
 			paths.WriteAllText (paths.User.FirstRunCookie, "");
 			//}
-			var templateInfos = templateCreator.List (false, (t, s) => new MatchInfo ()).ToDictionary (m => m.Info.Identity, m => m.Info);
+			var templateInfos = settingsLoader.UserTemplateCache.List (false, t => new MatchInfo ()).ToDictionary (m => m.Info.Identity, m => m.Info);
 			var newTemplates = new List<MicrosoftTemplateEngineSolutionTemplate> ();
 			foreach (var template in TemplatesNodes) {
 				ITemplateInfo templateInfo;
@@ -144,7 +144,8 @@ namespace MonoDevelop.Ide.Templates
 				config.ProjectLocation,
 				new Dictionary<string, string> (),
 				true,
-				false);
+				false,
+				null);
 			if (result.ResultInfo.PrimaryOutputs.Any ()) {
 				foreach (var res in result.ResultInfo.PrimaryOutputs) {
 					var fullPath = Path.Combine (config.ProjectLocation, res.Path);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineSolutionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineSolutionTemplate.cs
index 4b6f0ef87c..063f3de652 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineSolutionTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngineSolutionTemplate.cs
@@ -42,9 +42,9 @@ namespace MonoDevelop.Ide.Templates
 			this.templateInfo = templateInfo;
 			Description = template.OverrideDescription ?? templateInfo.Description;
 			Category = template.Category;
-			string language;
-			if (templateInfo.Tags.TryGetValue ("Language", out language))
-				Language = language;
+			ICacheTag languageTag;
+			if (templateInfo.Tags.TryGetValue ("language", out languageTag))
+				Language = languageTag.DefaultValue;
 			else
 				Language = string.Empty;
 			GroupId = templateInfo.GroupIdentity;