diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index c5bae2fdbeef..e751f7e95982 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -1721,6 +1721,314 @@
       ]
     }
   },
+  "blazorwasm": {
+    "None": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm",
+      "Files": [
+        "App.razor",
+        "_Imports.razor",
+        "Program.cs",
+        "Pages/Counter.razor",
+        "Pages/FetchData.razor",
+        "Pages/Index.razor",
+        "Properties/launchSettings.json",
+        "Shared/MainLayout.razor",
+        "Shared/MainLayout.razor.css",
+        "Shared/NavMenu.razor",
+        "Shared/NavMenu.razor.css",
+        "Shared/SurveyPrompt.razor",
+        "wwwroot/favicon.png",
+        "wwwroot/icon-192.png",
+        "wwwroot/index.html",
+        "wwwroot/css/app.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "wwwroot/css/open-iconic/FONT-LICENSE",
+        "wwwroot/css/open-iconic/ICON-LICENSE",
+        "wwwroot/css/open-iconic/README.md",
+        "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "wwwroot/sample-data/weather.json"
+      ]
+    },
+    "Individual": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm -au Individual",
+      "Files": [
+        "App.razor",
+        "_Imports.razor",
+        "Program.cs",
+        "Pages/Authentication.razor",
+        "Pages/Counter.razor",
+        "Pages/FetchData.razor",
+        "Pages/Index.razor",
+        "Properties/launchSettings.json",
+        "Shared/LoginDisplay.razor",
+        "Shared/MainLayout.razor",
+        "Shared/MainLayout.razor.css",
+        "Shared/NavMenu.razor",
+        "Shared/NavMenu.razor.css",
+        "Shared/RedirectToLogin.razor",
+        "Shared/SurveyPrompt.razor",
+        "wwwroot/appsettings.Development.json",
+        "wwwroot/appsettings.json",
+        "wwwroot/favicon.png",
+        "wwwroot/icon-192.png",
+        "wwwroot/index.html",
+        "wwwroot/css/app.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "wwwroot/css/open-iconic/FONT-LICENSE",
+        "wwwroot/css/open-iconic/ICON-LICENSE",
+        "wwwroot/css/open-iconic/README.md",
+        "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "wwwroot/sample-data/weather.json"
+      ]
+    },
+    "IndividualB2C": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm -au IndividualB2C",
+      "Files": [
+        "App.razor",
+        "_Imports.razor",
+        "Program.cs",
+        "Pages/Authentication.razor",
+        "Pages/Counter.razor",
+        "Pages/FetchData.razor",
+        "Pages/Index.razor",
+        "Properties/launchSettings.json",
+        "Shared/LoginDisplay.razor",
+        "Shared/MainLayout.razor",
+        "Shared/MainLayout.razor.css",
+        "Shared/NavMenu.razor",
+        "Shared/NavMenu.razor.css",
+        "Shared/RedirectToLogin.razor",
+        "Shared/SurveyPrompt.razor",
+        "wwwroot/appsettings.json",
+        "wwwroot/favicon.png",
+        "wwwroot/icon-192.png",
+        "wwwroot/index.html",
+        "wwwroot/css/app.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "wwwroot/css/open-iconic/FONT-LICENSE",
+        "wwwroot/css/open-iconic/ICON-LICENSE",
+        "wwwroot/css/open-iconic/README.md",
+        "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "wwwroot/sample-data/weather.json"
+      ]
+    },
+    "SingleOrg": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm -au SingleOrg",
+      "Files": [
+        "App.razor",
+        "_Imports.razor",
+        "Program.cs",
+        "Pages/Authentication.razor",
+        "Pages/Counter.razor",
+        "Pages/FetchData.razor",
+        "Pages/Index.razor",
+        "Properties/launchSettings.json",
+        "Shared/LoginDisplay.razor",
+        "Shared/MainLayout.razor",
+        "Shared/MainLayout.razor.css",
+        "Shared/NavMenu.razor",
+        "Shared/NavMenu.razor.css",
+        "Shared/RedirectToLogin.razor",
+        "Shared/SurveyPrompt.razor",
+        "wwwroot/appsettings.json",
+        "wwwroot/favicon.png",
+        "wwwroot/icon-192.png",
+        "wwwroot/index.html",
+        "wwwroot/css/app.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "wwwroot/css/open-iconic/FONT-LICENSE",
+        "wwwroot/css/open-iconic/ICON-LICENSE",
+        "wwwroot/css/open-iconic/README.md",
+        "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "wwwroot/sample-data/weather.json"
+      ]
+    },
+    "Hosted": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm --hosted",
+      "Files": [
+        "Client/_Imports.razor",
+        "Client/App.razor",
+        "Client/Program.cs",
+        "Client/Pages/Counter.razor",
+        "Client/Pages/FetchData.razor",
+        "Client/Pages/Index.razor",
+        "Client/Properties/launchSettings.json",
+        "Client/Shared/MainLayout.razor",
+        "Client/Shared/MainLayout.razor.css",
+        "Client/Shared/NavMenu.razor",
+        "Client/Shared/NavMenu.razor.css",
+        "Client/Shared/SurveyPrompt.razor",
+        "Client/wwwroot/css/app.css",
+        "Client/wwwroot/favicon.png",
+        "Client/wwwroot/icon-192.png",
+        "Client/wwwroot/index.html",
+        "Client/wwwroot/css/bootstrap/bootstrap.min.css",
+        "Client/wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "Client/wwwroot/css/open-iconic/FONT-LICENSE",
+        "Client/wwwroot/css/open-iconic/ICON-LICENSE",
+        "Client/wwwroot/css/open-iconic/README.md",
+        "Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "Server/Controllers/WeatherForecastController.cs",
+        "Server/Pages/Error.cshtml",
+        "Server/Pages/Error.cshtml.cs",
+        "Server/Properties/launchSettings.json",
+        "Server/appsettings.Development.json",
+        "Server/appsettings.json",
+        "Server/Program.cs",
+        "Shared/WeatherForecast.cs"
+      ]
+    },
+    "PWA": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm --pwa",
+      "Files": [
+        "App.razor",
+        "_Imports.razor",
+        "Program.cs",
+        "Pages/Counter.razor",
+        "Pages/FetchData.razor",
+        "Pages/Index.razor",
+        "Properties/launchSettings.json",
+        "Shared/MainLayout.razor",
+        "Shared/MainLayout.razor.css",
+        "Shared/NavMenu.razor",
+        "Shared/NavMenu.razor.css",
+        "Shared/SurveyPrompt.razor",
+        "wwwroot/favicon.png",
+        "wwwroot/icon-192.png",
+        "wwwroot/icon-512.png",
+        "wwwroot/index.html",
+        "wwwroot/manifest.json",
+        "wwwroot/service-worker.js",
+        "wwwroot/service-worker.published.js",
+        "wwwroot/css/app.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "wwwroot/css/open-iconic/FONT-LICENSE",
+        "wwwroot/css/open-iconic/ICON-LICENSE",
+        "wwwroot/css/open-iconic/README.md",
+        "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "wwwroot/sample-data/weather.json"
+      ]
+    },
+    "PWAHosted": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm --pwa --hosted",
+      "Files": [
+        "Client/_Imports.razor",
+        "Client/App.razor",
+        "Client/Program.cs",
+        "Client/Pages/Counter.razor",
+        "Client/Pages/FetchData.razor",
+        "Client/Pages/Index.razor",
+        "Client/Properties/launchSettings.json",
+        "Client/Shared/MainLayout.razor",
+        "Client/Shared/MainLayout.razor.css",
+        "Client/Shared/NavMenu.razor",
+        "Client/Shared/NavMenu.razor.css",
+        "Client/Shared/SurveyPrompt.razor",
+        "Client/wwwroot/css/app.css",
+        "Client/wwwroot/favicon.png",
+        "Client/wwwroot/icon-192.png",
+        "Client/wwwroot/icon-512.png",
+        "Client/wwwroot/index.html",
+        "Client/wwwroot/manifest.json",
+        "Client/wwwroot/service-worker.js",
+        "Client/wwwroot/service-worker.published.js",
+        "Client/wwwroot/css/bootstrap/bootstrap.min.css",
+        "Client/wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "Client/wwwroot/css/open-iconic/FONT-LICENSE",
+        "Client/wwwroot/css/open-iconic/ICON-LICENSE",
+        "Client/wwwroot/css/open-iconic/README.md",
+        "Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "Server/Controllers/WeatherForecastController.cs",
+        "Server/Pages/Error.cshtml",
+        "Server/Pages/Error.cshtml.cs",
+        "Server/Properties/launchSettings.json",
+        "Server/appsettings.Development.json",
+        "Server/appsettings.json",
+        "Server/Program.cs",
+        "Shared/WeatherForecast.cs"
+      ]
+    },
+    "ExcludeLaunchSettings": {
+      "Template": "blazorwasm",
+      "Arguments": "new blazorwasm --exclude-launch-settings",
+      "Files": [
+        "App.razor",
+        "_Imports.razor",
+        "Program.cs",
+        "Pages/Counter.razor",
+        "Pages/FetchData.razor",
+        "Pages/Index.razor",
+        "Shared/MainLayout.razor",
+        "Shared/MainLayout.razor.css",
+        "Shared/NavMenu.razor",
+        "Shared/NavMenu.razor.css",
+        "Shared/SurveyPrompt.razor",
+        "wwwroot/favicon.png",
+        "wwwroot/icon-192.png",
+        "wwwroot/index.html",
+        "wwwroot/css/app.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css",
+        "wwwroot/css/bootstrap/bootstrap.min.css.map",
+        "wwwroot/css/open-iconic/FONT-LICENSE",
+        "wwwroot/css/open-iconic/ICON-LICENSE",
+        "wwwroot/css/open-iconic/README.md",
+        "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.eot",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.otf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.svg",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf",
+        "wwwroot/css/open-iconic/font/fonts/open-iconic.woff",
+        "wwwroot/sample-data/weather.json"
+      ]
+    }
+  },
   "blazorwasm-empty": {
     "None": {
       "Template": "blazorwasm-empty",
@@ -1808,37 +2116,37 @@
         "Server/appsettings.json",
         "Server/Program.cs",
         "Shared/SharedClass.cs"
-      ],
-      "ExcludeLaunchSettings": {
-        "Template": "blazorwasm-empty",
-        "Arguments": "new blazorwasm-empty --exclude-launch-settings",
-        "Files": [
-          "Pages/Index.razor",
-          "wwwroot/css/app.css",
-          "wwwroot/index.html",
-          "_Imports.razor",
-          "App.razor",
-          "MainLayout.razor",
-          "Program.cs"
-        ]
-      },
-      "ExcludeLaunchSettingsHosted": {
-        "Template": "blazorwasm-empty",
-        "Arguments": "new blazorwasm-empty --hosted --exclude-launch-settings",
-        "Files": [
-          "Client/_Imports.razor",
-          "Client/App.razor",
-          "Client/MainLayout.razor",
-          "Client/Program.cs",
-          "Client/Pages/Index.razor",
-          "Client/wwwroot/index.html",
-          "Client/wwwroot/css/app.css",
-          "Server/appsettings.Development.json",
-          "Server/appsettings.json",
-          "Server/Program.cs",
-          "Shared/SharedClass.cs"
-        ]
-      }
+      ]
+    },
+    "ExcludeLaunchSettings": {
+      "Template": "blazorwasm-empty",
+      "Arguments": "new blazorwasm-empty --exclude-launch-settings",
+      "Files": [
+        "Pages/Index.razor",
+        "wwwroot/css/app.css",
+        "wwwroot/index.html",
+        "_Imports.razor",
+        "App.razor",
+        "MainLayout.razor",
+        "Program.cs"
+      ]
+    },
+    "ExcludeLaunchSettingsHosted": {
+      "Template": "blazorwasm-empty",
+      "Arguments": "new blazorwasm-empty --hosted --exclude-launch-settings",
+      "Files": [
+        "Client/_Imports.razor",
+        "Client/App.razor",
+        "Client/MainLayout.razor",
+        "Client/Program.cs",
+        "Client/Pages/Index.razor",
+        "Client/wwwroot/index.html",
+        "Client/wwwroot/css/app.css",
+        "Server/appsettings.Development.json",
+        "Server/appsettings.json",
+        "Server/Program.cs",
+        "Shared/SharedClass.cs"
+      ]
     }
   }
 }