Merge pull request Azure#2593 from Azure/ExtensionRepo

Bring latest Extension repo to Host. Change needed for Proxies.
dadhi · Mar 27, 2018 · 928d2f6 · 928d2f6
2 parents d95294e + d89885a
commit 928d2f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -38,8 +38,8 @@
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0-beta5" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta5" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-beta5">
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta5-10609" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-beta5-10609">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="3.0.0-beta5" />

diff --git a/src/WebJobs.Script.WebHost/WebScriptHostManager.cs b/src/WebJobs.Script.WebHost/WebScriptHostManager.cs
@@ -263,17 +263,20 @@ private void InitializeHttpFunctions(IEnumerable<FunctionDescriptor> functions,
                 }
             }
 
-            // Proxy routes will take precedence over http trigger functions
-            // so they will be added first to the router.
+            IRouter proxyRouter = null;
+            IRouter functionRouter = null;
+
             if (proxiesRoutesBuilder.Count > 0)
             {
-                _router.AddFunctionRoute(proxiesRoutesBuilder.Build());
+                 proxyRouter = proxiesRoutesBuilder.Build();
             }
 
             if (routesBuilder.Count > 0)
             {
-                _router.AddFunctionRoute(routesBuilder.Build());
+                functionRouter = routesBuilder.Build();
             }
+
+            _router.AddFunctionRoutes(functionRouter, proxyRouter);
         }
 
         public override void Shutdown()

diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -26,8 +26,8 @@
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0-beta5" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta5" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-beta5">
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta5-10609" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-beta5-10609">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="3.0.0-beta5" />