From 094c5be3c6ef7d8a15ccb0fa1bf2161a1bff9d22 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 25 Dec 2015 18:15:16 -0600 Subject: [PATCH 01/47] Added Options page for disabling telemetry --- TemplatePack/TemplatePackPackage.cs | 31 +++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/TemplatePack/TemplatePackPackage.cs b/TemplatePack/TemplatePackPackage.cs index ea245a02..8ddaa196 100644 --- a/TemplatePack/TemplatePackPackage.cs +++ b/TemplatePack/TemplatePackPackage.cs @@ -1,19 +1,14 @@ using System; using System.Linq; -using System.Diagnostics; -using System.Globalization; using System.Runtime.InteropServices; using System.ComponentModel.Design; -using Microsoft.Win32; -using Microsoft.VisualStudio; using Microsoft.VisualStudio.Shell.Interop; -using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio.Shell; using System.Collections.Generic; using EnvDTE; using EnvDTE80; -using LigerShark.Templates.DynamicBuilder; using TemplatePack.Tooling; +using System.ComponentModel; namespace TemplatePack { @@ -21,6 +16,7 @@ namespace TemplatePack [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] [ProvideMenuResource("Menus.ctmenu", 1)] [Guid(GuidList.guidTemplatePackPkgString)] + [ProvideOptionPage(typeof(OptionPageGrid), "SideWaffle", "General", 0, 0, true)] [ProvideAutoLoad(UIContextGuids80.NoSolution)] [ProvideAutoLoad(UIContextGuids80.SolutionExists)] public sealed class TemplatePackPackage : Package @@ -115,5 +111,28 @@ public IEnumerable GetSelectedProjects() } } } + + public bool SendTelemetry + { + get + { + OptionPageGrid page = (OptionPageGrid)GetDialogPage(typeof(OptionPageGrid)); + return page.SendAnonymousData; + } + } + } + + public class OptionPageGrid : DialogPage + { + private bool _sendData = true; + + [Category("Telemetry")] + [DisplayName("Send Anonymous Data")] + [Description("By selecting true, you agree to send anonymous data to Google Analytics. This data will be used by the SideWaffle team to see how templates are being used.")] + public bool SendAnonymousData + { + get { return _sendData; } + set { _sendData = value; } + } } } From 17dfc7b6547c9644ed7929f072b92ebbf2e43392 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 8 Jan 2016 07:10:31 -0600 Subject: [PATCH 02/47] Added support for reading SideWaffle settings from the settings JSON file --- .../DynamicBuilder/SettingsStore.cs | 34 ++++++++++++++ LigerShark.Templates/GoogleAnalyticsWizard.cs | 34 +++++++++++--- .../LigerShark.Templates.csproj | 8 ++++ LigerShark.Templates/packages.config | 4 ++ TemplatePack/TemplatePack.csproj | 8 ++-- TemplatePack/TemplatePackPackage.cs | 45 +++++++++++++------ TemplatePack/packages.config | 2 +- 7 files changed, 112 insertions(+), 23 deletions(-) create mode 100644 LigerShark.Templates/DynamicBuilder/SettingsStore.cs create mode 100644 LigerShark.Templates/packages.config diff --git a/LigerShark.Templates/DynamicBuilder/SettingsStore.cs b/LigerShark.Templates/DynamicBuilder/SettingsStore.cs new file mode 100644 index 00000000..649b02a9 --- /dev/null +++ b/LigerShark.Templates/DynamicBuilder/SettingsStore.cs @@ -0,0 +1,34 @@ +using Newtonsoft.Json; +using System.IO; +using System; + +namespace LigerShark.Templates.DynamicBuilder +{ + public class SettingsStore + { + [JsonProperty] + public bool SendTelemetry { get; set; } + + public static SettingsStore ReadJsonFile(string filePath) + { + if (string.IsNullOrEmpty(filePath)) { throw new ArgumentNullException("filePath"); } + + if (!File.Exists(filePath)) + { + throw new FileNotFoundException(string.Format(@"JSON settings file not found at [{0}]", filePath)); + } + + return JsonConvert.DeserializeObject(File.ReadAllText(filePath)); + } + + public void WriteJsonFile(string fileDirectory, string filePath, string json) + { + if (!Directory.Exists(fileDirectory)) + { + Directory.CreateDirectory(fileDirectory); + } + + File.WriteAllText(filePath, json); + } + } +} \ No newline at end of file diff --git a/LigerShark.Templates/GoogleAnalyticsWizard.cs b/LigerShark.Templates/GoogleAnalyticsWizard.cs index 6c06cd63..9e1e8faa 100644 --- a/LigerShark.Templates/GoogleAnalyticsWizard.cs +++ b/LigerShark.Templates/GoogleAnalyticsWizard.cs @@ -7,6 +7,10 @@ using System.Security.Cryptography; using System.Text; using System.ComponentModel; +using Newtonsoft.Json; +using LigerShark.Templates.DynamicBuilder; +using System.IO; +using System.Diagnostics; namespace LigerShark.Templates { @@ -14,6 +18,7 @@ public class GoogleAnalyticsWizard : Component, IWizard { private string TemplateID { get; set; } private string TemplateName { get; set; } + private string TemplateType { get; set; } public void BeforeOpeningFile(ProjectItem projectItem) { @@ -39,7 +44,7 @@ public void RunFinished() try { - TrackTemplate(TemplateID, TemplateName); + TrackTemplate(TemplateID, TemplateName, TemplateType); } catch (Exception ex) { @@ -53,6 +58,7 @@ public void RunStarted(object automationObject, Dictionary repla try { TemplateName = replacementsDictionary["$TemplateName$"]; TemplateID = replacementsDictionary["$TemplateID$"]; + TemplateType = replacementsDictionary["$TemplateType$"]; } catch(Exception ex) { LogError(ex.ToString()); @@ -64,12 +70,30 @@ public bool ShouldAddProjectItem(string filePath) return true; } - private void TrackTemplate(string templateID, string templateName) + private void TrackTemplate(string templateID, string templateName, string templateType) { - var result = GetHashString(Environment.UserDomainName + Environment.MachineName); + // Get the file path where the settings are being stored. + var rootDir = Environment.ExpandEnvironmentVariables(@"%localappdata%\LigerShark\SideWaffle\"); + var filePath = Path.Combine(rootDir, "SideWaffle-Settings.json"); + bool telemetry = SettingsStore.ReadJsonFile(filePath).SendTelemetry; + + if (telemetry) + { + var category = templateType; + if (string.Compare("Project", templateType, StringComparison.OrdinalIgnoreCase) == 0) + { + category = "project-template"; + } + else if (string.Compare("Item", templateType, StringComparison.OrdinalIgnoreCase) == 0) + { + category = "item-template"; + } + + var result = GetHashString(Environment.UserDomainName + Environment.MachineName); - GoogleAnalyticsApi tracker = new GoogleAnalyticsApi("UA-62483606-4", result); - tracker.TrackEvent("template", "add", templateName); + GoogleAnalyticsApi tracker = new GoogleAnalyticsApi("UA-62483606-4", result); + tracker.TrackEvent(category, "add", templateName); + } } public string GetHashString(string text) diff --git a/LigerShark.Templates/LigerShark.Templates.csproj b/LigerShark.Templates/LigerShark.Templates.csproj index 5ad907dd..da1ecb39 100644 --- a/LigerShark.Templates/LigerShark.Templates.csproj +++ b/LigerShark.Templates/LigerShark.Templates.csproj @@ -72,6 +72,10 @@ + + ..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll + True + True @@ -84,6 +88,8 @@ + + @@ -101,6 +107,7 @@ + Designer MSBuild:Compile @@ -138,6 +145,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/LigerShark.Templates/packages.config b/LigerShark.Templates/packages.config new file mode 100644 index 00000000..a994714f --- /dev/null +++ b/LigerShark.Templates/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index 0a66b034..31a126ce 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -929,13 +929,13 @@ False ..\assemblies\Microsoft.VisualStudio.TextManager.Interop.dll - - False - ..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll - ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll + + ..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll + True + ..\packages\NuGet.VisualStudio.2.8.3\lib\net40\NuGet.VisualStudio.dll True diff --git a/TemplatePack/TemplatePackPackage.cs b/TemplatePack/TemplatePackPackage.cs index 8ddaa196..c91719eb 100644 --- a/TemplatePack/TemplatePackPackage.cs +++ b/TemplatePack/TemplatePackPackage.cs @@ -1,14 +1,18 @@ -using System; -using System.Linq; -using System.Runtime.InteropServices; -using System.ComponentModel.Design; -using Microsoft.VisualStudio.Shell.Interop; +using EnvDTE; +using EnvDTE80; +using LigerShark.Templates.DynamicBuilder; using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.Shell.Interop; +using Newtonsoft.Json; +using System; using System.Collections.Generic; -using EnvDTE; -using EnvDTE80; -using TemplatePack.Tooling; using System.ComponentModel; +using System.ComponentModel.Design; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using TemplatePack.Tooling; namespace TemplatePack { @@ -124,15 +128,30 @@ public bool SendTelemetry public class OptionPageGrid : DialogPage { - private bool _sendData = true; - [Category("Telemetry")] [DisplayName("Send Anonymous Data")] [Description("By selecting true, you agree to send anonymous data to Google Analytics. This data will be used by the SideWaffle team to see how templates are being used.")] - public bool SendAnonymousData + [DefaultValue(true)] + public bool SendAnonymousData { get; set; } + + // When the user clicks the OK button in the Options window + // save the settings in the JSON file. + protected override void OnApply(PageApplyEventArgs e) { - get { return _sendData; } - set { _sendData = value; } + if (e.ApplyBehavior == ApplyKind.Apply) + { + // TODO: Add save settings feature here + SettingsStore userSettings = new SettingsStore { SendTelemetry = SendAnonymousData }; + string json = JsonConvert.SerializeObject(userSettings, Formatting.Indented); + + // Get the file path where the settings will be stored. + var rootDir = Environment.ExpandEnvironmentVariables(@"%localappdata%\LigerShark\SideWaffle\"); + var filePath = Path.Combine(rootDir, "SideWaffle-Settings.json"); + + // Save the settings to the JSON file + userSettings.WriteJsonFile(rootDir, filePath, json); + } + base.OnApply(e); } } } diff --git a/TemplatePack/packages.config b/TemplatePack/packages.config index ac95aeaa..ce3615f7 100644 --- a/TemplatePack/packages.config +++ b/TemplatePack/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file From ebb82c2a3f3c06b2863c8cb9f208437d82611da3 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 25 Dec 2015 18:15:16 -0600 Subject: [PATCH 03/47] Added Options page for disabling telemetry --- TemplatePack/TemplatePackPackage.cs | 31 +++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/TemplatePack/TemplatePackPackage.cs b/TemplatePack/TemplatePackPackage.cs index ea245a02..8ddaa196 100644 --- a/TemplatePack/TemplatePackPackage.cs +++ b/TemplatePack/TemplatePackPackage.cs @@ -1,19 +1,14 @@ using System; using System.Linq; -using System.Diagnostics; -using System.Globalization; using System.Runtime.InteropServices; using System.ComponentModel.Design; -using Microsoft.Win32; -using Microsoft.VisualStudio; using Microsoft.VisualStudio.Shell.Interop; -using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio.Shell; using System.Collections.Generic; using EnvDTE; using EnvDTE80; -using LigerShark.Templates.DynamicBuilder; using TemplatePack.Tooling; +using System.ComponentModel; namespace TemplatePack { @@ -21,6 +16,7 @@ namespace TemplatePack [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] [ProvideMenuResource("Menus.ctmenu", 1)] [Guid(GuidList.guidTemplatePackPkgString)] + [ProvideOptionPage(typeof(OptionPageGrid), "SideWaffle", "General", 0, 0, true)] [ProvideAutoLoad(UIContextGuids80.NoSolution)] [ProvideAutoLoad(UIContextGuids80.SolutionExists)] public sealed class TemplatePackPackage : Package @@ -115,5 +111,28 @@ public IEnumerable GetSelectedProjects() } } } + + public bool SendTelemetry + { + get + { + OptionPageGrid page = (OptionPageGrid)GetDialogPage(typeof(OptionPageGrid)); + return page.SendAnonymousData; + } + } + } + + public class OptionPageGrid : DialogPage + { + private bool _sendData = true; + + [Category("Telemetry")] + [DisplayName("Send Anonymous Data")] + [Description("By selecting true, you agree to send anonymous data to Google Analytics. This data will be used by the SideWaffle team to see how templates are being used.")] + public bool SendAnonymousData + { + get { return _sendData; } + set { _sendData = value; } + } } } From b439e2101c9bc89a500ef2600630a37bc1ac131b Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 8 Jan 2016 07:10:31 -0600 Subject: [PATCH 04/47] Added support for reading SideWaffle settings from the settings JSON file --- .../DynamicBuilder/SettingsStore.cs | 34 ++++++++++++++ LigerShark.Templates/GoogleAnalyticsWizard.cs | 31 ++++++++----- .../LigerShark.Templates.csproj | 8 ++++ LigerShark.Templates/packages.config | 4 ++ TemplatePack/TemplatePack.csproj | 8 ++-- TemplatePack/TemplatePackPackage.cs | 45 +++++++++++++------ TemplatePack/packages.config | 2 +- 7 files changed, 104 insertions(+), 28 deletions(-) create mode 100644 LigerShark.Templates/DynamicBuilder/SettingsStore.cs create mode 100644 LigerShark.Templates/packages.config diff --git a/LigerShark.Templates/DynamicBuilder/SettingsStore.cs b/LigerShark.Templates/DynamicBuilder/SettingsStore.cs new file mode 100644 index 00000000..649b02a9 --- /dev/null +++ b/LigerShark.Templates/DynamicBuilder/SettingsStore.cs @@ -0,0 +1,34 @@ +using Newtonsoft.Json; +using System.IO; +using System; + +namespace LigerShark.Templates.DynamicBuilder +{ + public class SettingsStore + { + [JsonProperty] + public bool SendTelemetry { get; set; } + + public static SettingsStore ReadJsonFile(string filePath) + { + if (string.IsNullOrEmpty(filePath)) { throw new ArgumentNullException("filePath"); } + + if (!File.Exists(filePath)) + { + throw new FileNotFoundException(string.Format(@"JSON settings file not found at [{0}]", filePath)); + } + + return JsonConvert.DeserializeObject(File.ReadAllText(filePath)); + } + + public void WriteJsonFile(string fileDirectory, string filePath, string json) + { + if (!Directory.Exists(fileDirectory)) + { + Directory.CreateDirectory(fileDirectory); + } + + File.WriteAllText(filePath, json); + } + } +} \ No newline at end of file diff --git a/LigerShark.Templates/GoogleAnalyticsWizard.cs b/LigerShark.Templates/GoogleAnalyticsWizard.cs index 81daa9a7..05cc6099 100644 --- a/LigerShark.Templates/GoogleAnalyticsWizard.cs +++ b/LigerShark.Templates/GoogleAnalyticsWizard.cs @@ -7,6 +7,8 @@ using System.Security.Cryptography; using System.Text; using System.ComponentModel; +using LigerShark.Templates.DynamicBuilder; +using System.IO; namespace LigerShark.Templates { @@ -69,18 +71,27 @@ public bool ShouldAddProjectItem(string filePath) private void TrackTemplate(string templateID, string templateName, string templateType) { var result = GetHashString(Environment.UserDomainName + Environment.MachineName); - var category = templateType; - if (string.Compare("Project", templateType, StringComparison.OrdinalIgnoreCase) == 0) - { - category = "project-template"; - } - else if (string.Compare("Item", templateType, StringComparison.OrdinalIgnoreCase) == 0) + + // Get the file path where the settings are being stored. + var rootDir = Environment.ExpandEnvironmentVariables(@"%localappdata%\LigerShark\SideWaffle\"); + var filePath = Path.Combine(rootDir, "SideWaffle-Settings.json"); + bool telemetry = SettingsStore.ReadJsonFile(filePath).SendTelemetry; + + if (telemetry) { - category = "item-template"; - } + var category = templateType; + if (string.Compare("Project", templateType, StringComparison.OrdinalIgnoreCase) == 0) + { + category = "project-template"; + } + else if (string.Compare("Item", templateType, StringComparison.OrdinalIgnoreCase) == 0) + { + category = "item-template"; + } - GoogleAnalyticsApi tracker = new GoogleAnalyticsApi("UA-62483606-4", result); - tracker.TrackEvent(category, "add", templateName); + GoogleAnalyticsApi tracker = new GoogleAnalyticsApi("UA-62483606-4", result); + tracker.TrackEvent(category, "add", templateName); + } } public string GetHashString(string text) diff --git a/LigerShark.Templates/LigerShark.Templates.csproj b/LigerShark.Templates/LigerShark.Templates.csproj index 5ad907dd..da1ecb39 100644 --- a/LigerShark.Templates/LigerShark.Templates.csproj +++ b/LigerShark.Templates/LigerShark.Templates.csproj @@ -72,6 +72,10 @@ + + ..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll + True + True @@ -84,6 +88,8 @@ + + @@ -101,6 +107,7 @@ + Designer MSBuild:Compile @@ -138,6 +145,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/LigerShark.Templates/packages.config b/LigerShark.Templates/packages.config new file mode 100644 index 00000000..a994714f --- /dev/null +++ b/LigerShark.Templates/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index 0a66b034..31a126ce 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -929,13 +929,13 @@ False ..\assemblies\Microsoft.VisualStudio.TextManager.Interop.dll - - False - ..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll - ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll + + ..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll + True + ..\packages\NuGet.VisualStudio.2.8.3\lib\net40\NuGet.VisualStudio.dll True diff --git a/TemplatePack/TemplatePackPackage.cs b/TemplatePack/TemplatePackPackage.cs index 8ddaa196..c91719eb 100644 --- a/TemplatePack/TemplatePackPackage.cs +++ b/TemplatePack/TemplatePackPackage.cs @@ -1,14 +1,18 @@ -using System; -using System.Linq; -using System.Runtime.InteropServices; -using System.ComponentModel.Design; -using Microsoft.VisualStudio.Shell.Interop; +using EnvDTE; +using EnvDTE80; +using LigerShark.Templates.DynamicBuilder; using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.Shell.Interop; +using Newtonsoft.Json; +using System; using System.Collections.Generic; -using EnvDTE; -using EnvDTE80; -using TemplatePack.Tooling; using System.ComponentModel; +using System.ComponentModel.Design; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using TemplatePack.Tooling; namespace TemplatePack { @@ -124,15 +128,30 @@ public bool SendTelemetry public class OptionPageGrid : DialogPage { - private bool _sendData = true; - [Category("Telemetry")] [DisplayName("Send Anonymous Data")] [Description("By selecting true, you agree to send anonymous data to Google Analytics. This data will be used by the SideWaffle team to see how templates are being used.")] - public bool SendAnonymousData + [DefaultValue(true)] + public bool SendAnonymousData { get; set; } + + // When the user clicks the OK button in the Options window + // save the settings in the JSON file. + protected override void OnApply(PageApplyEventArgs e) { - get { return _sendData; } - set { _sendData = value; } + if (e.ApplyBehavior == ApplyKind.Apply) + { + // TODO: Add save settings feature here + SettingsStore userSettings = new SettingsStore { SendTelemetry = SendAnonymousData }; + string json = JsonConvert.SerializeObject(userSettings, Formatting.Indented); + + // Get the file path where the settings will be stored. + var rootDir = Environment.ExpandEnvironmentVariables(@"%localappdata%\LigerShark\SideWaffle\"); + var filePath = Path.Combine(rootDir, "SideWaffle-Settings.json"); + + // Save the settings to the JSON file + userSettings.WriteJsonFile(rootDir, filePath, json); + } + base.OnApply(e); } } } diff --git a/TemplatePack/packages.config b/TemplatePack/packages.config index ac95aeaa..ce3615f7 100644 --- a/TemplatePack/packages.config +++ b/TemplatePack/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file From 3f3cfe4954aa747ad642d07c7d56d2bb904975af Mon Sep 17 00:00:00 2001 From: Scott Addie Date: Sun, 10 Jan 2016 22:01:28 -0600 Subject: [PATCH 05/47] Add missing delimiter in _preprocess.xml files --- Project Templates/_SampleProjRef/_preprocess.xml | 2 +- .../SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml | 2 +- .../AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml | 2 +- .../Basic/CustomScaffolderExtension/_preprocess.xml | 2 +- TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Project Templates/_SampleProjRef/_preprocess.xml b/Project Templates/_SampleProjRef/_preprocess.xml index 32ee06d0..65657889 100644 --- a/Project Templates/_SampleProjRef/_preprocess.xml +++ b/Project Templates/_SampleProjRef/_preprocess.xml @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml index 46eeccef..7394534f 100644 --- a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml +++ b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml @@ -6,7 +6,7 @@ --> - + \ No newline at end of file diff --git a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml index dd3e4c46..d950b47e 100644 --- a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml +++ b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml index 1b395522..c2f50da1 100644 --- a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml +++ b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml b/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml index 5dc349fa..f95879e5 100644 --- a/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml +++ b/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml @@ -1,7 +1,7 @@  - + \ No newline at end of file From 9f33076333ce4ad0d2e237820c480591b2844999 Mon Sep 17 00:00:00 2001 From: Scott Addie Date: Mon, 11 Jan 2016 15:51:13 -0600 Subject: [PATCH 06/47] Remove .csproj references from Replacements Exclude list --- Project Templates/_SampleProjRef/_preprocess.xml | 2 +- .../SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml | 2 +- .../AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml | 2 +- .../Basic/CustomScaffolderExtension/_preprocess.xml | 2 +- TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Project Templates/_SampleProjRef/_preprocess.xml b/Project Templates/_SampleProjRef/_preprocess.xml index 65657889..3cb2990e 100644 --- a/Project Templates/_SampleProjRef/_preprocess.xml +++ b/Project Templates/_SampleProjRef/_preprocess.xml @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml index 7394534f..90c9d5c9 100644 --- a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml +++ b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SideWaffle-PreprocessXml/_preprocess.xml @@ -6,7 +6,7 @@ --> - + \ No newline at end of file diff --git a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml index d950b47e..3dffbd95 100644 --- a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml +++ b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolder/_preprocess.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml index c2f50da1..3479d88d 100644 --- a/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml +++ b/TemplatePack/ProjectTemplates/Extensibility/AspNetScaffolding/Basic/CustomScaffolderExtension/_preprocess.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml b/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml index f95879e5..346e914f 100644 --- a/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml +++ b/TemplatePack/ProjectTemplates/Web/_SampleNewWeb/_preprocess.xml @@ -1,7 +1,7 @@  - + \ No newline at end of file From a45b2a25e976c9f5b5da60490f7fdb5d644eaf61 Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Wed, 13 Jan 2016 12:51:08 +0000 Subject: [PATCH 07/47] Added the run settings item template. --- .../ItemTemplates/Test/RunSettings/STAR10.ico | Bin 0 -> 7134 bytes .../_Definitions/CSharp.vstemplate | 16 ++ .../RunSettings/_Definitions/VB.vstemplate | 16 ++ .../_Definitions/Web.csharp.vstemplate | 17 +++ .../Test/RunSettings/default.runsettings | 140 ++++++++++++++++++ TemplatePack/TemplatePack.csproj | 5 + 6 files changed, 194 insertions(+) create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico b/TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico new file mode 100644 index 0000000000000000000000000000000000000000..a94a91df7e1d6be6264fb1170a9e5b1cbfbf1b5d GIT binary patch literal 7134 zcmeHLF>~8C6n+2+fh0f?fFPKpNQEJ#yJqZ|wNtJ?p=-yE9kY7$&_SbDj~+96^>y-? z(W}Oc9^D5@jgz#oNhjCqK=>X7K*ERjzV|(VX8?kKZ{7etBlvR#-~iwUG@ODz(ER+@ z+UeT}&Q2pZJymEgVRxqB?CcfncK-869HZ@WH2iM&8to@IKYs-m=Qw}<8vB0yGhAH! z0+*NGeua1My!{4OSHGjZMLUJ-Yi~Qax!J+{_m^;cdjh1nmTj4XjmQEOoekg*eD>#{y^Rq9?rH zY2c$l`;cu##)dsWyQyvKWI=yYe8Djg?jkZJp7Q3vEPx zfNApOfUMPoKvMKH)Z961oizrZ&IJAH7mfj$`2;-LHj7y*7(^)M&dM@38k@1js<46G zY}*y5T&AR#=wm=#I#b$dMs;EM$;xUe6$0f|rA8OEuz0foCHjGH1il1p14H5y^G z%~$ADi)Gn;E(yUZI^LKIqr(hdKi_VN46+%s09mxfW`AcYV4Xd24TDs2ksziS>;T=kak_Q};ubZYFM#wd0EAl+il z94hhPOz8~wvskEVd?)n88wv{S5GgpBCTbE z%IZt5DvCFTEhLge3p|WCrhS+rpCOfi3-SG+j*MY1@V*eT;B){npP}Gw#jNd@8EKd& zxT4O{a3oMen0Cx~Y%47HtGkF7hQ{Mw6>3QJ@$xi0=lzA_FH|}5Vs1&u=-g-SWg_q* z^NzK#zu-r{Qq>8hy%_6|+bHU_P!Tdnf_~GFt!oZCsz|2Uk(Dx4BYFM^w_S%J3+E5x pXZOl9dA=8)?%EAI06$$a^(O`<2L6W(e8+!9PEZpA69Zo`@E6uG?7IK} literal 0 HcmV?d00001 diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate new file mode 100644 index 00000000..9021e698 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -0,0 +1,16 @@ + + + CSharp + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 5714f070-f077-47ef-9da8-b52951b1c8df + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate new file mode 100644 index 00000000..a09b8cb8 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -0,0 +1,16 @@ + + + VisualBasic + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 41e6eb5e-ed95-44a2-b1e7-37adafab4517 + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate new file mode 100644 index 00000000..eb01ea35 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -0,0 +1,17 @@ + + + Web + CSharp + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 267001b4-2c06-4739-9323-3e8bcb0cf833 + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings new file mode 100644 index 00000000..585b8507 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings @@ -0,0 +1,140 @@ + + + + + + + .\TestResults + + + x86 + + + Framework40 + + + + + + + + + + + + + + + .*\.dll$ + .*\.exe$ + + + .*CPPUnitTestFramework.* + .*TestAdapter.* + + + + + + + + ^Fabrikam\.UnitTest\..* + ^std::.* + ^ATL::.* + .*::__GetTestMethodInfo.* + ^Microsoft::VisualStudio::CppCodeCoverageFramework::.* + ^Microsoft::VisualStudio::CppUnitTestFramework::.* + + + + + + + + ^System.Diagnostics.DebuggerHiddenAttribute$ + ^System.Diagnostics.DebuggerNonUserCodeAttribute$ + ^System.Runtime.CompilerServices.CompilerGeneratedAttribute$ + ^System.CodeDom.Compiler.GeneratedCodeAttribute$ + ^System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute$ + ^NUnit.Framework.TestFixtureAttribute$ + ^Xunit.FactAttribute$ + ^Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute$ + + + + + + + .*\\atlmfc\\.* + .*\\vctools\\.* + .*\\public\\sdk\\.* + .*\\microsoft sdks\\.* + .*\\vc\\include\\.* + + + + + + + .*microsoft.* + + + + + + + + ^B77A5C561934E089$ + ^B03F5F7F11D50A3A$ + ^31BF3856AD364E35$ + ^89845DCD8080CC91$ + ^71E9BCE111E9429C$ + ^8F50407C4E9E73B6$ + ^E361AF139669C375$ + + + + + + True + True + True + False + + + + + + + + + + + + + + + + + True + false + False + False + + diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index e22cfd95..bd91c5b2 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -111,6 +111,11 @@ + + + + + Designer From 5f07735db3169cee2eb0ff03b1642aabd6fabc4e Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Wed, 13 Jan 2016 14:35:16 +0000 Subject: [PATCH 08/47] Added telemetry config. --- .../Test/RunSettings/_Definitions/CSharp.vstemplate | 11 ++++++++++- .../Test/RunSettings/_Definitions/VB.vstemplate | 11 ++++++++++- .../RunSettings/_Definitions/Web.csharp.vstemplate | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate index 9021e698..787a2046 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -2,7 +2,7 @@ CSharp default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -12,5 +12,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate index a09b8cb8..bafebb93 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -2,7 +2,7 @@ VisualBasic default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -12,5 +12,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate index eb01ea35..80b90bfc 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -3,7 +3,7 @@ Web CSharp default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -13,5 +13,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file From 9ab3d47f5e802b53759a1c7f378cfa9541ebc049 Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Sat, 16 Jan 2016 01:08:46 -0500 Subject: [PATCH 09/47] Added Angular2 templates and added a custom wizard to handle the class names in the templates --- LigerShark.Templates/Angular2RenameWizard.cs | 118 ++++++++++++++++++ .../LigerShark.Templates.csproj | 3 + .../Component/Definitions/CSharp.vstemplate | 31 +++++ .../Component/Definitions/VB.vstemplate | 31 +++++ .../Definitions/Web.csharp.vstemplate | 32 +++++ .../Angular2/Component/component.ts | 18 +++ .../TypeScript/Angular2/Component/icon.png | Bin 0 -> 1820 bytes .../Service/Definitions/CSharp.vstemplate | 31 +++++ .../Service/Definitions/VB.vstemplate | 31 +++++ .../Service/Definitions/Web.csharp.vstemplate | 32 +++++ .../Web/TypeScript/Angular2/Service/icon.png | Bin 0 -> 1820 bytes .../TypeScript/Angular2/Service/service.ts | 6 + TemplatePack/TemplatePack.csproj | 18 ++- TemplatePack/TemplatePackPackage.cs | 2 - TemplatePack/template-report.xml | 8 +- release-notes.xml | 2 + 16 files changed, 359 insertions(+), 4 deletions(-) create mode 100644 LigerShark.Templates/Angular2RenameWizard.cs create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/CSharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/VB.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/Web.csharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/component.ts create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/icon.png create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/CSharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/icon.png create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/service.ts diff --git a/LigerShark.Templates/Angular2RenameWizard.cs b/LigerShark.Templates/Angular2RenameWizard.cs new file mode 100644 index 00000000..a82aa289 --- /dev/null +++ b/LigerShark.Templates/Angular2RenameWizard.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using EnvDTE; +using Microsoft.VisualStudio.Shell.Interop; +using Microsoft.VisualStudio.TemplateWizard; + +namespace LigerShark.Templates +{ + /// + /// Custom wizard used by the Angular2 item templates to produce proper names + /// + public class Angular2RenameWizard : Component, IWizard + { + public void RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) + { + try + { + var safeItemName = replacementsDictionary["$safeitemname$"]; + var properName = safeItemName; + + if (safeItemName.Contains(".")) + { + var indexOfPeriod = safeItemName.IndexOf(".", StringComparison.CurrentCulture); + properName = safeItemName.Remove(indexOfPeriod); + } + + properName = FromCamelCase(properName); + + replacementsDictionary.Add("$properName$", properName); + } + catch (Exception ex) + { + LogError(ex.ToString()); + } + + } + + public void ProjectFinishedGenerating(Project project) + { + + } + + public void ProjectItemFinishedGenerating(ProjectItem projectItem) + { + + } + + public bool ShouldAddProjectItem(string filePath) + { + return true; + } + + public void BeforeOpeningFile(ProjectItem projectItem) + { + } + + public void RunFinished() + { + } + + private string FromCamelCase(string value) + { + if (string.IsNullOrEmpty(value)) + { + return value; + } + if (char.IsUpper(value[0])) + { + return value; + } + + var chArray = value.ToCharArray(); + + if (value.Length < 3) + { + chArray[0] = char.ToUpper(chArray[0], CultureInfo.InvariantCulture); + } + else + { + + if (char.IsUpper(chArray[2])) + { + for (var i = 0; i < 2; i++) + { + chArray[i] = char.ToUpper(chArray[i], CultureInfo.InvariantCulture); + } + } + else + { + chArray[0] = char.ToUpper(chArray[0], CultureInfo.InvariantCulture); + } + } + return new string(chArray); + } + + private void LogError(string message) + { + try + { + IVsActivityLog _log = GetService(typeof(SVsActivityLog)) as IVsActivityLog; + + _log.LogEntry( + (UInt32)__ACTIVITYLOG_ENTRYTYPE.ALE_ERROR, + this.ToString(), + string.Format(CultureInfo.CurrentCulture, "{0}", message)); + } + catch (Exception) + { + // there was likely an error getting the activity service, ignore it so it won't throw + } + } + } +} diff --git a/LigerShark.Templates/LigerShark.Templates.csproj b/LigerShark.Templates/LigerShark.Templates.csproj index 5ad907dd..70e23f18 100644 --- a/LigerShark.Templates/LigerShark.Templates.csproj +++ b/LigerShark.Templates/LigerShark.Templates.csproj @@ -105,6 +105,9 @@ Designer MSBuild:Compile + + Component + diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/CSharp.vstemplate new file mode 100644 index 00000000..cf20623a --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/CSharp.vstemplate @@ -0,0 +1,31 @@ + + + CSharp + + my.component.ts + Angular2 TypeScript Component + Angular2 TypeScript Component class. By Kent Cooper @kcdevnc + icon.png + 1 + f50707a1-bf49-44a3-9c09-234c1ec08eee + !VB + 1000 + + + + component.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/VB.vstemplate new file mode 100644 index 00000000..ec8efe09 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/VB.vstemplate @@ -0,0 +1,31 @@ + + + VisualBasic + + my.service.ts + Angular2 TypeScript Service + Angular2 TypeScript Service class. By Kent Cooper @kcdevnc + icon.png + 1 + 3a870753-daaf-4464-b172-22ef8a85e0be + !CSharp + 1000 + + + + service.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/Web.csharp.vstemplate new file mode 100644 index 00000000..fb40c8c2 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/Definitions/Web.csharp.vstemplate @@ -0,0 +1,32 @@ + + + Web + CSharp + + my.service.ts + Angular2 TypeScript Service + Angular2 TypeScript Service class. By Kent Cooper @kcdevnc + icon.png + 1 + 726deb92-a7de-432d-aed4-019239262486 + ABC | (!ABC) + 1000 + + + + service.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/component.ts b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/component.ts new file mode 100644 index 00000000..4df4a0b3 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/component.ts @@ -0,0 +1,18 @@ +import {Component, OnInit} from 'angular2/core'; + +@Component({ + selector: '$safeitemname$', + templateUrl: 'app/$safeitemname$.component.html', + styleUrls: ['app/$safeitemname$.component.css'] +}) + +export class $properName$Component implements OnInit { + + constructor() { + + } + + ngOnInit() { + + } +} \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/icon.png b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Component/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d877cd5b374544a7c1e6c83006d570d2d78a1326 GIT binary patch literal 1820 zcmV+%2jlpOP)952zSU{FbP#tm^APlyJNK4;wzNFlvYVVh?`^;HyXT(sKi{>n zdBqVF6l7OZQ?rs`7_LU6`3;$MJwSb=iLH@wCR+&r|&*Slyd3bpIH<@o*C-Sd+LI-4?m!~6ZR0?P_d2-XwH7+RaD`5OIS4$RfWQ88;5)AX zfwwD&qjrO=Am0GPFcSzrqEspy>+0&l3JMCAxVgDm!jzSjEs{ti!5Cr%IvqlrXcSby z+4KX@8nhWYeAZK^rq+{|1UGtmKpY)m05CO#sq}HDYqG)uP-EoCGZE&o90x`wkocs| zo0^(F!-Zj_ebG=|1!s;PhL+H+(7~~E${Mac=xBkPH*bRC)JfpGuC|0Qff0DQfH*c1 zm>1}?Pp{Y8+i11g0GfKjWVIy`uKfT@w;xPel@ zClI&B#>VVyFd~a^_hUar1kTAhv3@NB_+tt{lCJ*5j~InjbAxbO4N6fZ`CT(cV4h82 zV4yvIxZ9iOCwQ+QG zoKMQ^?6)a%+WlRzfI1)3>!C~AVAKFS-|x`Didg}K{yxAcm4KCYgeKwArAuuw`^9H+ zkIw4+=N*19e7~Opj68e*+TZ|C@+%BcP^mz;eewVp{&M$89geP}y zQ|BZHy5qtrfWUJdCY6W+s1*vR+~PAMKyBIq^4&j+i;F*I0jjF1d>d-2C)zi;PYckS zn+bZIjsiUFY=;X7O9042Ym(!Enal<0v8)*ZWZZ1>y`hAJgttv2@To>Ff7bS;w^ipv zb_cqy7?Ka|Mpi1FHv*7;pcGddq9Bz*<))3+0bEu>eaVjm_D+0!{2MGlc6Rn+jZ z3TO?W=U^h}M@QM@>xv13t9y2WHpm}@0UT=5>?3S0NDil22XJ3QH2_Pn9UIikZkd^x zxe&|g-udV-tFrrh%Q<%UV|Wa@Cy%LJ@9qKy&z%}pfe}C@kzg-yv(x}=RwP20^tEQq z$k*3*0d}m*=e~}&lwC|V;*13_F{2V%v)a_JEC5J?k`hD>;97J<42$w?W|}#Gw-fZK zWURx1?yJzx)U$R`a0+C{x%e)SLz7FEpUXxf45c?R3|;#|&DM=cXxeN@$1_HuCMnKry(T`I&XcOM0Kjue(v}vpFC0{M zMLc%*r1UyD&NBm$UGCZm*j)`#5D7ux;l!><(o@O&IEs*?1pt+k9ZS z{~mR&*Xy7+C&MB?tO1ZrSMbUWQ9x}F$3(u=06Zd`*X88oEU^Hd(em9 z`r$ac`=MX&!X+yjVHJRcI$=Xoh3n}laQ#p+bjR+tst=|B&4*H8rg1*wptb1>EI?FL)SHB^k#`b^9&~s+&Dxwy z0mv8 z$^ga@5)!fiZ&1#dA8nYZ;|yM8Q2WUxqYD$*zr4KM-U>h^+J4gtApaZ3zq+_)Wo5mF z9W4l>(Sl8EPkw&>>&7)w+mp}Mp8Uj!e67L&0000< KMNUMnLSTYMm0;um literal 0 HcmV?d00001 diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/CSharp.vstemplate new file mode 100644 index 00000000..9b82c9dc --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/CSharp.vstemplate @@ -0,0 +1,31 @@ + + + CSharp + + my.service.ts + Angular2 TypeScript Service + Angular2 TypeScript Service class. By Kent Cooper @kcdevnc + icon.png + 1 + 0aaa4aa9-cf2d-4ea0-9aee-4c8dbcdbb485 + !VB + 1000 + + + + service.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate new file mode 100644 index 00000000..da8c1a52 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate @@ -0,0 +1,31 @@ + + + VisualBasic + + my.component.ts + Angular2 TypeScript Component + Angular2 TypeScript Component class. By Kent Cooper @kcdevnc + icon.png + 1 + b167bc7e-f338-4e2e-bf03-74f06862a3e5 + !CSharp + 1000 + + + + component.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate new file mode 100644 index 00000000..abefdc19 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate @@ -0,0 +1,32 @@ + + + Web + CSharp + + my.component.ts + Angular2 TypeScript Component + Angular2 TypeScript Component class. By Kent Cooper @kcdevnc + icon.png + 1 + 67d35ded-5872-415b-84dc-fc8d84ef5ed1 + ABC | (!ABC) + 1000 + + + + component.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/icon.png b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d877cd5b374544a7c1e6c83006d570d2d78a1326 GIT binary patch literal 1820 zcmV+%2jlpOP)952zSU{FbP#tm^APlyJNK4;wzNFlvYVVh?`^;HyXT(sKi{>n zdBqVF6l7OZQ?rs`7_LU6`3;$MJwSb=iLH@wCR+&r|&*Slyd3bpIH<@o*C-Sd+LI-4?m!~6ZR0?P_d2-XwH7+RaD`5OIS4$RfWQ88;5)AX zfwwD&qjrO=Am0GPFcSzrqEspy>+0&l3JMCAxVgDm!jzSjEs{ti!5Cr%IvqlrXcSby z+4KX@8nhWYeAZK^rq+{|1UGtmKpY)m05CO#sq}HDYqG)uP-EoCGZE&o90x`wkocs| zo0^(F!-Zj_ebG=|1!s;PhL+H+(7~~E${Mac=xBkPH*bRC)JfpGuC|0Qff0DQfH*c1 zm>1}?Pp{Y8+i11g0GfKjWVIy`uKfT@w;xPel@ zClI&B#>VVyFd~a^_hUar1kTAhv3@NB_+tt{lCJ*5j~InjbAxbO4N6fZ`CT(cV4h82 zV4yvIxZ9iOCwQ+QG zoKMQ^?6)a%+WlRzfI1)3>!C~AVAKFS-|x`Didg}K{yxAcm4KCYgeKwArAuuw`^9H+ zkIw4+=N*19e7~Opj68e*+TZ|C@+%BcP^mz;eewVp{&M$89geP}y zQ|BZHy5qtrfWUJdCY6W+s1*vR+~PAMKyBIq^4&j+i;F*I0jjF1d>d-2C)zi;PYckS zn+bZIjsiUFY=;X7O9042Ym(!Enal<0v8)*ZWZZ1>y`hAJgttv2@To>Ff7bS;w^ipv zb_cqy7?Ka|Mpi1FHv*7;pcGddq9Bz*<))3+0bEu>eaVjm_D+0!{2MGlc6Rn+jZ z3TO?W=U^h}M@QM@>xv13t9y2WHpm}@0UT=5>?3S0NDil22XJ3QH2_Pn9UIikZkd^x zxe&|g-udV-tFrrh%Q<%UV|Wa@Cy%LJ@9qKy&z%}pfe}C@kzg-yv(x}=RwP20^tEQq z$k*3*0d}m*=e~}&lwC|V;*13_F{2V%v)a_JEC5J?k`hD>;97J<42$w?W|}#Gw-fZK zWURx1?yJzx)U$R`a0+C{x%e)SLz7FEpUXxf45c?R3|;#|&DM=cXxeN@$1_HuCMnKry(T`I&XcOM0Kjue(v}vpFC0{M zMLc%*r1UyD&NBm$UGCZm*j)`#5D7ux;l!><(o@O&IEs*?1pt+k9ZS z{~mR&*Xy7+C&MB?tO1ZrSMbUWQ9x}F$3(u=06Zd`*X88oEU^Hd(em9 z`r$ac`=MX&!X+yjVHJRcI$=Xoh3n}laQ#p+bjR+tst=|B&4*H8rg1*wptb1>EI?FL)SHB^k#`b^9&~s+&Dxwy z0mv8 z$^ga@5)!fiZ&1#dA8nYZ;|yM8Q2WUxqYD$*zr4KM-U>h^+J4gtApaZ3zq+_)Wo5mF z9W4l>(Sl8EPkw&>>&7)w+mp}Mp8Uj!e67L&0000< KMNUMnLSTYMm0;um literal 0 HcmV?d00001 diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/service.ts b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/service.ts new file mode 100644 index 00000000..375e9900 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/service.ts @@ -0,0 +1,6 @@ +import {Injectable} from 'angular2/core'; + +@Injectable() +export class $properName$Service { + +} \ No newline at end of file diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index 0a66b034..1904e6f7 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -55,6 +55,11 @@ Always true + + + + + @@ -168,6 +173,9 @@ + + + @@ -603,7 +611,9 @@ - + + Designer + @@ -1152,6 +1162,12 @@ LigerShark.Templates + + + + + + diff --git a/TemplatePack/TemplatePackPackage.cs b/TemplatePack/TemplatePackPackage.cs index ea245a02..12f0ac5f 100644 --- a/TemplatePack/TemplatePackPackage.cs +++ b/TemplatePack/TemplatePackPackage.cs @@ -73,12 +73,10 @@ private void OpenSettings(object sender, EventArgs e) void button_BeforeQueryStatus(object sender, EventArgs e) { var button = (OleMenuCommand)sender; - var project = GetSelectedProjects().ElementAt(0); // TODO: We should only show this if the target project has the TemplateBuilder NuGet pkg installed // or something similar to that. button.Visible = true; - // button.Visible = project.IsWebProject(); } private void ButtonClicked(object sender, EventArgs e) diff --git a/TemplatePack/template-report.xml b/TemplatePack/template-report.xml index fd28333c..19bb9961 100644 --- a/TemplatePack/template-report.xml +++ b/TemplatePack/template-report.xml @@ -4,6 +4,9 @@ + + + @@ -15,7 +18,6 @@ - @@ -94,6 +96,8 @@ + + @@ -159,6 +163,8 @@ + + diff --git a/release-notes.xml b/release-notes.xml index a9771efb..0bf4e077 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -3,6 +3,8 @@ Added support for dynamic templates Updated xUnit template for ASP.NET 5 RC1 + Added Angular 2 TypeScript Service template + Added Angular 2 TypeScript Component template Added SortOrder and set it to 1000 for all ItemTemplates that didn't already have a SortOrder element From c1b71b56ba84d3fa292e07dc8a7066a0ae043b3b Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Sat, 16 Jan 2016 02:25:20 -0500 Subject: [PATCH 10/47] fixed bug with the angularjs directive template by adding a custom wizard to properly format the usage comment. Also added the usage comment to the TypeScript AngularJs directive template --- .../AngularDirectiveUsageWizard.cs | 101 ++++++++++++++++++ .../LigerShark.Templates.csproj | 3 + .../_Definitions/CSharp.vstemplate | 4 + .../_Definitions/VB.vstemplate | 4 + .../_Definitions/Web.csharp.vstemplate | 4 + .../TypeScript Directive/directive.ts | 4 + .../Directive/_Definitions/CSharp.vstemplate | 4 + .../Directive/_Definitions/VB.vstemplate | 4 + .../_Definitions/Web.csharp.vstemplate | 4 + .../AngularJs/Directive/directive.js | 2 +- 10 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 LigerShark.Templates/AngularDirectiveUsageWizard.cs diff --git a/LigerShark.Templates/AngularDirectiveUsageWizard.cs b/LigerShark.Templates/AngularDirectiveUsageWizard.cs new file mode 100644 index 00000000..dab05af2 --- /dev/null +++ b/LigerShark.Templates/AngularDirectiveUsageWizard.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Globalization; +using EnvDTE; +using Microsoft.VisualStudio.Shell.Interop; +using Microsoft.VisualStudio.TemplateWizard; + +namespace LigerShark.Templates +{ + public class AngularDirectiveUsageWizard : Component, IWizard + { + public void RunStarted(object automationObject, Dictionary replacementsDictionary, + WizardRunKind runKind, object[] customParams) + { + try + { + var safeItemName = replacementsDictionary["$safeitemname$"]; + var directiveUsage = ToDirectiveUsage(safeItemName); + + replacementsDictionary.Add("$directiveUsage$", directiveUsage); + } + catch (Exception ex) + { + LogError(ex.ToString()); + } + } + + public void ProjectFinishedGenerating(Project project) + { + } + + public void ProjectItemFinishedGenerating(ProjectItem projectItem) + { + } + + public bool ShouldAddProjectItem(string filePath) + { + return true; + } + + public void BeforeOpeningFile(ProjectItem projectItem) + { + } + + public void RunFinished() + { + } + + private string ToDirectiveUsage(string value) + { + if (string.IsNullOrEmpty(value)) + { + return value; + } + + var originalValueArrray = value.ToCharArray(); + + // Initializes the list with the first character in the original value + var directiveUsage = new List + { + char.ToLower(originalValueArrray[0]) + }; + + // Loops through the original value array and finds any upper case character + // then adds a hyphen and converts the original character to lower case + for (var i = 1; i < originalValueArrray.Length; i++) + { + if (char.IsUpper(originalValueArrray[i])) + { + directiveUsage.Add('-'); + directiveUsage.Add(char.ToLower(originalValueArrray[i])); + } + else + { + directiveUsage.Add(originalValueArrray[i]); + } + } + + return new string(directiveUsage.ToArray()); + } + + + private void LogError(string message) + { + try + { + var log = GetService(typeof(SVsActivityLog)) as IVsActivityLog; + + log.LogEntry( + (uint)__ACTIVITYLOG_ENTRYTYPE.ALE_ERROR, + ToString(), + string.Format(CultureInfo.CurrentCulture, "{0}", message)); + } + catch (Exception) + { + // there was likely an error getting the activity service, ignore it so it won't throw + } + } + } +} \ No newline at end of file diff --git a/LigerShark.Templates/LigerShark.Templates.csproj b/LigerShark.Templates/LigerShark.Templates.csproj index 5ad907dd..50729585 100644 --- a/LigerShark.Templates/LigerShark.Templates.csproj +++ b/LigerShark.Templates/LigerShark.Templates.csproj @@ -105,6 +105,9 @@ Designer MSBuild:Compile + + Component + diff --git a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/CSharp.vstemplate index 27cb3273..828c91c6 100644 --- a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/CSharp.vstemplate @@ -22,4 +22,8 @@ LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null LigerShark.Templates.GoogleAnalyticsWizard + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.AngularDirectiveUsageWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/VB.vstemplate index 92701280..3ff0bc08 100644 --- a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/VB.vstemplate @@ -22,4 +22,8 @@ LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null LigerShark.Templates.GoogleAnalyticsWizard + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.AngularDirectiveUsageWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/Web.csharp.vstemplate index a1d48622..9b3cfead 100644 --- a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/_Definitions/Web.csharp.vstemplate @@ -23,4 +23,8 @@ LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null LigerShark.Templates.GoogleAnalyticsWizard + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.AngularDirectiveUsageWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/directive.ts b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/directive.ts index 50968134..7cc5b45f 100644 --- a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/directive.ts +++ b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/directive.ts @@ -13,6 +13,10 @@ module App { $safeitemname$.$inject = ["$window"]; function $safeitemname$($window: ng.IWindowService): I$safeitemname$ { + // Usage: + // <$directiveUsage$> + // Creates: + // return { restrict: "EA", link: link diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate index 959d8cc9..d7714f39 100644 --- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate @@ -23,4 +23,8 @@ LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null LigerShark.Templates.GoogleAnalyticsWizard + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.AngularDirectiveUsageWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate index 246370bb..96219d15 100644 --- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate @@ -23,4 +23,8 @@ LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null LigerShark.Templates.GoogleAnalyticsWizard + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.AngularDirectiveUsageWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate index 179049fa..e55aad74 100644 --- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate @@ -24,4 +24,8 @@ LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null LigerShark.Templates.GoogleAnalyticsWizard + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.AngularDirectiveUsageWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js index a94f6cfb..c343227b 100644 --- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js +++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js @@ -9,7 +9,7 @@ function $safeitemname$ ($window) { // Usage: - // <$safeitemname$> + // <$directiveUsage$> // Creates: // var directive = { From 076d69c5b3afd434eb4628b09eea4588db229c78 Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Sat, 16 Jan 2016 02:33:05 -0500 Subject: [PATCH 11/47] Updating the release notes --- release-notes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release-notes.xml b/release-notes.xml index a9771efb..679423a9 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -3,6 +3,9 @@ Added support for dynamic templates Updated xUnit template for ASP.NET 5 RC1 + + Changed the AnularJs directive templates to fix a bug with the usage comments issue #285 + Added SortOrder and set it to 1000 for all ItemTemplates that didn't already have a SortOrder element From 6da1f12d699adf857128902813deff1b842998f5 Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Sat, 16 Jan 2016 10:45:38 -0500 Subject: [PATCH 12/47] Fixed spelling error in release notes --- release-notes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-notes.xml b/release-notes.xml index 679423a9..2de3a638 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -4,7 +4,7 @@ Added support for dynamic templates Updated xUnit template for ASP.NET 5 RC1 - Changed the AnularJs directive templates to fix a bug with the usage comments issue #285 + Changed the AngularJs directive templates to fix a bug with the usage comments issue #285 From d907f4889e2fb00552364c28ebbbbe6d85d4d1cd Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Sun, 17 Jan 2016 00:00:32 -0500 Subject: [PATCH 13/47] Added the Angular 2 pipe template a fixed some naming problems in the service template. --- .../Pipe/Definitions/CSharp.vstemplate | 31 +++++++++++++++++ .../Angular2/Pipe/Definitions/VB.vstemplate | 31 +++++++++++++++++ .../Pipe/Definitions/Web.csharp.vstemplate | 32 ++++++++++++++++++ .../Web/TypeScript/Angular2/Pipe/icon.png | Bin 0 -> 1820 bytes .../Web/TypeScript/Angular2/Pipe/pipe.ts | 11 ++++++ .../Service/Definitions/VB.vstemplate | 10 +++--- .../Service/Definitions/Web.csharp.vstemplate | 10 +++--- release-notes.xml | 1 + 8 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/CSharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/VB.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/Web.csharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/icon.png create mode 100644 TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/pipe.ts diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/CSharp.vstemplate new file mode 100644 index 00000000..7e9af97c --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/CSharp.vstemplate @@ -0,0 +1,31 @@ + + + CSharp + + my.pipe.ts + Angular2 TypeScript Pipe + Angular2 TypeScript Pipe class. By Kent Cooper @kcdevnc + icon.png + 1 + 9c293d29-5beb-4974-9dd4-58bd31e7e5a0 + !VB + 1000 + + + + pipe.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/VB.vstemplate new file mode 100644 index 00000000..7df70681 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/VB.vstemplate @@ -0,0 +1,31 @@ + + + VisualBasic + + my.pipe.ts + Angular2 TypeScript Pipe + Angular2 TypeScript Pipe class. By Kent Cooper @kcdevnc + icon.png + 1 + 8d9c83f7-5fe5-4899-a263-bca34f2950f9 + !CSharp + 1000 + + + + pipe.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/Web.csharp.vstemplate new file mode 100644 index 00000000..40933e8c --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/Definitions/Web.csharp.vstemplate @@ -0,0 +1,32 @@ + + + Web + CSharp + + my.pipe.ts + Angular2 TypeScript Pipe + Angular2 TypeScript Pipe class. By Kent Cooper @kcdevnc + icon.png + 1 + dd967489-3804-442e-8ed9-28a9a9260cdf + ABC | (!ABC) + 1000 + + + + pipe.ts + + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.Angular2RenameWizard + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/icon.png b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d877cd5b374544a7c1e6c83006d570d2d78a1326 GIT binary patch literal 1820 zcmV+%2jlpOP)952zSU{FbP#tm^APlyJNK4;wzNFlvYVVh?`^;HyXT(sKi{>n zdBqVF6l7OZQ?rs`7_LU6`3;$MJwSb=iLH@wCR+&r|&*Slyd3bpIH<@o*C-Sd+LI-4?m!~6ZR0?P_d2-XwH7+RaD`5OIS4$RfWQ88;5)AX zfwwD&qjrO=Am0GPFcSzrqEspy>+0&l3JMCAxVgDm!jzSjEs{ti!5Cr%IvqlrXcSby z+4KX@8nhWYeAZK^rq+{|1UGtmKpY)m05CO#sq}HDYqG)uP-EoCGZE&o90x`wkocs| zo0^(F!-Zj_ebG=|1!s;PhL+H+(7~~E${Mac=xBkPH*bRC)JfpGuC|0Qff0DQfH*c1 zm>1}?Pp{Y8+i11g0GfKjWVIy`uKfT@w;xPel@ zClI&B#>VVyFd~a^_hUar1kTAhv3@NB_+tt{lCJ*5j~InjbAxbO4N6fZ`CT(cV4h82 zV4yvIxZ9iOCwQ+QG zoKMQ^?6)a%+WlRzfI1)3>!C~AVAKFS-|x`Didg}K{yxAcm4KCYgeKwArAuuw`^9H+ zkIw4+=N*19e7~Opj68e*+TZ|C@+%BcP^mz;eewVp{&M$89geP}y zQ|BZHy5qtrfWUJdCY6W+s1*vR+~PAMKyBIq^4&j+i;F*I0jjF1d>d-2C)zi;PYckS zn+bZIjsiUFY=;X7O9042Ym(!Enal<0v8)*ZWZZ1>y`hAJgttv2@To>Ff7bS;w^ipv zb_cqy7?Ka|Mpi1FHv*7;pcGddq9Bz*<))3+0bEu>eaVjm_D+0!{2MGlc6Rn+jZ z3TO?W=U^h}M@QM@>xv13t9y2WHpm}@0UT=5>?3S0NDil22XJ3QH2_Pn9UIikZkd^x zxe&|g-udV-tFrrh%Q<%UV|Wa@Cy%LJ@9qKy&z%}pfe}C@kzg-yv(x}=RwP20^tEQq z$k*3*0d}m*=e~}&lwC|V;*13_F{2V%v)a_JEC5J?k`hD>;97J<42$w?W|}#Gw-fZK zWURx1?yJzx)U$R`a0+C{x%e)SLz7FEpUXxf45c?R3|;#|&DM=cXxeN@$1_HuCMnKry(T`I&XcOM0Kjue(v}vpFC0{M zMLc%*r1UyD&NBm$UGCZm*j)`#5D7ux;l!><(o@O&IEs*?1pt+k9ZS z{~mR&*Xy7+C&MB?tO1ZrSMbUWQ9x}F$3(u=06Zd`*X88oEU^Hd(em9 z`r$ac`=MX&!X+yjVHJRcI$=Xoh3n}laQ#p+bjR+tst=|B&4*H8rg1*wptb1>EI?FL)SHB^k#`b^9&~s+&Dxwy z0mv8 z$^ga@5)!fiZ&1#dA8nYZ;|yM8Q2WUxqYD$*zr4KM-U>h^+J4gtApaZ3zq+_)Wo5mF z9W4l>(Sl8EPkw&>>&7)w+mp}Mp8Uj!e67L&0000< KMNUMnLSTYMm0;um literal 0 HcmV?d00001 diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/pipe.ts b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/pipe.ts new file mode 100644 index 00000000..8d228018 --- /dev/null +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Pipe/pipe.ts @@ -0,0 +1,11 @@ +import {Pipe, PipeTransform} from 'angular2/core'; + +@Pipe({ + name: '$safeitemname$' +}) + +export class $properName$Pipe implements PipeTransform { + transform(value: string, args: string[]): any { + + } +} \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate index da8c1a52..1aad5709 100644 --- a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/VB.vstemplate @@ -2,9 +2,9 @@ VisualBasic - my.component.ts - Angular2 TypeScript Component - Angular2 TypeScript Component class. By Kent Cooper @kcdevnc + my.service.ts + Angular2 TypeScript Service + Angular2 TypeScript Service class. By Kent Cooper @kcdevnc icon.png 1 b167bc7e-f338-4e2e-bf03-74f06862a3e5 @@ -13,9 +13,9 @@ - component.ts + service.ts - + diff --git a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate index abefdc19..019fc242 100644 --- a/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Web/TypeScript/Angular2/Service/Definitions/Web.csharp.vstemplate @@ -3,9 +3,9 @@ Web CSharp - my.component.ts - Angular2 TypeScript Component - Angular2 TypeScript Component class. By Kent Cooper @kcdevnc + my.service.ts + Angular2 TypeScript Service + Angular2 TypeScript Service class. By Kent Cooper @kcdevnc icon.png 1 67d35ded-5872-415b-84dc-fc8d84ef5ed1 @@ -14,9 +14,9 @@ - component.ts + service.ts - + diff --git a/release-notes.xml b/release-notes.xml index 0bf4e077..c0a0ad25 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -5,6 +5,7 @@ Updated xUnit template for ASP.NET 5 RC1 Added Angular 2 TypeScript Service template Added Angular 2 TypeScript Component template + Added Angular 2 TypeScript Pipe template Added SortOrder and set it to 1000 for all ItemTemplates that didn't already have a SortOrder element From 5a62ea69215357642fd72c2b40fb5d395ea964f6 Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Sun, 17 Jan 2016 00:03:06 -0500 Subject: [PATCH 14/47] Updating the template-report.xml --- TemplatePack/TemplatePack.csproj | 7 +++++++ TemplatePack/template-report.xml | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index 1904e6f7..49ed0a34 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -56,6 +56,10 @@ true + + + + @@ -1168,6 +1172,9 @@ + + + diff --git a/TemplatePack/template-report.xml b/TemplatePack/template-report.xml index 19bb9961..0addd197 100644 --- a/TemplatePack/template-report.xml +++ b/TemplatePack/template-report.xml @@ -4,8 +4,8 @@ - + @@ -18,6 +18,7 @@ + @@ -96,8 +97,9 @@ - + + @@ -163,8 +165,9 @@ - + + From 76ca874108889df8cb50e90ab1b06d15b25244c4 Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Tue, 19 Jan 2016 21:42:26 -0500 Subject: [PATCH 15/47] Fix build error due to merge conflict. --- LigerShark.Templates/LigerShark.Templates.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LigerShark.Templates/LigerShark.Templates.csproj b/LigerShark.Templates/LigerShark.Templates.csproj index 7b9c7c58..5cc8c841 100644 --- a/LigerShark.Templates/LigerShark.Templates.csproj +++ b/LigerShark.Templates/LigerShark.Templates.csproj @@ -106,6 +106,8 @@ MSBuild:Compile + Component + Component From c664a40e0759334de16b7e8ede30d44199f45572 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Wed, 20 Jan 2016 18:09:02 -0600 Subject: [PATCH 16/47] Default telemetry to opt-out and remove file directory from arguments --- LigerShark.Templates/DynamicBuilder/SettingsStore.cs | 12 ++++++++---- TemplatePack/TemplatePackPackage.cs | 5 ++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/LigerShark.Templates/DynamicBuilder/SettingsStore.cs b/LigerShark.Templates/DynamicBuilder/SettingsStore.cs index 649b02a9..369f9f0e 100644 --- a/LigerShark.Templates/DynamicBuilder/SettingsStore.cs +++ b/LigerShark.Templates/DynamicBuilder/SettingsStore.cs @@ -1,12 +1,14 @@ using Newtonsoft.Json; using System.IO; using System; +using System.ComponentModel; namespace LigerShark.Templates.DynamicBuilder { public class SettingsStore { - [JsonProperty] + [DefaultValue(true)] + [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] public bool SendTelemetry { get; set; } public static SettingsStore ReadJsonFile(string filePath) @@ -21,11 +23,13 @@ public static SettingsStore ReadJsonFile(string filePath) return JsonConvert.DeserializeObject(File.ReadAllText(filePath)); } - public void WriteJsonFile(string fileDirectory, string filePath, string json) + public void WriteJsonFile(string filePath, string json) { - if (!Directory.Exists(fileDirectory)) + var fileInfo = new FileInfo(filePath); + + if (!fileInfo.Directory.Exists) { - Directory.CreateDirectory(fileDirectory); + fileInfo.Directory.Create(); } File.WriteAllText(filePath, json); diff --git a/TemplatePack/TemplatePackPackage.cs b/TemplatePack/TemplatePackPackage.cs index c91719eb..7c4bc8fb 100644 --- a/TemplatePack/TemplatePackPackage.cs +++ b/TemplatePack/TemplatePackPackage.cs @@ -145,11 +145,10 @@ protected override void OnApply(PageApplyEventArgs e) string json = JsonConvert.SerializeObject(userSettings, Formatting.Indented); // Get the file path where the settings will be stored. - var rootDir = Environment.ExpandEnvironmentVariables(@"%localappdata%\LigerShark\SideWaffle\"); - var filePath = Path.Combine(rootDir, "SideWaffle-Settings.json"); + var filePath = Path.Combine(Environment.ExpandEnvironmentVariables(@"%localappdata%\LigerShark\SideWaffle\"), "SideWaffle-Settings.json"); // Save the settings to the JSON file - userSettings.WriteJsonFile(rootDir, filePath, json); + userSettings.WriteJsonFile(filePath, json); } base.OnApply(e); } From e8c8f5a926e763b0bbe9ba059515eb0adcc8084a Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Wed, 13 Jan 2016 12:51:08 +0000 Subject: [PATCH 17/47] Added the run settings item template. --- .../ItemTemplates/Test/RunSettings/STAR10.ico | Bin 0 -> 7134 bytes .../_Definitions/CSharp.vstemplate | 16 ++ .../RunSettings/_Definitions/VB.vstemplate | 16 ++ .../_Definitions/Web.csharp.vstemplate | 17 +++ .../Test/RunSettings/default.runsettings | 140 ++++++++++++++++++ TemplatePack/TemplatePack.csproj | 5 + 6 files changed, 194 insertions(+) create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico b/TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico new file mode 100644 index 0000000000000000000000000000000000000000..a94a91df7e1d6be6264fb1170a9e5b1cbfbf1b5d GIT binary patch literal 7134 zcmeHLF>~8C6n+2+fh0f?fFPKpNQEJ#yJqZ|wNtJ?p=-yE9kY7$&_SbDj~+96^>y-? z(W}Oc9^D5@jgz#oNhjCqK=>X7K*ERjzV|(VX8?kKZ{7etBlvR#-~iwUG@ODz(ER+@ z+UeT}&Q2pZJymEgVRxqB?CcfncK-869HZ@WH2iM&8to@IKYs-m=Qw}<8vB0yGhAH! z0+*NGeua1My!{4OSHGjZMLUJ-Yi~Qax!J+{_m^;cdjh1nmTj4XjmQEOoekg*eD>#{y^Rq9?rH zY2c$l`;cu##)dsWyQyvKWI=yYe8Djg?jkZJp7Q3vEPx zfNApOfUMPoKvMKH)Z961oizrZ&IJAH7mfj$`2;-LHj7y*7(^)M&dM@38k@1js<46G zY}*y5T&AR#=wm=#I#b$dMs;EM$;xUe6$0f|rA8OEuz0foCHjGH1il1p14H5y^G z%~$ADi)Gn;E(yUZI^LKIqr(hdKi_VN46+%s09mxfW`AcYV4Xd24TDs2ksziS>;T=kak_Q};ubZYFM#wd0EAl+il z94hhPOz8~wvskEVd?)n88wv{S5GgpBCTbE z%IZt5DvCFTEhLge3p|WCrhS+rpCOfi3-SG+j*MY1@V*eT;B){npP}Gw#jNd@8EKd& zxT4O{a3oMen0Cx~Y%47HtGkF7hQ{Mw6>3QJ@$xi0=lzA_FH|}5Vs1&u=-g-SWg_q* z^NzK#zu-r{Qq>8hy%_6|+bHU_P!Tdnf_~GFt!oZCsz|2Uk(Dx4BYFM^w_S%J3+E5x pXZOl9dA=8)?%EAI06$$a^(O`<2L6W(e8+!9PEZpA69Zo`@E6uG?7IK} literal 0 HcmV?d00001 diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate new file mode 100644 index 00000000..9021e698 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -0,0 +1,16 @@ + + + CSharp + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 5714f070-f077-47ef-9da8-b52951b1c8df + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate new file mode 100644 index 00000000..a09b8cb8 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -0,0 +1,16 @@ + + + VisualBasic + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 41e6eb5e-ed95-44a2-b1e7-37adafab4517 + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate new file mode 100644 index 00000000..eb01ea35 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -0,0 +1,17 @@ + + + Web + CSharp + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 267001b4-2c06-4739-9323-3e8bcb0cf833 + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings new file mode 100644 index 00000000..585b8507 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings @@ -0,0 +1,140 @@ + + + + + + + .\TestResults + + + x86 + + + Framework40 + + + + + + + + + + + + + + + .*\.dll$ + .*\.exe$ + + + .*CPPUnitTestFramework.* + .*TestAdapter.* + + + + + + + + ^Fabrikam\.UnitTest\..* + ^std::.* + ^ATL::.* + .*::__GetTestMethodInfo.* + ^Microsoft::VisualStudio::CppCodeCoverageFramework::.* + ^Microsoft::VisualStudio::CppUnitTestFramework::.* + + + + + + + + ^System.Diagnostics.DebuggerHiddenAttribute$ + ^System.Diagnostics.DebuggerNonUserCodeAttribute$ + ^System.Runtime.CompilerServices.CompilerGeneratedAttribute$ + ^System.CodeDom.Compiler.GeneratedCodeAttribute$ + ^System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute$ + ^NUnit.Framework.TestFixtureAttribute$ + ^Xunit.FactAttribute$ + ^Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute$ + + + + + + + .*\\atlmfc\\.* + .*\\vctools\\.* + .*\\public\\sdk\\.* + .*\\microsoft sdks\\.* + .*\\vc\\include\\.* + + + + + + + .*microsoft.* + + + + + + + + ^B77A5C561934E089$ + ^B03F5F7F11D50A3A$ + ^31BF3856AD364E35$ + ^89845DCD8080CC91$ + ^71E9BCE111E9429C$ + ^8F50407C4E9E73B6$ + ^E361AF139669C375$ + + + + + + True + True + True + False + + + + + + + + + + + + + + + + + True + false + False + False + + diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index f714ef06..e2250849 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -123,6 +123,11 @@ + + + + + Designer From a2083be4c3bbc6fb680858a855870c226ae229ed Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Wed, 13 Jan 2016 14:35:16 +0000 Subject: [PATCH 18/47] Added telemetry config. --- .../Test/RunSettings/_Definitions/CSharp.vstemplate | 11 ++++++++++- .../Test/RunSettings/_Definitions/VB.vstemplate | 11 ++++++++++- .../RunSettings/_Definitions/Web.csharp.vstemplate | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate index 9021e698..787a2046 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -2,7 +2,7 @@ CSharp default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -12,5 +12,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate index a09b8cb8..bafebb93 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -2,7 +2,7 @@ VisualBasic default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -12,5 +12,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate index eb01ea35..80b90bfc 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -3,7 +3,7 @@ Web CSharp default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -13,5 +13,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file From 0012c99daf4f7003e170f5338db43170fc3ba631 Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Thu, 28 Jan 2016 13:05:21 +0000 Subject: [PATCH 19/47] Updated release notes and added ability to create item template for the solution. --- .../Test/RunSettings/_Definitions/CSharp.vstemplate | 1 + .../Test/RunSettings/_Definitions/VB.vstemplate | 1 + .../Test/RunSettings/_Definitions/Web.csharp.vstemplate | 1 + release-notes.xml | 7 +++++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate index 787a2046..cbee7061 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -8,6 +8,7 @@ 1 5714f070-f077-47ef-9da8-b52951b1c8df 1000 + ABC | (!ABC) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate index bafebb93..7feb09e7 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -8,6 +8,7 @@ 1 41e6eb5e-ed95-44a2-b1e7-37adafab4517 1000 + ABC | (!ABC) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate index 80b90bfc..c9b9cb7d 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -9,6 +9,7 @@ 1 267001b4-2c06-4739-9323-3e8bcb0cf833 1000 + ABC | (!ABC) diff --git a/release-notes.xml b/release-notes.xml index a42df26a..4c5fd0a9 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -1,13 +1,16 @@  + + Added Unit Test Run Settings template + Added support for dynamic templates - Updated xUnit template for ASP.NET 5 RC1 + Updated xUnit template for ASP.NET 5 RC1 Added Angular 2 TypeScript Service template Added Angular 2 TypeScript Component template Added Angular 2 TypeScript Pipe template - Changed the AngularJs directive templates to fix a bug with the usage comments issue #285 + Changed the AngularJs directive templates to fix a bug with the usage comments issue #285 From 00ea61dd49ee6da66bf58303829e24dcb8946ddb Mon Sep 17 00:00:00 2001 From: Kent Cooper Date: Thu, 28 Jan 2016 22:00:46 -0500 Subject: [PATCH 20/47] Updated Release Notes for v1.21 Moved the angular changes from v1.20 to v1.21 in the release notes. --- release-notes.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release-notes.xml b/release-notes.xml index a42df26a..39300f08 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -1,8 +1,6 @@  - - Added support for dynamic templates - Updated xUnit template for ASP.NET 5 RC1 + Added Angular 2 TypeScript Service template Added Angular 2 TypeScript Component template Added Angular 2 TypeScript Pipe template @@ -10,6 +8,10 @@ Changed the AngularJs directive templates to fix a bug with the usage comments issue #285 + + Added support for dynamic templates + Updated xUnit template for ASP.NET 5 RC1 + Added SortOrder and set it to 1000 for all ItemTemplates that didn't already have a SortOrder element Added xUnit test project From 19074d223896928c1d44e116cf85931f32eaf242 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Tue, 2 Feb 2016 22:54:44 -0600 Subject: [PATCH 21/47] Removed old reference to ConsoleApplicationAsync --- SideWaffle.sln | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SideWaffle.sln b/SideWaffle.sln index 153e71e2..03668d26 100644 --- a/SideWaffle.sln +++ b/SideWaffle.sln @@ -45,8 +45,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.CSharp.SelfHost", "Pr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.CSharp.SelfHostWithRazor", "Project Templates\Nancy.CSharp.SelfHostWithRazor\Nancy.CSharp.SelfHostWithRazor.csproj", "{68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplicationAsync", "Project Templates\Windows Desktop\ConsoleApplicationAsync\ConsoleApplicationAsync.csproj", "{80D7D5EF-F856-4A55-840B-0D07E7FD1718}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LigerShark.Templates", "LigerShark.Templates\LigerShark.Templates.csproj", "{A2A92F75-3703-4326-A474-1569979EC875}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "html5up", "Project Templates\html5up\html5up.csproj", "{785C93D7-0D1F-4A13-BDC7-6917A5F8288F}" @@ -87,8 +85,6 @@ Global {35460AA4-B94A-4B64-9418-7243EC3D2F01}.Release|Any CPU.ActiveCfg = Release|Any CPU {68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80D7D5EF-F856-4A55-840B-0D07E7FD1718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80D7D5EF-F856-4A55-840B-0D07E7FD1718}.Release|Any CPU.ActiveCfg = Release|Any CPU {A2A92F75-3703-4326-A474-1569979EC875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A2A92F75-3703-4326-A474-1569979EC875}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2A92F75-3703-4326-A474-1569979EC875}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -115,7 +111,6 @@ Global {0DD85688-3051-42C9-BBB3-9EAE9D9B473F} = {30C5F3FE-3003-4BC0-9AC7-F084270A43DC} {35460AA4-B94A-4B64-9418-7243EC3D2F01} = {30C5F3FE-3003-4BC0-9AC7-F084270A43DC} {68F5F5F3-B8BB-4911-875F-6F00AAE04EA6} = {30C5F3FE-3003-4BC0-9AC7-F084270A43DC} - {80D7D5EF-F856-4A55-840B-0D07E7FD1718} = {30C5F3FE-3003-4BC0-9AC7-F084270A43DC} {785C93D7-0D1F-4A13-BDC7-6917A5F8288F} = {30C5F3FE-3003-4BC0-9AC7-F084270A43DC} {2D22AA48-5183-4FF2-B846-DF72E699E45E} = {30C5F3FE-3003-4BC0-9AC7-F084270A43DC} {650A5A85-5956-491E-9312-5E25A27D1108} = {30C5F3FE-3003-4BC0-9AC7-F084270A43DC} From ffd47798ed4ce1407154e2379b6e1e0f076d1e4e Mon Sep 17 00:00:00 2001 From: NN Date: Tue, 16 Feb 2016 15:09:22 +0200 Subject: [PATCH 22/47] Add Chrome manifest schema Fix #214 --- .../Web/Chrome Extension/ChromeExtensionProjectTemplate.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TemplatePack/ProjectTemplates/Web/Chrome Extension/ChromeExtensionProjectTemplate.csproj b/TemplatePack/ProjectTemplates/Web/Chrome Extension/ChromeExtensionProjectTemplate.csproj index 94dece5c..7bfc06a5 100644 --- a/TemplatePack/ProjectTemplates/Web/Chrome Extension/ChromeExtensionProjectTemplate.csproj +++ b/TemplatePack/ProjectTemplates/Web/Chrome Extension/ChromeExtensionProjectTemplate.csproj @@ -79,6 +79,7 @@ False + @@ -97,4 +98,4 @@ $(BuildFolder)\ligershark.chrome.targets - \ No newline at end of file + From 6dd2eecfcda48dbbcd1317fe50cd8a7f5d6f7fa9 Mon Sep 17 00:00:00 2001 From: nerobianchi Date: Wed, 17 Feb 2016 16:29:21 +0200 Subject: [PATCH 23/47] Packages are updated to lastest version as of 17/02/2016 --- .../Nancy.CSharp.AspNetHost.csproj | 29 ++++-- .../Nancy.CSharp.AspNetHost/Web.config | 38 ++++---- .../Nancy.CSharp.AspNetHost/packages.config | 2 +- .../Nancy.CSharp.AspNetHostWithRazor.csproj | 47 +++++++--- .../Web.config | 92 ++++++++++--------- .../packages.config | 6 +- .../Nancy.CSharp.Demo.csproj | 20 +++- .../Nancy.CSharp.Demo/Web.config | 36 +++++--- .../Nancy.CSharp.Demo/packages.config | 2 +- .../Nancy.CSharp.EmptyAspNetHost.csproj | 22 +++-- .../Nancy.CSharp.EmptyAspNetHost/Web.config | 23 +++-- .../packages.config | 2 +- ...ncy.CSharp.EmptyAspNetHostWithRazor.csproj | 45 ++++++--- .../Web.config | 46 +++++----- .../packages.config | 6 +- .../Nancy.CSharp.EmptySelfHost.csproj | 18 ++-- .../Nancy.CSharp.EmptySelfHost/app.config | 3 + .../packages.config | 4 +- ...Nancy.CSharp.EmptySelfHostWithRazor.csproj | 38 +++++--- .../app.config | 36 +++++--- .../packages.config | 6 +- .../Nancy.CSharp.SelfHost.csproj | 15 ++- .../Nancy.CSharp.SelfHost/app.config | 3 + .../Nancy.CSharp.SelfHost/packages.config | 2 +- .../Nancy.CSharp.SelfHostWithRazor.csproj | 36 +++++--- .../Nancy.CSharp.SelfHostWithRazor/app.config | 44 +++++---- .../packages.config | 6 +- 27 files changed, 400 insertions(+), 227 deletions(-) create mode 100644 Project Templates/Nancy.CSharp.EmptySelfHost/app.config create mode 100644 Project Templates/Nancy.CSharp.SelfHost/app.config diff --git a/Project Templates/Nancy.CSharp.AspNetHost/Nancy.CSharp.AspNetHost.csproj b/Project Templates/Nancy.CSharp.AspNetHost/Nancy.CSharp.AspNetHost.csproj index 05f418df..81d2344f 100644 --- a/Project Templates/Nancy.CSharp.AspNetHost/Nancy.CSharp.AspNetHost.csproj +++ b/Project Templates/Nancy.CSharp.AspNetHost/Nancy.CSharp.AspNetHost.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,14 +13,16 @@ Properties Nancy.CSharp.AspNetHost Nancy.CSharp.AspNetHost - v4.0 + v4.6.1 true - ..\..\ + ..\ true + + true @@ -30,6 +32,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -38,29 +41,33 @@ TRACE prompt 4 + false - - False - ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll + + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll + True False ..\packages\Nancy.Hosting.Aspnet.1.4.1\lib\net40\Nancy.Hosting.Aspnet.dll - + + + + + + - - @@ -71,7 +78,9 @@ Designer - + + Designer + Web.config diff --git a/Project Templates/Nancy.CSharp.AspNetHost/Web.config b/Project Templates/Nancy.CSharp.AspNetHost/Web.config index cc65ddb7..f28a057f 100644 --- a/Project Templates/Nancy.CSharp.AspNetHost/Web.config +++ b/Project Templates/Nancy.CSharp.AspNetHost/Web.config @@ -1,19 +1,25 @@ - - + - - - - - - - + + + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.AspNetHost/packages.config b/Project Templates/Nancy.CSharp.AspNetHost/packages.config index a82d453f..055edd01 100644 --- a/Project Templates/Nancy.CSharp.AspNetHost/packages.config +++ b/Project Templates/Nancy.CSharp.AspNetHost/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.AspNetHostWithRazor/Nancy.CSharp.AspNetHostWithRazor.csproj b/Project Templates/Nancy.CSharp.AspNetHostWithRazor/Nancy.CSharp.AspNetHostWithRazor.csproj index 39437cce..da8bcd5c 100644 --- a/Project Templates/Nancy.CSharp.AspNetHostWithRazor/Nancy.CSharp.AspNetHostWithRazor.csproj +++ b/Project Templates/Nancy.CSharp.AspNetHostWithRazor/Nancy.CSharp.AspNetHostWithRazor.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,14 +13,18 @@ Properties Nancy.CSharp.AspNetHostWithRazor Nancy.CSharp.AspNetHostWithRazor - v4.0 + v4.6.1 true - ..\..\ + ..\ true + + + + true @@ -30,6 +34,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -38,26 +43,35 @@ TRACE prompt 4 + false - - ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll + + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll + True ..\packages\Nancy.Hosting.Aspnet.1.4.1\lib\net40\Nancy.Hosting.Aspnet.dll - - ..\packages\Nancy.Viewengines.Razor.1.4.1\lib\net40\Nancy.ViewEngines.Razor.dll + + ..\packages\Nancy.Viewengines.Razor.1.4.3\lib\net40\Nancy.ViewEngines.Razor.dll + True - - - - ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + + + + + + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True + + @@ -112,11 +126,18 @@ if $(ConfigurationName) == Debug ( -xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.1\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\" -xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.1\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\" +xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.3\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\" +xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.3\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\" ) + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + - - -
- - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.AspNetHostWithRazor/packages.config b/Project Templates/Nancy.CSharp.AspNetHostWithRazor/packages.config index 1673e456..4a7db207 100644 --- a/Project Templates/Nancy.CSharp.AspNetHostWithRazor/packages.config +++ b/Project Templates/Nancy.CSharp.AspNetHostWithRazor/packages.config @@ -1,7 +1,7 @@  - + + - - + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.Demo/Nancy.CSharp.Demo.csproj b/Project Templates/Nancy.CSharp.Demo/Nancy.CSharp.Demo.csproj index 101988b1..3d2b8501 100644 --- a/Project Templates/Nancy.CSharp.Demo/Nancy.CSharp.Demo.csproj +++ b/Project Templates/Nancy.CSharp.Demo/Nancy.CSharp.Demo.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,16 @@ Properties Nancy.CSharp.Demo Nancy.CSharp.Demo - v4.0 + v4.6.1 true - ..\..\ + ..\ true + true @@ -31,6 +32,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -39,19 +41,27 @@ TRACE prompt 4 + false - - ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll + + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll + True ..\packages\Nancy.Hosting.Aspnet.1.4.1\lib\net40\Nancy.Hosting.Aspnet.dll + + + + + + diff --git a/Project Templates/Nancy.CSharp.Demo/Web.config b/Project Templates/Nancy.CSharp.Demo/Web.config index b0d155c0..9c77f05f 100644 --- a/Project Templates/Nancy.CSharp.Demo/Web.config +++ b/Project Templates/Nancy.CSharp.Demo/Web.config @@ -1,21 +1,31 @@ - + - - + + + + + + + + + - - - - - - + + + + + + + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.Demo/packages.config b/Project Templates/Nancy.CSharp.Demo/packages.config index a82d453f..055edd01 100644 --- a/Project Templates/Nancy.CSharp.Demo/packages.config +++ b/Project Templates/Nancy.CSharp.Demo/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.EmptyAspNetHost/Nancy.CSharp.EmptyAspNetHost.csproj b/Project Templates/Nancy.CSharp.EmptyAspNetHost/Nancy.CSharp.EmptyAspNetHost.csproj index 898b3c4d..d6401b43 100644 --- a/Project Templates/Nancy.CSharp.EmptyAspNetHost/Nancy.CSharp.EmptyAspNetHost.csproj +++ b/Project Templates/Nancy.CSharp.EmptyAspNetHost/Nancy.CSharp.EmptyAspNetHost.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,14 +13,16 @@ Properties Nancy.CSharp.EmptyAspNetHost Nancy.CSharp.EmptyAspNetHost - v4.0 + v4.6.1 true - ..\..\ + ..\ true + + true @@ -30,6 +32,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -38,20 +41,27 @@ TRACE prompt 4 + false - - ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll + + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll + True ..\packages\Nancy.Hosting.Aspnet.1.4.1\lib\net40\Nancy.Hosting.Aspnet.dll - + + + + + + diff --git a/Project Templates/Nancy.CSharp.EmptyAspNetHost/Web.config b/Project Templates/Nancy.CSharp.EmptyAspNetHost/Web.config index 76d74af1..6499e58f 100644 --- a/Project Templates/Nancy.CSharp.EmptyAspNetHost/Web.config +++ b/Project Templates/Nancy.CSharp.EmptyAspNetHost/Web.config @@ -1,22 +1,29 @@ - + - - + + + - + + - - + - + - + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.EmptyAspNetHost/packages.config b/Project Templates/Nancy.CSharp.EmptyAspNetHost/packages.config index a82d453f..055edd01 100644 --- a/Project Templates/Nancy.CSharp.EmptyAspNetHost/packages.config +++ b/Project Templates/Nancy.CSharp.EmptyAspNetHost/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/Nancy.CSharp.EmptyAspNetHostWithRazor.csproj b/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/Nancy.CSharp.EmptyAspNetHostWithRazor.csproj index ed6bd0d2..46f68ba6 100644 --- a/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/Nancy.CSharp.EmptyAspNetHostWithRazor.csproj +++ b/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/Nancy.CSharp.EmptyAspNetHostWithRazor.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,14 +13,18 @@ Properties Nancy.CSharp.EmptyAspNetHostWithRazor Nancy.CSharp.EmptyAspNetHostWithRazor - v4.0 + v4.6.1 true - ..\..\ + ..\ true + + + + true @@ -30,6 +34,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -38,26 +43,35 @@ TRACE prompt 4 + false - - ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll + + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll + True ..\packages\Nancy.Hosting.Aspnet.1.4.1\lib\net40\Nancy.Hosting.Aspnet.dll - - ..\packages\Nancy.Viewengines.Razor.1.4.1\lib\net40\Nancy.ViewEngines.Razor.dll + + ..\packages\Nancy.Viewengines.Razor.1.4.3\lib\net40\Nancy.ViewEngines.Razor.dll + True - + - - ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + + + + + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True + @@ -110,11 +124,18 @@ if $(ConfigurationName) == Debug ( -xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.1\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\" -xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.1\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\" +xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.3\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\" +xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.3\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\" ) + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + - - + - - + + - - + + - + + + + + + + - + - + - - - - - - - - + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/packages.config b/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/packages.config index 1673e456..4a7db207 100644 --- a/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/packages.config +++ b/Project Templates/Nancy.CSharp.EmptyAspNetHostingWithRazor/packages.config @@ -1,7 +1,7 @@  - + + - - + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.EmptySelfHost/Nancy.CSharp.EmptySelfHost.csproj b/Project Templates/Nancy.CSharp.EmptySelfHost/Nancy.CSharp.EmptySelfHost.csproj index 7fdb8a62..724ad55e 100644 --- a/Project Templates/Nancy.CSharp.EmptySelfHost/Nancy.CSharp.EmptySelfHost.csproj +++ b/Project Templates/Nancy.CSharp.EmptySelfHost/Nancy.CSharp.EmptySelfHost.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,11 @@ Properties Nancy.CSharp.EmptySelfHost Nancy.CSharp.EmptySelfHost - v4.0 + v4.6.1 512 - ..\..\ + ..\ true + AnyCPU @@ -23,6 +24,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -32,13 +34,16 @@ TRACE prompt 4 + false - - ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll + + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll + True - + ..\packages\Nancy.Hosting.Self.1.4.1\lib\net40\Nancy.Hosting.Self.dll + True @@ -50,6 +55,7 @@ + diff --git a/Project Templates/Nancy.CSharp.EmptySelfHost/app.config b/Project Templates/Nancy.CSharp.EmptySelfHost/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Project Templates/Nancy.CSharp.EmptySelfHost/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Project Templates/Nancy.CSharp.EmptySelfHost/packages.config b/Project Templates/Nancy.CSharp.EmptySelfHost/packages.config index 7a26d0b0..7a6a7bf7 100644 --- a/Project Templates/Nancy.CSharp.EmptySelfHost/packages.config +++ b/Project Templates/Nancy.CSharp.EmptySelfHost/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Project Templates/Nancy.CSharp.EmptySelfHostWithRazor/Nancy.CSharp.EmptySelfHostWithRazor.csproj b/Project Templates/Nancy.CSharp.EmptySelfHostWithRazor/Nancy.CSharp.EmptySelfHostWithRazor.csproj index 5ca7611f..341de0ed 100644 --- a/Project Templates/Nancy.CSharp.EmptySelfHostWithRazor/Nancy.CSharp.EmptySelfHostWithRazor.csproj +++ b/Project Templates/Nancy.CSharp.EmptySelfHostWithRazor/Nancy.CSharp.EmptySelfHostWithRazor.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,13 @@ Properties Nancy.CSharp.EmptySelfHostWithRazor Nancy.CSharp.EmptySelfHostWithRazor - v4.0 + v4.6.1 512 - ..\..\ + ..\ true + + + AnyCPU @@ -23,6 +26,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -32,22 +36,25 @@ TRACE prompt 4 + false - - ..\packages\Nancy.1.4.1\lib\net40\Nancy.dll + + ..\packages\Nancy.1.4.3\lib\net40\Nancy.dll + True ..\packages\Nancy.Hosting.Self.1.4.1\lib\net40\Nancy.Hosting.Self.dll - - ..\packages\Nancy.Viewengines.Razor.1.4.1\lib\net40\Nancy.ViewEngines.Razor.dll + + ..\packages\Nancy.Viewengines.Razor.1.4.3\lib\net40\Nancy.ViewEngines.Razor.dll + True - - - ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True @@ -68,11 +75,18 @@ if $(ConfigurationName) == Debug ( -xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.1\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\" -xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.1\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\" +xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.3\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\" +xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.1.4.3\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\" ) + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/TemplatePack/template-report.xml b/TemplatePack/template-report.xml index 0addd197..299c1596 100644 --- a/TemplatePack/template-report.xml +++ b/TemplatePack/template-report.xml @@ -91,7 +91,7 @@ - + From f8cdace273fbfbf0a5a22f883fe5a8ee956ab946 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Wed, 9 Mar 2016 23:34:04 -0600 Subject: [PATCH 31/47] Added verification for publishing to the VSIX Gallery --- appveyor.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.ps1 b/appveyor.ps1 index bc336e78..8e588f2b 100644 --- a/appveyor.ps1 +++ b/appveyor.ps1 @@ -13,4 +13,8 @@ else{ .\build-main.ps1 } -Vsix-PushArtifacts | Vsix-PublishToGallery \ No newline at end of file +Vsix-PushArtifacts + +if ($env:APPVEYOR_REPO_NAME -eq "ligershark/side-waffle") { + Vsix-PublishToGallery +} \ No newline at end of file From 31c1c9e540d99acaef4964c00d8a9524cbaf7aea Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 18 Mar 2016 06:50:17 -0500 Subject: [PATCH 32/47] Commented out the telemetry for the SW-ProjectVSTemplateFile project --- .../SW-ProjectVSTemplateFile/_project.vstemplate.xml | 2 +- .../fsharp._project.vstemplate.xml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml index ea1dff67..cafc94ab 100644 --- a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml +++ b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml @@ -23,7 +23,7 @@ - + --> diff --git a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml index 912f4009..dd2d21ae 100644 --- a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml +++ b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml @@ -19,10 +19,13 @@ + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null From 29ee5c5cb8581bbfa8184aa55b6beb21f96111a8 Mon Sep 17 00:00:00 2001 From: RandomlyKnighted Date: Tue, 22 Mar 2016 10:13:59 -0500 Subject: [PATCH 33/47] Updates build-main.ps1 to not validate telemetry for the _project.vstemplate.xml content files --- build-main.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-main.ps1 b/build-main.ps1 index 937c38ce..05149400 100644 --- a/build-main.ps1 +++ b/build-main.ps1 @@ -563,7 +563,10 @@ function GetTemplateFiles{ throw ('Did not find templates folder at {0}' -f $f.FullName) } - $templatefiles += (Get-ChildItem -Path $f.FullName -Filter _project.vstemplate.xml -Recurse -File) + Write-Host($f.FullName) + + $templatefiles += Get-ChildItem -Path $f.FullName -Filter _project.vstemplate.xml -Recurse -File | Where-Object { $_.Directory.Name -ne 'SW-ProjectVSTemplateFile' } + $templatefiles += (Get-ChildItem -Path $f.FullName -Filter *.vstemplate -Recurse -File) } From 0da8138852b8063b1071eac5b279bfb8aad4c4c3 Mon Sep 17 00:00:00 2001 From: RandomlyKnighted Date: Tue, 22 Mar 2016 10:55:23 -0500 Subject: [PATCH 34/47] Removed write-host line --- build-main.ps1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-main.ps1 b/build-main.ps1 index 05149400..ead5477f 100644 --- a/build-main.ps1 +++ b/build-main.ps1 @@ -563,8 +563,6 @@ function GetTemplateFiles{ throw ('Did not find templates folder at {0}' -f $f.FullName) } - Write-Host($f.FullName) - $templatefiles += Get-ChildItem -Path $f.FullName -Filter _project.vstemplate.xml -Recurse -File | Where-Object { $_.Directory.Name -ne 'SW-ProjectVSTemplateFile' } $templatefiles += (Get-ChildItem -Path $f.FullName -Filter *.vstemplate -Recurse -File) From c725e0114770f3b0ce8e64e705bdec2cd4a7b22c Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 18 Mar 2016 06:50:17 -0500 Subject: [PATCH 35/47] Commented out the telemetry for the SW-ProjectVSTemplateFile project --- .../SW-ProjectVSTemplateFile/_project.vstemplate.xml | 2 +- .../fsharp._project.vstemplate.xml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml index ea1dff67..cafc94ab 100644 --- a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml +++ b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/_project.vstemplate.xml @@ -23,7 +23,7 @@ - + --> diff --git a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml index 912f4009..dd2d21ae 100644 --- a/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml +++ b/TemplatePack/ItemTemplates/Extensibility/SideWaffle/SW-ProjectVSTemplateFile/fsharp._project.vstemplate.xml @@ -19,10 +19,13 @@ + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null From fb8085c37c13928d88b1adb6bad91b0b9b3479e3 Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Wed, 13 Jan 2016 12:51:08 +0000 Subject: [PATCH 36/47] Added the run settings item template. --- .../ItemTemplates/Test/RunSettings/STAR10.ico | Bin 0 -> 7134 bytes .../_Definitions/CSharp.vstemplate | 16 ++ .../RunSettings/_Definitions/VB.vstemplate | 16 ++ .../_Definitions/Web.csharp.vstemplate | 17 +++ .../Test/RunSettings/default.runsettings | 140 ++++++++++++++++++ TemplatePack/TemplatePack.csproj | 5 + 6 files changed, 194 insertions(+) create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate create mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico b/TemplatePack/ItemTemplates/Test/RunSettings/STAR10.ico new file mode 100644 index 0000000000000000000000000000000000000000..a94a91df7e1d6be6264fb1170a9e5b1cbfbf1b5d GIT binary patch literal 7134 zcmeHLF>~8C6n+2+fh0f?fFPKpNQEJ#yJqZ|wNtJ?p=-yE9kY7$&_SbDj~+96^>y-? z(W}Oc9^D5@jgz#oNhjCqK=>X7K*ERjzV|(VX8?kKZ{7etBlvR#-~iwUG@ODz(ER+@ z+UeT}&Q2pZJymEgVRxqB?CcfncK-869HZ@WH2iM&8to@IKYs-m=Qw}<8vB0yGhAH! z0+*NGeua1My!{4OSHGjZMLUJ-Yi~Qax!J+{_m^;cdjh1nmTj4XjmQEOoekg*eD>#{y^Rq9?rH zY2c$l`;cu##)dsWyQyvKWI=yYe8Djg?jkZJp7Q3vEPx zfNApOfUMPoKvMKH)Z961oizrZ&IJAH7mfj$`2;-LHj7y*7(^)M&dM@38k@1js<46G zY}*y5T&AR#=wm=#I#b$dMs;EM$;xUe6$0f|rA8OEuz0foCHjGH1il1p14H5y^G z%~$ADi)Gn;E(yUZI^LKIqr(hdKi_VN46+%s09mxfW`AcYV4Xd24TDs2ksziS>;T=kak_Q};ubZYFM#wd0EAl+il z94hhPOz8~wvskEVd?)n88wv{S5GgpBCTbE z%IZt5DvCFTEhLge3p|WCrhS+rpCOfi3-SG+j*MY1@V*eT;B){npP}Gw#jNd@8EKd& zxT4O{a3oMen0Cx~Y%47HtGkF7hQ{Mw6>3QJ@$xi0=lzA_FH|}5Vs1&u=-g-SWg_q* z^NzK#zu-r{Qq>8hy%_6|+bHU_P!Tdnf_~GFt!oZCsz|2Uk(Dx4BYFM^w_S%J3+E5x pXZOl9dA=8)?%EAI06$$a^(O`<2L6W(e8+!9PEZpA69Zo`@E6uG?7IK} literal 0 HcmV?d00001 diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate new file mode 100644 index 00000000..9021e698 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -0,0 +1,16 @@ + + + CSharp + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 5714f070-f077-47ef-9da8-b52951b1c8df + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate new file mode 100644 index 00000000..a09b8cb8 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -0,0 +1,16 @@ + + + VisualBasic + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 41e6eb5e-ed95-44a2-b1e7-37adafab4517 + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate new file mode 100644 index 00000000..eb01ea35 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -0,0 +1,17 @@ + + + Web + CSharp + default.runsettings + Run Settings + Default runsettings file. + STAR10.ico + 1 + 267001b4-2c06-4739-9323-3e8bcb0cf833 + 1000 + + + + default.runsettings + + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings new file mode 100644 index 00000000..585b8507 --- /dev/null +++ b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings @@ -0,0 +1,140 @@ + + + + + + + .\TestResults + + + x86 + + + Framework40 + + + + + + + + + + + + + + + .*\.dll$ + .*\.exe$ + + + .*CPPUnitTestFramework.* + .*TestAdapter.* + + + + + + + + ^Fabrikam\.UnitTest\..* + ^std::.* + ^ATL::.* + .*::__GetTestMethodInfo.* + ^Microsoft::VisualStudio::CppCodeCoverageFramework::.* + ^Microsoft::VisualStudio::CppUnitTestFramework::.* + + + + + + + + ^System.Diagnostics.DebuggerHiddenAttribute$ + ^System.Diagnostics.DebuggerNonUserCodeAttribute$ + ^System.Runtime.CompilerServices.CompilerGeneratedAttribute$ + ^System.CodeDom.Compiler.GeneratedCodeAttribute$ + ^System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute$ + ^NUnit.Framework.TestFixtureAttribute$ + ^Xunit.FactAttribute$ + ^Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute$ + + + + + + + .*\\atlmfc\\.* + .*\\vctools\\.* + .*\\public\\sdk\\.* + .*\\microsoft sdks\\.* + .*\\vc\\include\\.* + + + + + + + .*microsoft.* + + + + + + + + ^B77A5C561934E089$ + ^B03F5F7F11D50A3A$ + ^31BF3856AD364E35$ + ^89845DCD8080CC91$ + ^71E9BCE111E9429C$ + ^8F50407C4E9E73B6$ + ^E361AF139669C375$ + + + + + + True + True + True + False + + + + + + + + + + + + + + + + + True + false + False + False + + diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index 1416a3f7..433f8fc8 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -127,6 +127,11 @@ + + + + + Designer From 325201666beaea8446c8844d2cc0d5b74d405f03 Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Wed, 13 Jan 2016 14:35:16 +0000 Subject: [PATCH 37/47] Added telemetry config. --- .../Test/RunSettings/_Definitions/CSharp.vstemplate | 11 ++++++++++- .../Test/RunSettings/_Definitions/VB.vstemplate | 11 ++++++++++- .../RunSettings/_Definitions/Web.csharp.vstemplate | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate index 9021e698..787a2046 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -2,7 +2,7 @@ CSharp default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -12,5 +12,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate index a09b8cb8..bafebb93 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -2,7 +2,7 @@ VisualBasic default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -12,5 +12,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate index eb01ea35..80b90bfc 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -3,7 +3,7 @@ Web CSharp default.runsettings - Run Settings + Test Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 @@ -13,5 +13,14 @@ default.runsettings + + + + + + + LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + LigerShark.Templates.GoogleAnalyticsWizard + \ No newline at end of file From 7b98aed9e195c05ff530b53568ecf77e7e2341f8 Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Fri, 25 Mar 2016 11:47:28 +0000 Subject: [PATCH 38/47] rebase --- .../Test/RunSettings/_Definitions/CSharp.vstemplate | 1 + .../Test/RunSettings/_Definitions/VB.vstemplate | 1 + .../Test/RunSettings/_Definitions/Web.csharp.vstemplate | 1 + release-notes.xml | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate index 787a2046..cbee7061 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate @@ -8,6 +8,7 @@ 1 5714f070-f077-47ef-9da8-b52951b1c8df 1000 + ABC | (!ABC) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate index bafebb93..7feb09e7 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate @@ -8,6 +8,7 @@ 1 41e6eb5e-ed95-44a2-b1e7-37adafab4517 1000 + ABC | (!ABC) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate index 80b90bfc..c9b9cb7d 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate @@ -9,6 +9,7 @@ 1 267001b4-2c06-4739-9323-3e8bcb0cf833 1000 + ABC | (!ABC) diff --git a/release-notes.xml b/release-notes.xml index 72a2aa3d..49386ee6 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -1,5 +1,8 @@  + + Added Unit Test Run Settings template + Added Angular 2 TypeScript Service template Added Angular 2 TypeScript Component template @@ -13,7 +16,7 @@ Added support for dynamic templates - Updated xUnit template for ASP.NET 5 RC1 + Updated xUnit template for ASP.NET 5 RC1 Added SortOrder and set it to 1000 for all ItemTemplates that didn't already have a SortOrder element From 43db506632f51bae3f941c4484cbfaab53f84bb7 Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Fri, 25 Mar 2016 11:49:27 +0000 Subject: [PATCH 39/47] rebase --- .../{CSharp.vstemplate => General.vstemplate} | 2 +- .../RunSettings/_Definitions/VB.vstemplate | 26 ------------------ .../_Definitions/Web.csharp.vstemplate | 27 ------------------- TemplatePack/TemplatePack.csproj | 4 +-- 4 files changed, 2 insertions(+), 57 deletions(-) rename TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/{CSharp.vstemplate => General.vstemplate} (96%) delete mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate delete mode 100644 TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/General.vstemplate similarity index 96% rename from TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate rename to TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/General.vstemplate index cbee7061..dd6ca4f5 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/CSharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/General.vstemplate @@ -1,6 +1,6 @@ - CSharp + General default.runsettings Test Run Settings (.runsettings) Default runsettings file. diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate deleted file mode 100644 index 7feb09e7..00000000 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/VB.vstemplate +++ /dev/null @@ -1,26 +0,0 @@ - - - VisualBasic - default.runsettings - Test Run Settings (.runsettings) - Default runsettings file. - STAR10.ico - 1 - 41e6eb5e-ed95-44a2-b1e7-37adafab4517 - 1000 - ABC | (!ABC) - - - - default.runsettings - - - - - - - - LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - LigerShark.Templates.GoogleAnalyticsWizard - - \ No newline at end of file diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate deleted file mode 100644 index c9b9cb7d..00000000 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/Web.csharp.vstemplate +++ /dev/null @@ -1,27 +0,0 @@ - - - Web - CSharp - default.runsettings - Test Run Settings (.runsettings) - Default runsettings file. - STAR10.ico - 1 - 267001b4-2c06-4739-9323-3e8bcb0cf833 - 1000 - ABC | (!ABC) - - - - default.runsettings - - - - - - - - LigerShark.Templates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - LigerShark.Templates.GoogleAnalyticsWizard - - \ No newline at end of file diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index 433f8fc8..f7138317 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -128,9 +128,7 @@ - - - + Designer From 6790c395448daa1475e218f6aa978797bb32148a Mon Sep 17 00:00:00 2001 From: Muhammad Rehan Saeed Date: Fri, 25 Mar 2016 14:11:22 +0000 Subject: [PATCH 40/47] Rename general.vstemplate to csharp.vstemplate --- .../{General.vstemplate => csharp.vstemplate} | 0 .../ItemTemplates/Test/RunSettings/default.runsettings | 10 +++++----- TemplatePack/TemplatePack.csproj | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/{General.vstemplate => csharp.vstemplate} (100%) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/General.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/csharp.vstemplate similarity index 100% rename from TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/General.vstemplate rename to TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/csharp.vstemplate diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings index 585b8507..6a323749 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings +++ b/TemplatePack/ItemTemplates/Test/RunSettings/default.runsettings @@ -6,7 +6,7 @@ .\TestResults - x86 @@ -23,8 +23,8 @@ Additional paths to search for .pdb (symbol) files. Symbols must be found for mo If .pdb files are in the same folder as the .dll or .exe files, they are automatically found. Otherwise, specify them here. Note that searching for symbols increases code coverage runtime. So keep this small and local. --> - diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index f7138317..bd451769 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -128,7 +128,7 @@ - + Designer From 8cadf9c06bf41197d2ae944a54bc7b870a140ea1 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 25 Mar 2016 16:19:10 -0500 Subject: [PATCH 41/47] Fixed release notes --- .../Test/RunSettings/_Definitions/csharp.vstemplate | 2 +- release-notes.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/csharp.vstemplate b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/csharp.vstemplate index dd6ca4f5..9a9e2512 100644 --- a/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/csharp.vstemplate +++ b/TemplatePack/ItemTemplates/Test/RunSettings/_Definitions/csharp.vstemplate @@ -2,7 +2,7 @@ General default.runsettings - Test Run Settings (.runsettings) + Run Settings (.runsettings) Default runsettings file. STAR10.ico 1 diff --git a/release-notes.xml b/release-notes.xml index 49386ee6..c84540a7 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -1,7 +1,7 @@  - Added Unit Test Run Settings template + Added Angular 2 TypeScript Service template @@ -11,6 +11,7 @@ Changed the AngularJs directive templates to fix a bug with the usage comments issue #285 Updated Angular TypeScript templates to reflect changes made to the Angular type definitions + Added Unit Test Run Settings template Updated Project Template - The packages of Nancy project templates Updated Project Template - The framework versions of Nancy project templates are set to 4.6.1 From 3f3b073b308b4a4eaeb7ab3f0062e4a8a4ac9833 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Fri, 25 Mar 2016 17:12:48 -0500 Subject: [PATCH 42/47] Fixed release notes --- release-notes.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/release-notes.xml b/release-notes.xml index c84540a7..b3096edd 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -1,8 +1,5 @@  - - - Added Angular 2 TypeScript Service template Added Angular 2 TypeScript Component template @@ -17,7 +14,7 @@ Added support for dynamic templates - Updated xUnit template for ASP.NET 5 RC1 + Updated xUnit template for ASP.NET 5 RC1 Added SortOrder and set it to 1000 for all ItemTemplates that didn't already have a SortOrder element From 64052d4026496002f391ff5c99f1c8a48f88f728 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Wed, 30 Mar 2016 22:39:55 -0500 Subject: [PATCH 43/47] Updated Appveyor script to correctly push nightly builds only for the master branch --- appveyor.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.ps1 b/appveyor.ps1 index 8e588f2b..2a54faf1 100644 --- a/appveyor.ps1 +++ b/appveyor.ps1 @@ -15,6 +15,6 @@ else{ Vsix-PushArtifacts -if ($env:APPVEYOR_REPO_NAME -eq "ligershark/side-waffle") { - Vsix-PublishToGallery +if ( ($env:APPVEYOR_REPO_NAME -eq "ligershark/side-waffle") -and ( $env:APPVEYOR_REPO_BRANCH -eq "master" ) ) { + Vsix-PublishToGallery } \ No newline at end of file From 4a884bfa211677358705fce1fcd1e11a25a9a7cb Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Thu, 31 Mar 2016 01:29:26 -0500 Subject: [PATCH 44/47] Added jscsrc files to TemplatePack project --- TemplatePack/TemplatePack.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index bd451769..69decd67 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -60,6 +60,11 @@ + + + + + From fa021d02fcc052be0b77a2788bc2f8e0cb5621f8 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Thu, 31 Mar 2016 01:55:23 -0500 Subject: [PATCH 45/47] Fixed issue with JSCSRC definitions files pointing to wrong file --- .../ItemTemplates/Web/JavaScript/jscsrc/{jscsrc.txt => .jscsrc} | 0 TemplatePack/TemplatePack.csproj | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename TemplatePack/ItemTemplates/Web/JavaScript/jscsrc/{jscsrc.txt => .jscsrc} (100%) diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/jscsrc/jscsrc.txt b/TemplatePack/ItemTemplates/Web/JavaScript/jscsrc/.jscsrc similarity index 100% rename from TemplatePack/ItemTemplates/Web/JavaScript/jscsrc/jscsrc.txt rename to TemplatePack/ItemTemplates/Web/JavaScript/jscsrc/.jscsrc diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj index 69decd67..6a6c5feb 100644 --- a/TemplatePack/TemplatePack.csproj +++ b/TemplatePack/TemplatePack.csproj @@ -61,7 +61,7 @@ - + From 8467244b3818fa481de42ff45848713c4632d6ec Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Thu, 31 Mar 2016 02:01:40 -0500 Subject: [PATCH 46/47] Updated the release notes for jscsrc item template --- release-notes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/release-notes.xml b/release-notes.xml index b3096edd..a684a40f 100644 --- a/release-notes.xml +++ b/release-notes.xml @@ -1,6 +1,7 @@  + Updated jscsrc item template to use the correct file Added Angular 2 TypeScript Service template Added Angular 2 TypeScript Component template Added Angular 2 TypeScript Pipe template From bde13a6e7f12452d82167a13418706ec4ab82d77 Mon Sep 17 00:00:00 2001 From: Tyler Hughes Date: Tue, 19 Apr 2016 18:00:12 -0500 Subject: [PATCH 47/47] Updated version to 1.21 --- TemplatePack/source.extension.vsixmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TemplatePack/source.extension.vsixmanifest b/TemplatePack/source.extension.vsixmanifest index c6ab2529..e3a8abed 100644 --- a/TemplatePack/source.extension.vsixmanifest +++ b/TemplatePack/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + SideWaffle Template Pack A side dish filled with item- and project templates for all developers. http://sidewaffle.com