diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2019-03-05 15:05:59 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2019-03-05 15:05:59 +0300 |
| commit | da954bd047a339289965a729f6c9ed73cdc689b6 (patch) | |
| tree | fce69118695bb84526b0ee19473ef01081896cbe /main/src/addins/AspNet | |
| parent | 531006386a6c42a9de8391b3ec5aaabbe19c0dda (diff) | |
| parent | 140d5092d96c7d9e826193157a45c5f03a27c168 (diff) | |
Merge remote-tracking branch 'origin/release-8.0-integration' into merge-integration-7
Diffstat (limited to 'main/src/addins/AspNet')
| -rw-r--r-- | main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs | 8 | ||||
| -rw-r--r-- | main/src/addins/AspNet/Projects/WebSubtype.cs | 3 | ||||
| -rw-r--r-- | main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs index 852c7dee79..5432c3a844 100644 --- a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs +++ b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs @@ -60,6 +60,7 @@ namespace MonoDevelop.AspNet.Projects WebFormsRegistrationCache registrationCache; WebFormsCodeBehindTypeNameCache codebehindTypeNameCache; + public const string TypeScriptCompile = "TypeScriptCompile"; #region properties @@ -303,6 +304,8 @@ namespace MonoDevelop.AspNet.Projects return WebSubtype.Stylus; case "CSHTML": return WebSubtype.Razor; + case "TS": + return WebSubtype.TypeScript; default: return WebSubtype.None; } @@ -546,11 +549,12 @@ namespace MonoDevelop.AspNet.Projects protected override string OnGetDefaultBuildAction (string fileName) { - - WebSubtype type = DetermineWebSubtype (fileName); + var type = DetermineWebSubtype (fileName); switch (type) { case WebSubtype.Code: return BuildAction.Compile; + case WebSubtype.TypeScript: + return TypeScriptCompile; case WebSubtype.None: return base.OnGetDefaultBuildAction (fileName); default: diff --git a/main/src/addins/AspNet/Projects/WebSubtype.cs b/main/src/addins/AspNet/Projects/WebSubtype.cs index 24bd85dbb4..e149d65d28 100644 --- a/main/src/addins/AspNet/Projects/WebSubtype.cs +++ b/main/src/addins/AspNet/Projects/WebSubtype.cs @@ -53,7 +53,8 @@ namespace MonoDevelop.AspNet.Projects Svg, Sass, Stylus,
- Razor + Razor, + TypeScript } } diff --git a/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml b/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml index ba60eb2595..30a6a4a012 100644 --- a/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml +++ b/main/src/addins/AspNet/Templates/EmptyTypeScriptFile.xft.xml @@ -14,6 +14,6 @@ </TemplateConfiguration> <TemplateFiles> - <File DefaultExtension=".ts" src="TypeScriptFileTemplate.ts" /> + <File DefaultExtension=".ts" src="TypeScriptFileTemplate.ts" BuildAction="TypeScriptCompile" /> </TemplateFiles> </Template> |