Backport UseProgramMain template option (#45)

Contributes to #40945
dotnet · Apr 6, 2022 · 08a4e74 · 08a4e74
1 parent 3d16ec4
commit 08a4e74
Show file tree

Hide file tree

Showing 8 changed files with 243 additions and 0 deletions.
diff --git a/src/content/Angular-CSharp/.template.config/dotnetcli.host.json b/src/content/Angular-CSharp/.template.config/dotnetcli.host.json
@@ -36,6 +36,10 @@
     "NoHttps": {
       "longName": "no-https",
       "shortName": ""
+    },
+    "UseProgramMain": {
+      "longName": "use-program-main",
+      "shortName": ""
     }
   },
   "usageExamples": [

diff --git a/src/content/Angular-CSharp/.template.config/template.json b/src/content/Angular-CSharp/.template.config/template.json
@@ -28,6 +28,21 @@
         "wwwroot/**"
       ],
       "modifiers": [
+        {
+          "condition": "(!UseProgramMain)",
+          "exclude": [
+            "Program.Main.cs"
+          ]
+        },
+        {
+          "condition": "(UseProgramMain)",
+          "exclude": [
+            "Program.cs"
+          ],
+          "rename": {
+            "Program.Main.cs": "Program.cs"
+          }
+        },
         {
           "condition": "(!IndividualLocalAuth)",
           "exclude": [
@@ -265,6 +280,13 @@
     "HostIdentifier": {
       "type": "bind",
       "binding": "HostIdentifier"
+    },
+    "UseProgramMain": {
+      "type": "parameter",
+      "datatype": "bool",
+      "defaultValue": "false",
+      "displayName": "Do not use top-level statements",
+      "description": "Whether to generate an explicit Program class and Main method instead of top-level statements."
     }
   },
   "tags": {

diff --git a/src/content/Angular-CSharp/.template.config/vs-2017.3.host.json b/src/content/Angular-CSharp/.template.config/vs-2017.3.host.json
@@ -38,6 +38,12 @@
       "useHttps": true
     }
   ],
+  "symbolInfo": [
+    {
+      "id": "UseProgramMain",
+      "isVisible": true
+    }
+  ],
   "excludeLaunchSettings": false,
   "minFullFrameworkVersion": "4.6.1",
   "disableHttpsSymbol": "NoHttps"

diff --git a/src/content/Angular-CSharp/Program.Main.cs b/src/content/Angular-CSharp/Program.Main.cs
@@ -0,0 +1,89 @@
+#if (IndividualLocalAuth)
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.UI;
+using Microsoft.EntityFrameworkCore;
+using Company.WebApplication1.Data;
+using Company.WebApplication1.Models;
+
+#endif
+namespace Company.WebApplication1;
+
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add services to the container.
+        #if (IndividualLocalAuth)
+        var connectionString = builder.Configuration.GetConnectionString("DefaultConnection") ?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found.");
+        builder.Services.AddDbContext<ApplicationDbContext>(options =>
+        #if (UseLocalDB)
+            options.UseSqlServer(connectionString));
+        #else
+            options.UseSqlite(connectionString));
+        #endif
+        builder.Services.AddDatabaseDeveloperPageExceptionFilter();
+
+        builder.Services.AddDefaultIdentity<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)
+            .AddEntityFrameworkStores<ApplicationDbContext>();
+
+        builder.Services.AddIdentityServer()
+            .AddApiAuthorization<ApplicationUser, ApplicationDbContext>();
+
+        builder.Services.AddAuthentication()
+            .AddIdentityServerJwt();
+        #endif
+
+        builder.Services.AddControllersWithViews();
+        #if (IndividualLocalAuth)
+        builder.Services.AddRazorPages();
+        #endif
+
+        var app = builder.Build();
+
+        // Configure the HTTP request pipeline.
+        #if (IndividualLocalAuth)
+        if (app.Environment.IsDevelopment())
+        {
+            app.UseMigrationsEndPoint();
+        }
+        else
+        #else
+        if (!app.Environment.IsDevelopment())
+        #endif
+        {
+        #if (RequiresHttps)
+            // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+            app.UseHsts();
+        }
+
+        app.UseHttpsRedirection();
+        #else
+        }
+
+        #endif
+        app.UseStaticFiles();
+        app.UseRouting();
+
+        #if (IndividualLocalAuth)
+        app.UseAuthentication();
+        app.UseIdentityServer();
+        #endif
+        #if (!NoAuth)
+        app.UseAuthorization();
+        #endif
+
+        app.MapControllerRoute(
+            name: "default",
+            pattern: "{controller}/{action=Index}/{id?}");
+        #if (IndividualLocalAuth)
+        app.MapRazorPages();
+        #endif
+
+        app.MapFallbackToFile("index.html");
+
+        app.Run();
+    }
+}
diff --git a/src/content/React-CSharp/.template.config/dotnetcli.host.json b/src/content/React-CSharp/.template.config/dotnetcli.host.json
@@ -36,6 +36,10 @@
     "NoHttps": {
       "longName": "no-https",
       "shortName": ""
+    },
+    "UseProgramMain": {
+      "longName": "use-program-main",
+      "shortName": ""
     }
   },
   "usageExamples": [

diff --git a/src/content/React-CSharp/.template.config/template.json b/src/content/React-CSharp/.template.config/template.json
@@ -28,6 +28,21 @@
         "wwwroot/**"
       ],
       "modifiers": [
+        {
+          "condition": "(!UseProgramMain)",
+          "exclude": [
+            "Program.Main.cs"
+          ]
+        },
+        {
+          "condition": "(UseProgramMain)",
+          "exclude": [
+            "Program.cs"
+          ],
+          "rename": {
+            "Program.Main.cs": "Program.cs"
+          }
+        },
         {
           "condition": "(!IndividualLocalAuth)",
           "exclude": [
@@ -267,6 +282,13 @@
     "HostIdentifier": {
       "type": "bind",
       "binding": "HostIdentifier"
+    },
+    "UseProgramMain": {
+      "type": "parameter",
+      "datatype": "bool",
+      "defaultValue": "false",
+      "displayName": "Do not use top-level statements",
+      "description": "Whether to generate an explicit Program class and Main method instead of top-level statements."
     }
   },
   "tags": {

diff --git a/src/content/React-CSharp/.template.config/vs-2017.3.host.json b/src/content/React-CSharp/.template.config/vs-2017.3.host.json
@@ -38,6 +38,12 @@
       "useHttps": true
     }
   ],
+  "symbolInfo": [
+    {
+      "id": "UseProgramMain",
+      "isVisible": true
+    }
+  ],
   "excludeLaunchSettings": false,
   "minFullFrameworkVersion": "4.6.1",
   "disableHttpsSymbol": "NoHttps"

diff --git a/src/content/React-CSharp/Program.Main.cs b/src/content/React-CSharp/Program.Main.cs
@@ -0,0 +1,90 @@
+#if (IndividualLocalAuth)
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.UI;
+using Microsoft.EntityFrameworkCore;
+using Company.WebApplication1.Data;
+using Company.WebApplication1.Models;
+
+#endif
+
+namespace Company.WebApplication1;
+
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add services to the container.
+        #if (IndividualLocalAuth)
+        var connectionString = builder.Configuration.GetConnectionString("DefaultConnection") ?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found.");
+        builder.Services.AddDbContext<ApplicationDbContext>(options =>
+        #if (UseLocalDB)
+            options.UseSqlServer(connectionString));
+        #else
+            options.UseSqlite(connectionString));
+        #endif
+        builder.Services.AddDatabaseDeveloperPageExceptionFilter();
+
+        builder.Services.AddDefaultIdentity<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)
+            .AddEntityFrameworkStores<ApplicationDbContext>();
+
+        builder.Services.AddIdentityServer()
+            .AddApiAuthorization<ApplicationUser, ApplicationDbContext>();
+
+        builder.Services.AddAuthentication()
+            .AddIdentityServerJwt();
+        #endif
+
+        builder.Services.AddControllersWithViews();
+        #if (IndividualLocalAuth)
+        builder.Services.AddRazorPages();
+        #endif
+
+        var app = builder.Build();
+
+        // Configure the HTTP request pipeline.
+        #if (IndividualLocalAuth)
+        if (app.Environment.IsDevelopment())
+        {
+            app.UseMigrationsEndPoint();
+        }
+        else
+        #else
+        if (!app.Environment.IsDevelopment())
+        #endif
+        {
+        #if (RequiresHttps)
+            // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+            app.UseHsts();
+        }
+
+        app.UseHttpsRedirection();
+        #else
+        }
+
+        #endif
+        app.UseStaticFiles();
+        app.UseRouting();
+
+        #if (IndividualLocalAuth)
+        app.UseAuthentication();
+        app.UseIdentityServer();
+        #endif
+        #if (!NoAuth)
+        app.UseAuthorization();
+        #endif
+
+        app.MapControllerRoute(
+            name: "default",
+            pattern: "{controller}/{action=Index}/{id?}");
+        #if (IndividualLocalAuth)
+        app.MapRazorPages();
+        #endif
+
+        app.MapFallbackToFile("index.html");
+
+        app.Run();
+    }
+}