Skip to content

Commit 18270c5

Browse files
hwthomashwthomas
committed
Extend SupportedSDK list and add Sdk5.0/6.0 templates to MonoDevelop.DotnetCore.addin.xml
and MonoDevelop.ASpNetCore.addin.xml to allow net5.0 and net6.0 projects to be created These template updates were overlooked in the menu limit changes in PR#76
1 parent 2103163 commit 18270c5

5 files changed

Lines changed: 925 additions & 2 deletions

File tree

‎main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml‎

Lines changed: 347 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,351 @@
8383
For example, .NET Core 1.1 SDK does not have a Razor template so having the 1.1 templates first
8484
would cause the Razor template to be last in the New Project dialog if both 1.1 and 2.x templates
8585
are available. -->
86+
87+
<!-- Include templates for SdkVersion 6.0 -->
88+
<Condition id="AspNetCoreSdkInstalled" sdkVersion="6.0">
89+
<Template
90+
id="Microsoft.Web.Empty.CSharp"
91+
templateId="Microsoft.Web.Empty.CSharp.6.0"
92+
_overrideName="Empty"
93+
_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
94+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
95+
icon="md-netcore-empty-project"
96+
imageId="md-netcore-empty-project"
97+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
98+
condition="UseNetCore60=true"
99+
category="netcore/app/aspnet"
100+
defaultParameters="IncludeLaunchSettings=true" />
101+
<Template
102+
id="Microsoft.Web.Empty.FSharp"
103+
templateId="Microsoft.Web.Empty.FSharp.6.0"
104+
_overrideName="Empty"
105+
_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
106+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
107+
icon="md-netcore-empty-project"
108+
imageId="md-netcore-empty-project"
109+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
110+
condition="UseNetCore60=true"
111+
category="netcore/app/aspnet"
112+
defaultParameters="IncludeLaunchSettings=true" />
113+
<Template
114+
id="Microsoft.Web.WebApi.CSharp"
115+
templateId="Microsoft.Web.WebApi.CSharp.6.0"
116+
_overrideName="API"
117+
_overrideDescription="A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers."
118+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
119+
icon="md-netcore-empty-project"
120+
imageId="md-netcore-empty-project"
121+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
122+
condition="UseNetCore60=true"
123+
category="netcore/app/aspnet"
124+
defaultParameters="IncludeLaunchSettings=true" />
125+
<Template
126+
id="Microsoft.Web.WebApi.FSharp"
127+
templateId="Microsoft.Web.WebApi.FSharp.6.0"
128+
_overrideName="API"
129+
_overrideDescription="A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers."
130+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
131+
icon="md-netcore-empty-project"
132+
imageId="md-netcore-empty-project"
133+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
134+
supportedParameters="FSharpWebApi"
135+
condition="UseNetCore60=true"
136+
category="netcore/app/aspnet"
137+
defaultParameters="IncludeLaunchSettings=true" />
138+
<Template
139+
id="Microsoft.Worker.Empty.CSharp"
140+
templateId="Microsoft.Worker.Empty.CSharp.6.0"
141+
_overrideName="Worker Service"
142+
_overrideDescription="An empty project template for creating a worker service."
143+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
144+
icon="md-netcore-empty-project"
145+
imageId="md-netcore-empty-project"
146+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
147+
supportedParameters="AspNetCoreWorker"
148+
condition="UseNetCore60=true"
149+
category="netcore/app/general"
150+
defaultParameters="IncludeLaunchSettings=true" />
151+
<Template
152+
id="Microsoft.Web.RazorPages.CSharp"
153+
templateId="Microsoft.Web.RazorPages.CSharp.6.0"
154+
_overrideName="Web Application"
155+
_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content."
156+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
157+
icon="md-netcore-empty-project"
158+
imageId="md-netcore-empty-project"
159+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
160+
supportedParameters="RazorPages"
161+
condition="UseNetCore60=true"
162+
category="netcore/app/aspnet"
163+
formatExclude="*.min.css|*.min.js|*.map"
164+
defaultParameters="IncludeLaunchSettings=true" />
165+
<Template
166+
id="Microsoft.Web.Mvc.CSharp"
167+
templateId="Microsoft.Web.Mvc.CSharp.6.0"
168+
_overrideName="Web Application (Model-View-Controller)"
169+
_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services."
170+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
171+
icon="md-netcore-empty-project"
172+
imageId="md-netcore-empty-project"
173+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
174+
condition="UseNetCore60=true"
175+
category="netcore/app/aspnet"
176+
formatExclude="*.min.css|*.min.js|*.map"
177+
defaultParameters="IncludeLaunchSettings=true" />
178+
<Template
179+
id="Microsoft.Web.Mvc.FSharp"
180+
templateId="Microsoft.Web.Mvc.FSharp.6.0"
181+
_overrideName="Web Application (Model-View-Controller)"
182+
_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services."
183+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
184+
icon="md-netcore-empty-project"
185+
imageId="md-netcore-empty-project"
186+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
187+
condition="UseNetCore60=true"
188+
category="netcore/app/aspnet"
189+
formatExclude="*.min.css|*.min.js|*.map"
190+
defaultParameters="IncludeLaunchSettings=true" />
191+
<Template
192+
id="Microsoft.Web.Blazor.Server.CSharp"
193+
templateId="Microsoft.Web.Blazor.Server.CSharp.6.0"
194+
_overrideName="Blazor Server App"
195+
_overrideDescription="A project template for creating a Blazor server app that runs server-side inside an ASP.NET Core app and handles user interactions over a SignalR connection. This template can be used for web apps with rich dynamic user interfaces (UIs)."
196+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
197+
icon="md-netcore-empty-project"
198+
imageId="md-netcore-empty-project"
199+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
200+
supportedParameters="AspNetCoreBlazor"
201+
condition="UseNetCore60=true"
202+
category="netcore/app/aspnet"
203+
defaultParameters="IncludeLaunchSettings=true" />
204+
<Template
205+
id="Microsoft.Web.Razor.Library.CSharp"
206+
templateId="Microsoft.Web.Razor.Library.CSharp.6.0"
207+
_overrideName="Razor Class Library"
208+
_overrideDescription="A project for creating a Razor class library that targets .NET Standard."
209+
path="${DotNetCoreSdk.6.0.Templates.Web.ProjectTemplates.nupkg}"
210+
icon="md-netcore-empty-project"
211+
imageId="md-netcore-empty-project"
212+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
213+
condition="UseNetCore60=true"
214+
category="netcore/app/aspnet"
215+
formatExclude="*.min.css|*.min.js|*.map"
216+
defaultParameters="IncludeLaunchSettings=true" />
217+
<Template
218+
id="Microsoft.Web.Spa.Angular.CSharp"
219+
templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.6.0"
220+
_overrideName="Angular"
221+
_overrideDescription="A project template for creating an ASP.NET Core application with Angular."
222+
path="${DotNetCoreSdk.6.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
223+
icon="md-netcore-empty-project"
224+
imageId="md-netcore-empty-project"
225+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
226+
condition="UseNetCore60=true"
227+
category="netcore/app/aspnet"
228+
formatExclude="*.min.css|*.min.js|*.map"
229+
defaultParameters="IncludeLaunchSettings=true" />
230+
<Template
231+
id="Microsoft.Web.Spa.React.CSharp"
232+
templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.6.0"
233+
_overrideName="React.js"
234+
_overrideDescription="A project template for creating an ASP.NET Core application with React.js."
235+
path="${DotNetCoreSdk.6.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
236+
icon="md-netcore-empty-project"
237+
imageId="md-netcore-empty-project"
238+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
239+
condition="UseNetCore60=true"
240+
category="netcore/app/aspnet"
241+
formatExclude="*.min.css|*.min.js|*.map"
242+
defaultParameters="IncludeLaunchSettings=true" />
243+
<Template
244+
id="Microsoft.Web.Spa.ReactRedux.CSharp"
245+
templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.6.0"
246+
_overrideName="React.js and Redux"
247+
_overrideDescription="A project template for creating an ASP.NET Core application with React.js and Redux."
248+
path="${DotNetCoreSdk.6.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
249+
icon="md-netcore-empty-project"
250+
imageId="md-netcore-empty-project"
251+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
252+
condition="UseNetCore60=true"
253+
category="netcore/app/aspnet"
254+
formatExclude="*.min.css|*.min.js|*.map"
255+
defaultParameters="IncludeLaunchSettings=true" />
256+
</Condition>
257+
<!-- end of sdkVersion 6.0 templates -->
258+
259+
<!-- Include templates for SdkVersion 5.0 -->
260+
<Condition id="AspNetCoreSdkInstalled" sdkVersion="5.0">
261+
<Template
262+
id="Microsoft.Web.Empty.CSharp"
263+
templateId="Microsoft.Web.Empty.CSharp.5.0"
264+
_overrideName="Empty"
265+
_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
266+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
267+
icon="md-netcore-empty-project"
268+
imageId="md-netcore-empty-project"
269+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
270+
condition="UseNetCore50=true"
271+
category="netcore/app/aspnet"
272+
defaultParameters="IncludeLaunchSettings=true" />
273+
<Template
274+
id="Microsoft.Web.Empty.FSharp"
275+
templateId="Microsoft.Web.Empty.FSharp.5.0"
276+
_overrideName="Empty"
277+
_overrideDescription="An empty project template for creating an ASP.NET Core application. This template does not have any content in it."
278+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
279+
icon="md-netcore-empty-project"
280+
imageId="md-netcore-empty-project"
281+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
282+
condition="UseNetCore50=true"
283+
category="netcore/app/aspnet"
284+
defaultParameters="IncludeLaunchSettings=true" />
285+
<Template
286+
id="Microsoft.Web.WebApi.CSharp"
287+
templateId="Microsoft.Web.WebApi.CSharp.5.0"
288+
_overrideName="API"
289+
_overrideDescription="A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers."
290+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
291+
icon="md-netcore-empty-project"
292+
imageId="md-netcore-empty-project"
293+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
294+
condition="UseNetCore50=true"
295+
category="netcore/app/aspnet"
296+
defaultParameters="IncludeLaunchSettings=true" />
297+
<Template
298+
id="Microsoft.Web.WebApi.FSharp"
299+
templateId="Microsoft.Web.WebApi.FSharp.5.0"
300+
_overrideName="API"
301+
_overrideDescription="A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers."
302+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
303+
icon="md-netcore-empty-project"
304+
imageId="md-netcore-empty-project"
305+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
306+
supportedParameters="FSharpWebApi"
307+
condition="UseNetCore50=true"
308+
category="netcore/app/aspnet"
309+
defaultParameters="IncludeLaunchSettings=true" />
310+
<Template
311+
id="Microsoft.Worker.Empty.CSharp"
312+
templateId="Microsoft.Worker.Empty.CSharp.5.0"
313+
_overrideName="Worker Service"
314+
_overrideDescription="An empty project template for creating a worker service."
315+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
316+
icon="md-netcore-empty-project"
317+
imageId="md-netcore-empty-project"
318+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
319+
supportedParameters="AspNetCoreWorker"
320+
condition="UseNetCore50=true"
321+
category="netcore/app/general"
322+
defaultParameters="IncludeLaunchSettings=true" />
323+
<Template
324+
id="Microsoft.Web.RazorPages.CSharp"
325+
templateId="Microsoft.Web.RazorPages.CSharp.5.0"
326+
_overrideName="Web Application"
327+
_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content."
328+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
329+
icon="md-netcore-empty-project"
330+
imageId="md-netcore-empty-project"
331+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
332+
supportedParameters="RazorPages"
333+
condition="UseNetCore50=true"
334+
category="netcore/app/aspnet"
335+
formatExclude="*.min.css|*.min.js|*.map"
336+
defaultParameters="IncludeLaunchSettings=true" />
337+
<Template
338+
id="Microsoft.Web.Mvc.CSharp"
339+
templateId="Microsoft.Web.Mvc.CSharp.5.0"
340+
_overrideName="Web Application (Model-View-Controller)"
341+
_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services."
342+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
343+
icon="md-netcore-empty-project"
344+
imageId="md-netcore-empty-project"
345+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
346+
condition="UseNetCore50=true"
347+
category="netcore/app/aspnet"
348+
formatExclude="*.min.css|*.min.js|*.map"
349+
defaultParameters="IncludeLaunchSettings=true" />
350+
<Template
351+
id="Microsoft.Web.Mvc.FSharp"
352+
templateId="Microsoft.Web.Mvc.FSharp.5.0"
353+
_overrideName="Web Application (Model-View-Controller)"
354+
_overrideDescription="A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services."
355+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
356+
icon="md-netcore-empty-project"
357+
imageId="md-netcore-empty-project"
358+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
359+
condition="UseNetCore50=true"
360+
category="netcore/app/aspnet"
361+
formatExclude="*.min.css|*.min.js|*.map"
362+
defaultParameters="IncludeLaunchSettings=true" />
363+
<Template
364+
id="Microsoft.Web.Blazor.Server.CSharp"
365+
templateId="Microsoft.Web.Blazor.Server.CSharp.5.0"
366+
_overrideName="Blazor Server App"
367+
_overrideDescription="A project template for creating a Blazor server app that runs server-side inside an ASP.NET Core app and handles user interactions over a SignalR connection. This template can be used for web apps with rich dynamic user interfaces (UIs)."
368+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
369+
icon="md-netcore-empty-project"
370+
imageId="md-netcore-empty-project"
371+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
372+
supportedParameters="AspNetCoreBlazor"
373+
condition="UseNetCore50=true"
374+
category="netcore/app/aspnet"
375+
defaultParameters="IncludeLaunchSettings=true" />
376+
<Template
377+
id="Microsoft.Web.Razor.Library.CSharp"
378+
templateId="Microsoft.Web.Razor.Library.CSharp.5.0"
379+
_overrideName="Razor Class Library"
380+
_overrideDescription="A project for creating a Razor class library that targets .NET Standard."
381+
path="${DotNetCoreSdk.5.0.Templates.Web.ProjectTemplates.nupkg}"
382+
icon="md-netcore-empty-project"
383+
imageId="md-netcore-empty-project"
384+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
385+
condition="UseNetCore50=true"
386+
category="netcore/app/aspnet"
387+
formatExclude="*.min.css|*.min.js|*.map"
388+
defaultParameters="IncludeLaunchSettings=true" />
389+
<Template
390+
id="Microsoft.Web.Spa.Angular.CSharp"
391+
templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.5.0"
392+
_overrideName="Angular"
393+
_overrideDescription="A project template for creating an ASP.NET Core application with Angular."
394+
path="${DotNetCoreSdk.5.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
395+
icon="md-netcore-empty-project"
396+
imageId="md-netcore-empty-project"
397+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
398+
condition="UseNetCore50=true"
399+
category="netcore/app/aspnet"
400+
formatExclude="*.min.css|*.min.js|*.map"
401+
defaultParameters="IncludeLaunchSettings=true" />
402+
<Template
403+
id="Microsoft.Web.Spa.React.CSharp"
404+
templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.5.0"
405+
_overrideName="React.js"
406+
_overrideDescription="A project template for creating an ASP.NET Core application with React.js."
407+
path="${DotNetCoreSdk.5.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
408+
icon="md-netcore-empty-project"
409+
imageId="md-netcore-empty-project"
410+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
411+
condition="UseNetCore50=true"
412+
category="netcore/app/aspnet"
413+
formatExclude="*.min.css|*.min.js|*.map"
414+
defaultParameters="IncludeLaunchSettings=true" />
415+
<Template
416+
id="Microsoft.Web.Spa.ReactRedux.CSharp"
417+
templateId="Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.5.0"
418+
_overrideName="React.js and Redux"
419+
_overrideDescription="A project template for creating an ASP.NET Core application with React.js and Redux."
420+
path="${DotNetCoreSdk.5.0.Templates.Web.Spa.ProjectTemplates.nupkg}"
421+
icon="md-netcore-empty-project"
422+
imageId="md-netcore-empty-project"
423+
wizard="MonoDevelop.AspNetCore.ProjectTemplateWizard"
424+
condition="UseNetCore50=true"
425+
category="netcore/app/aspnet"
426+
formatExclude="*.min.css|*.min.js|*.map"
427+
defaultParameters="IncludeLaunchSettings=true" />
428+
</Condition>
429+
<!-- end of sdkVersion 5.0 templates -->
430+
86431
<Condition id="AspNetCoreSdkInstalled" sdkVersion="3.1">
87432
<Template
88433
id="Microsoft.Web.Empty.CSharp"
@@ -252,6 +597,8 @@
252597
formatExclude="*.min.css|*.min.js|*.map"
253598
defaultParameters="IncludeLaunchSettings=true" />
254599
</Condition>
600+
<!-- end of sdk.3.1 templates -->
601+
255602
<Condition id="AspNetCoreSdkInstalled" sdkVersion="3.0">
256603
<Template
257604
id="Microsoft.Web.Empty.CSharp"

‎main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateStringTagProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace MonoDevelop.DotNetCore.Templating
3838
[Extension]
3939
class DotNetCoreProjectTemplateStringTagProvider : IStringTagProvider
4040
{
41-
readonly string [] SupportedSDK = { "2.1", "2.2", "3.0", "3.1" };
41+
readonly string [] SupportedSDK = { "2.1", "2.2", "3.0", "3.1", "5.0", "6.0" };
4242

4343
public IEnumerable<StringTagDescription> GetTags (Type type)
4444
{

‎main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ namespace MonoDevelop.DotNetCore.Templating
3333
{
3434
class DotNetCoreProjectTemplateWizard : TemplateWizard
3535
{
36+
const string defaultParameterNetCore60 = "UseNetCore60";
3637
const string defaultParameterNetCore50 = "UseNetCore50";
3738
const string defaultParameterNetCore30 = "UseNetCore30";
3839
const string defaultParameterNetCore20 = "UseNetCore20";

0 commit comments

Comments
 (0)