From 901266d8fdcdd579ac37d3aa5e8d82f3ac101bd5 Mon Sep 17 00:00:00 2001
From: Fabio Cavalcante <fabio.cavalcante@microsoft.com>
Date: Wed, 4 Dec 2019 10:53:59 -0800
Subject: [PATCH] Updating ASP.NET Core references

---
 src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj | 2 +-
 src/WebJobs.Script/Binding/Http/RawScriptResult.cs       | 1 -
 .../MessageExtensions/RpcMessageExtensionUtilities.cs    | 4 ++--
 .../Binding/ActionResults/RawScriptResultTests.cs        | 9 +++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
index 4cd9326f2e..b19be9c680 100644
--- a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
+++ b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -53,7 +53,7 @@
 
   <ItemGroup>
     <PackageReference Include="DotNetTI.BreakingChangeAnalysis" Version="1.0.5-preview" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.7" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
     <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.8100001-0126c21e" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.15" />
diff --git a/src/WebJobs.Script/Binding/Http/RawScriptResult.cs b/src/WebJobs.Script/Binding/Http/RawScriptResult.cs
index 762341bb22..ed1de46fbb 100644
--- a/src/WebJobs.Script/Binding/Http/RawScriptResult.cs
+++ b/src/WebJobs.Script/Binding/Http/RawScriptResult.cs
@@ -80,7 +80,6 @@ public async Task ExecuteResultAsync(ActionContext context)
             {
                 foreach (var cookie in Cookies)
                 {
-                    // Item3 (CookieOptions) should not be null, but this will behave correctly if it is
                     if (cookie.Item3 != null)
                     {
                         response.Cookies.Append(cookie.Item1, cookie.Item2, cookie.Item3);
diff --git a/src/WebJobs.Script/Workers/Rpc/MessageExtensions/RpcMessageExtensionUtilities.cs b/src/WebJobs.Script/Workers/Rpc/MessageExtensions/RpcMessageExtensionUtilities.cs
index 0594c6a75e..490f431d6a 100644
--- a/src/WebJobs.Script/Workers/Rpc/MessageExtensions/RpcMessageExtensionUtilities.cs
+++ b/src/WebJobs.Script/Workers/Rpc/MessageExtensions/RpcMessageExtensionUtilities.cs
@@ -86,9 +86,9 @@ private static SameSiteMode RpcSameSiteEnumConverter(RpcHttpCookie.Types.SameSit
                 case RpcHttpCookie.Types.SameSite.Lax:
                     return SameSiteMode.Lax;
                 case RpcHttpCookie.Types.SameSite.None:
-                    return SameSiteMode.None;
+                    return (SameSiteMode)(-1);
                 default:
-                    return SameSiteMode.None;
+                    return (SameSiteMode)(-1);
             }
         }
     }
diff --git a/test/WebJobs.Script.Tests/Binding/ActionResults/RawScriptResultTests.cs b/test/WebJobs.Script.Tests/Binding/ActionResults/RawScriptResultTests.cs
index 1a79dee5bd..8c4498d681 100644
--- a/test/WebJobs.Script.Tests/Binding/ActionResults/RawScriptResultTests.cs
+++ b/test/WebJobs.Script.Tests/Binding/ActionResults/RawScriptResultTests.cs
@@ -62,13 +62,14 @@ public async Task AddsHttpCookies()
                 {
                     new Tuple<string, string, CookieOptions>("firstCookie", "cookieValue", new CookieOptions()
                     {
-                        SameSite = SameSiteMode.None
+                        SameSite = SameSiteMode.Lax
                     }),
                     new Tuple<string, string, CookieOptions>("secondCookie", "cookieValue2", new CookieOptions()
                     {
                         Path = "/",
                         HttpOnly = true,
-                        MaxAge = TimeSpan.FromSeconds(20)
+                        MaxAge = TimeSpan.FromSeconds(20),
+                        SameSite = (SameSiteMode)(-1)
                     })
                 }
             };
@@ -79,8 +80,8 @@ public async Task AddsHttpCookies()
             context.HttpContext.Response.Headers.TryGetValue("Set-Cookie", out StringValues cookies);
 
             Assert.Equal(2, cookies.Count);
-            Assert.Equal("firstCookie=cookieValue; path=/", cookies[0]);
-            Assert.Equal("secondCookie=cookieValue2; max-age=20; path=/; samesite=lax; httponly", cookies[1]);
+            Assert.Equal("firstCookie=cookieValue; path=/; samesite=lax", cookies[0]);
+            Assert.Equal("secondCookie=cookieValue2; max-age=20; path=/; httponly", cookies[1]);
         }
 
         [Fact]