Merge branch 'live' into master

Author: Rick-Anderson

aspnetcore/mvc/views/working-with-forms.md

@@ -636,7 +636,7 @@ The *Views/Shared/EditorTemplates/CountryViewModel.cshtml* template:
 
 Adding HTML [\<option>](https://www.w3.org/wiki/HTML/Elements/option) elements isn't limited to the *No selection* case. For example, the following view and action method will generate HTML similar to the code above:
 
-[!code-csharp[](working-with-forms/sample/final/Controllers/HomeController.cs?range=114-119)]
+[!code-csharp[](working-with-forms/sample/final/Controllers/HomeController.cs?name=snippetNone)]
 
 [!code-HTML[](working-with-forms/sample/final/Views/Home/IndexOption.cshtml)]
 

aspnetcore/mvc/views/working-with-forms/sample/final/Controllers/HomeController.cs

@@ -1,4 +1,4 @@
-using FormsTagHelper.ViewModels;
+using FormsTagHelper.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FormsTagHelper.Controllers
@@ -18,8 +18,8 @@ public IActionResult Index(CountryViewModel model)
         {
             if (ModelState.IsValid)
             {
-                var msg = model.Country +  " selected";
-                return RedirectToAction("IndexSuccess", new { message = msg});
+                var msg = model.Country + " selected";
+                return RedirectToAction("IndexSuccess", new { message = msg });
             }
 
             // If we got this far, something failed; redisplay form.
@@ -38,7 +38,7 @@ public IActionResult IndexMultiSelect(CountryViewModelIEnumerable model)
         {
             if (ModelState.IsValid)
             {
-                string strCountriesSelected="";
+                string strCountriesSelected = "";
                 foreach (string s in model.CountryCodes)
                 {
                     strCountriesSelected = strCountriesSelected + " " + s;
@@ -63,7 +63,7 @@ public IActionResult IndexGroup(CountryViewModelGroup model)
             if (ModelState.IsValid)
             {
                 var msg = model.Country + " selected";
-                return RedirectToAction("IndexSuccess", new { message = msg});
+                return RedirectToAction("IndexSuccess", new { message = msg });
             }
 
             return View(model);
@@ -83,7 +83,7 @@ public IActionResult IndexEnum(CountryEnumViewModel model)
             if (ModelState.IsValid)
             {
                 var msg = model.EnumCountry + " selected";
-                return RedirectToAction("IndexSuccess", new { message = msg});
+                return RedirectToAction("IndexSuccess", new { message = msg });
             }
 
             return View(model);
@@ -128,5 +128,13 @@ public IActionResult IndexSuccess(string message)
             ViewData["Message"] = message;
             return View();
         }
+        #region snippetNone
+        public IActionResult IndexNone()
+        {
+            var model = new CountryViewModel();
+            model.Insert(0, new SelectListItem("<none>", ""));
+            return View(model);
+        }
+        # endregion
     }
 }

aspnetcore/security/samesite.md

@@ -5,7 +5,8 @@ description: Learn how to use to SameSite cookies in ASP.NET Core
 ms.author: riande
 ms.custom: mvc
 ms.date: 12/03/2019
-no-loc: [Blazor, "Identity", "Let's Encrypt", Razor, SignalR]
+no-loc: [Blazor, "Identity", "Let's Encrypt", Razor, SignalR, Electron]
+
 uid: security/samesite
 ---
 # Work with SameSite cookies in ASP.NET Core