From 8502dd1ebe0b964baea0451b4f1a046773751fbd Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Sun, 22 Jul 2018 12:23:58 -0700
Subject: [PATCH 1/2] Update dependencies.props

[auto-updated: dependencies]
---
 build/dependencies.props | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 7251e35811..0b67201c91 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -5,19 +5,19 @@
   <PropertyGroup Label="Package Versions">
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
     <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17099</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34694</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
+    <MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreTestingPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftCodeAnalysisCommonPackageVersion>2.8.0</MicrosoftCodeAnalysisCommonPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34694</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.2.0-preview1-34694</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34755</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.2.0-preview1-34755</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.2.0-preview1-34694</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
-    <MicrosoftExtensionsWebEncodersPackageVersion>2.2.0-preview1-34694</MicrosoftExtensionsWebEncodersPackageVersion>
+    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.2.0-preview1-34755</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+    <MicrosoftExtensionsWebEncodersPackageVersion>2.2.0-preview1-34755</MicrosoftExtensionsWebEncodersPackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
     <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreApp22PackageVersion>

From 684e7855a619fcfef77076cc5ee6c7a795e75714 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Sat, 21 Jul 2018 16:48:39 -0700
Subject: [PATCH 2/2] Handle `null` entries correctly for `IsEmptyOrWhiteSpace`
 - #2497

nits:
- take VS suggestions
- un-scramble `IsEmptyOrWhiteSpaceCore(...)` for readability
---
 .../TagHelpers/DefaultTagHelperContent.cs     | 43 ++++++-------------
 .../TagHelpers/DefaultTagHelperContentTest.cs |  3 +-
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs b/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs
index c4cdc3750f..f7185ba8a6 100644
--- a/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs
+++ b/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs
@@ -221,8 +221,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
                 return;
             }
 
-            var stringValue = entry as string;
-            if (stringValue != null)
+            if (entry is string stringValue)
             {
                 encoder.Encode(writer, stringValue);
             }
@@ -239,13 +238,11 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
                 return;
             }
 
-            string entryAsString;
-            IHtmlContentContainer entryAsContainer;
-            if ((entryAsString = entry as string) != null)
+            if (entry is string entryAsString)
             {
                 destination.Append(entryAsString);
             }
-            else if ((entryAsContainer = entry as IHtmlContentContainer) != null)
+            else if (entry is IHtmlContentContainer entryAsContainer)
             {
                 entryAsContainer.CopyTo(destination);
             }
@@ -262,13 +259,11 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
                 return;
             }
 
-            string entryAsString;
-            IHtmlContentContainer entryAsContainer;
-            if ((entryAsString = entry as string) != null)
+            if (entry is string entryAsString)
             {
                 destination.Append(entryAsString);
             }
-            else if ((entryAsContainer = entry as IHtmlContentContainer) != null)
+            else if (entry is IHtmlContentContainer entryAsContainer)
             {
                 entryAsContainer.MoveTo(destination);
             }
@@ -282,29 +277,19 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         {
             if (entry == null)
             {
-                return false;
+                return true;
             }
 
-            var stringValue = entry as string;
-            if (stringValue != null)
+            if (entry is string stringValue)
             {
                 // Do not encode the string because encoded value remains whitespace from user's POV.
-                if (!string.IsNullOrWhiteSpace(stringValue))
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                // Use NullHtmlEncoder to avoid treating encoded whitespace as non-whitespace e.g. "\t" as "&#x9;".
-                ((IHtmlContent)entry).WriteTo(writer, NullHtmlEncoder.Default);
-                if (!writer.IsEmptyOrWhiteSpace)
-                {
-                    return false;
-                }
+                return string.IsNullOrWhiteSpace(stringValue);
             }
 
-            return true;
+            // Use NullHtmlEncoder to avoid treating encoded whitespace as non-whitespace e.g. "\t" as "&#x9;".
+            ((IHtmlContent)entry).WriteTo(writer, NullHtmlEncoder.Default);
+
+            return writer.IsEmptyOrWhiteSpace;
         }
 
         private TagHelperContent AppendCore(object entry)
@@ -329,7 +314,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         {
             return GetContent();
         }
-        
+
         // Overrides Write(string) to find if the content written is empty/whitespace.
         private class EmptyOrWhiteSpaceWriter : TextWriter
         {
@@ -360,4 +345,4 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs
index c99e23b27c..4ed5d5eeca 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs
@@ -363,6 +363,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
             {
                 return new TheoryData<string>
                 {
+                    null,
                     string.Empty,
                     " ",
                     "\n",
@@ -838,4 +839,4 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
             }
         }
     }
-}
\ No newline at end of file
+}