Merge pull request #17710 from dotnet/master

Merge to live again on 9 March

Author: Rick-Anderson

aspnetcore/blazor/layouts/sample_snapshot/3.x/App1.razor

@@ -1,4 +1,4 @@
-<Router AppAssembly="typeof(Startup).Assembly">
+<Router AppAssembly="@typeof(Startup).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>

aspnetcore/blazor/layouts/sample_snapshot/3.x/App2.razor

@@ -1,4 +1,4 @@
-<Router AppAssembly="typeof(Startup).Assembly">
+<Router AppAssembly="@typeof(Startup).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>

aspnetcore/fundamentals/configuration/index.md

@@ -305,7 +305,7 @@ Configuration keys:
 * Hierarchical keys
   * Within the Configuration API, a colon separator (`:`) works on all platforms.
   * In environment variables, a colon separator may not work on all platforms. A double underscore, `__`, is supported by all platforms and is automatically converted into a colon `:`.
-  * In Azure Key Vault, hierarchical keys use `--` as a separator. Write code to replace the `--` with a `:` when the secrets are loaded into the app's configuration.
+  * In Azure Key Vault, hierarchical keys use `--` as a separator. The [Azure Key Vault configuration provider](xref:security/key-vault-configuration) automatically replaces `--` with a `:` when the secrets are loaded into the app's configuration.
 * The <xref:Microsoft.Extensions.Configuration.ConfigurationBinder> supports binding arrays to objects using array indices in configuration keys. Array binding is described in the [Bind an array to a class](#boa) section.
 
 Configuration values:

aspnetcore/security/cors.md

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "3.1.2",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

aspnetcore/security/cors/3.1sample/Cors/WebAPI/.config/dotnet-tools.json

@@ -0,0 +1,46 @@
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
+
+namespace WebAPI.Controllers
+{
+    #region snippet2
+    [Route("api/[controller]")]
+    [ApiController]
+    public class TodoItems1Controller : ControllerBase
+    {
+        // PUT: api/TodoItems1/5
+        [HttpPut("{id}")]
+        public IActionResult PutTodoItem(int id)
+        {
+            if (id < 1)
+            {
+                return Content($"ID = {id}");
+            }
+
+            return ControllerContext.MyDisplayRouteInfo(id);
+        }
+
+        // Delete: api/TodoItems1/5
+        [HttpDelete("{id}")]
+        public IActionResult MyDelete(int id) =>
+            ControllerContext.MyDisplayRouteInfo(id);
+
+        // GET: api/TodoItems1
+        [HttpGet]
+        public IActionResult GetTodoItems() =>
+            ControllerContext.MyDisplayRouteInfo();
+
+        [EnableCors]
+        [HttpGet("{action}")]
+        public IActionResult GetTodoItems2() =>
+            ControllerContext.MyDisplayRouteInfo();
+
+        // Delete: api/TodoItems1/MyDelete2/5
+        [EnableCors]
+        [HttpDelete("{action}/{id}")]
+        public IActionResult MyDelete2(int id) =>
+            ControllerContext.MyDisplayRouteInfo(id);
+    }
+    #endregion
+}

aspnetcore/security/cors/3.1sample/Cors/WebAPI/Controllers/TodoItems1Controller.cs

@@ -0,0 +1,61 @@
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
+
+// Used in both the MD file and the RP Test.cshtml
+
+namespace WebAPI.Controllers
+{
+    #region snippet2
+    #region snippet
+    [Route("api/[controller]")]
+    [ApiController]
+    public class TodoItems2Controller : ControllerBase
+    {
+        // OPTIONS: api/TodoItems2/5
+        [HttpOptions("{id}")]
+        public IActionResult PreflightRoute(int id)
+        {
+            return NoContent();
+        }
+
+        // OPTIONS: api/TodoItems2 
+        [HttpOptions]
+        public IActionResult PreflightRoute()
+        {
+            return NoContent();
+        }
+
+        [HttpPut("{id}")]
+        public IActionResult PutTodoItem(int id)
+        {
+            if (id < 1)
+            {
+                return BadRequest();
+            }
+
+            return ControllerContext.MyDisplayRouteInfo(id);
+        }
+        #endregion
+
+        // [EnableCors] // Not needed as OPTIONS path provided
+        [HttpDelete("{id}")]
+        public IActionResult MyDelete(int id) =>
+            ControllerContext.MyDisplayRouteInfo(id);
+
+        [EnableCors]  // Rquired for this path
+        [HttpGet]
+        public IActionResult GetTodoItems() =>
+            ControllerContext.MyDisplayRouteInfo();
+
+        [HttpGet("{action}")]
+        public IActionResult GetTodoItems2() =>
+            ControllerContext.MyDisplayRouteInfo();
+
+        [EnableCors]  // Rquired for this path
+        [HttpDelete("{action}/{id}")]
+        public IActionResult MyDelete2(int id) =>
+            ControllerContext.MyDisplayRouteInfo(id);
+    }
+    #endregion
+}

aspnetcore/security/cors/3.1sample/Cors/WebAPI/Controllers/TodoItems2Controller.cs

@@ -0,0 +1,38 @@
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebAPI.Controllers
+{
+    #region snippet
+    [Route("api/[controller]")]
+    [ApiController]
+    public class TodoItemsController : ControllerBase
+    {
+        // PUT: api/TodoItems/5
+        [HttpPut("{id}")]
+        public ContentResult PutTodoItem(int id)
+        {
+            if (id < 1)
+            {
+                return Content($"ID = {id}");
+            }
+
+            return Content($"PutTodoItem: ID = {id}");
+        }
+
+        // Delete: api/TodoItems/5
+        [HttpDelete("{id}")]
+        public ContentResult MyDelete(int id)
+        {
+            return Content($"MyDelete: ID = {id}");
+        }
+        #endregion
+
+        // GET: api/TodoItems
+        [HttpGet]
+        public ContentResult GetTodoItems()
+        {
+            return Content("Get TO DO ");
+        }
+    }
+}

aspnetcore/security/cors/3.1sample/Cors/WebAPI/Controllers/TodoItemsController.cs

@@ -0,0 +1,37 @@
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
+
+namespace WebAPI.Controllers
+{
+    #region snippet
+    [EnableCors("MyPolicy")]
+    [Route("api/[controller]")]
+    [ApiController]
+    public class ValuesController : ControllerBase
+    {
+        // GET api/values
+        [HttpGet]
+        public IActionResult Get() =>
+            ControllerContext.MyDisplayRouteInfo();
+
+        // GET api/values/5
+        [HttpGet("{id}")]
+        public IActionResult Get(int id) =>
+            ControllerContext.MyDisplayRouteInfo(id);
+
+        // PUT api/values/5
+        [HttpPut("{id}")]
+        public IActionResult Put(int id) =>
+            ControllerContext.MyDisplayRouteInfo(id);
+
+
+        // GET: api/values/GetValues2
+        [DisableCors]
+        [HttpGet("{action}")]
+        public IActionResult GetValues2() =>
+            ControllerContext.MyDisplayRouteInfo();
+
+    }
+    #endregion
+}

aspnetcore/security/cors/3.1sample/Cors/WebAPI/Controllers/ValuesController.cs

@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+
+namespace WebAPI.Controllers
+{
+    #region snippet
+    [Route("api/[controller]")]
+    [ApiController]
+    public class WidgetController : ControllerBase
+    {
+        // GET api/values
+        [EnableCors("AnotherPolicy")]
+        [HttpGet]
+        public ActionResult<IEnumerable<string>> Get()
+        {
+            return new string[] { "green widget", "red widget" };
+        }
+
+        #region snippet2
+        // GET api/values/5
+        [EnableCors("Policy1")]
+        [HttpGet("{id}")]
+        public ActionResult<string> Get(int id)
+        {
+            return id switch
+            {
+                1 => "green widget",
+                2 => "red widget",
+                _ => NotFound(),
+            };
+        }
+        #endregion
+    }
+    #endregion
+}