Merge pull request 7362 from hotfix/v4.4.5 into master

Web Integration/Examples/ExampleFrameworkWebsite/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net472" />
-  <package id="bootstrap" version="3.3.7" targetFramework="net472" />
+  <package id="bootstrap" version="3.4.1" targetFramework="net472" />
   <package id="jQuery" version="3.3.1" targetFramework="net472" />
   <package id="jQuery.Validation" version="1.17.0" targetFramework="net472" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net472" />

Web Integration/FiftyOne.Pipeline.Web.Framework/Providers/SetHeadersProvider.cs

@@ -19,7 +19,8 @@
  * in the end user terms of the application under an appropriate heading, 
  * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
-
+
+using FiftyOne.Pipeline.Core.Data;
 using FiftyOne.Pipeline.Engines.FiftyOne.FlowElements;
 using System;
 using System.Collections.Generic;
@@ -85,16 +86,17 @@ public SetHeadersProvider()
         /// Set the HTTP headers in the response based
         /// on values from the <see cref="SetHeadersElement"/>
         /// </summary>
+        /// <param name="flowData">
+        /// The flow data containing the information about the headers to set.
+        /// </param>
         /// <param name="context">
         /// The HTTP context
         /// </param>
-        public void SetHeaders(HttpContext context)
+        public void SetHeaders(IFlowData flowData, HttpContext context)
         {
+            if (flowData == null) throw new ArgumentNullException(nameof(flowData));
             if (context == null) throw new ArgumentNullException(nameof(context));
 
-            PipelineCapabilities caps = context.Request.Browser as PipelineCapabilities;
-            var flowData = caps.FlowData;
-
             if (_setHeadersElement != null)
             {
                 var headersToSet = flowData

Web Integration/FiftyOne.Pipeline.Web.Framework/WebPipeline.cs

@@ -290,7 +290,7 @@ public static IFlowData Process(HttpRequest request)
             if (GetInstance().SetHeaderPropertiesEnabled)
             {
                 // Set HTTP headers in the response.
-                SetHeadersProvider.GetInstance().SetHeaders(
+                SetHeadersProvider.GetInstance().SetHeaders(flowData,
                     request.RequestContext.HttpContext.ApplicationInstance.Context);
             }
 

Web Integration/FiftyOne.Pipeline.Web.nuspec

@@ -25,9 +25,9 @@
 				<dependency id="FiftyOne.Pipeline.Engines.FiftyOne" version="$version$" />
 				<dependency id="FiftyOne.Pipeline.Web.Shared" version="$version$" />
 				<dependency id="FiftyOne.Pipeline.JavaScriptBuilder" version="$version$" />
-				<dependency id="Microsoft.AspNetCore.Http" version="2.0.3" />
-				<dependency id="Microsoft.AspNetCore.Mvc" version="2.0.4" />
-				<dependency id="Microsoft.Extensions.FileProviders.Embedded" version="2.0.1" />
+				<dependency id="Microsoft.AspNetCore.Http" version="2.1.34" />
+				<dependency id="Microsoft.AspNetCore.Mvc" version="2.1.3" />
+				<dependency id="Microsoft.Extensions.FileProviders.Embedded" version="2.1.1" />
 			</group>
 			<group targetFramework="net461">
 				<dependency id="FiftyOne.Pipeline.Engines.FiftyOne" version="$version$" />

Web Integration/FiftyOne.Pipeline.Web/FiftyOne.Pipeline.Web.csproj

@@ -36,9 +36,9 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
 	<!-- If these package references are updated or modified then don't forget to also 
 	     update the dependencies in the nuspec file in the parent directory. -->
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.4" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.34" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <!-- If these package references are updated or modified then don't forget to also