allowing extensions.json in the root path (Azure#6889)

JasonWeiand-MSFT · Nov 12, 2020 · 3c3e349 · 3c3e349
1 parent 325de5b
commit 3c3e349
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs b/src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs
@@ -64,7 +64,7 @@ public Type[] GetStartupTypes()
 
         public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
         {
-            string binPath;
+            string extensionsPath;
             FunctionAssemblyLoadContext.ResetSharedContext();
             var functionMetadataCollection = _functionMetadataManager.GetFunctionMetadata(forceRefresh: true, includeCustomProviders: false);
             HashSet<string> bindingsSet = null;
@@ -89,21 +89,29 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
             bool isLegacyExtensionBundle = _extensionBundleManager.IsLegacyExtensionBundle();
             if (bundleConfigured && (!isPrecompiledFunctionApp || _extensionBundleManager.IsLegacyExtensionBundle()))
             {
-                binPath = await _extensionBundleManager.GetExtensionBundleBinPathAsync();
-                if (string.IsNullOrEmpty(binPath))
+                extensionsPath = await _extensionBundleManager.GetExtensionBundleBinPathAsync();
+                if (string.IsNullOrEmpty(extensionsPath))
                 {
                     _logger.ScriptStartUpErrorLoadingExtensionBundle();
                     return new Type[0];
                 }
-                _logger.ScriptStartUpLoadingExtensionBundle(binPath);
+                _logger.ScriptStartUpLoadingExtensionBundle(extensionsPath);
             }
             else
             {
-                binPath = Path.Combine(_rootScriptPath, "bin");
-                _logger.ScriptStartNotLoadingExtensionBundle(binPath, bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle);
+                extensionsPath = Path.Combine(_rootScriptPath, "bin");
+
+                if (!File.Exists(Path.Combine(extensionsPath, ScriptConstants.ExtensionsMetadataFileName)) &&
+                    File.Exists(Path.Combine(_rootScriptPath, ScriptConstants.ExtensionsMetadataFileName)))
+                {
+                    // As a fallback, allow extensions.json in the root path.
+                    extensionsPath = _rootScriptPath;
+                }
+
+                _logger.ScriptStartNotLoadingExtensionBundle(extensionsPath, bundleConfigured, isPrecompiledFunctionApp, isLegacyExtensionBundle);
             }
 
-            string metadataFilePath = Path.Combine(binPath, ScriptConstants.ExtensionsMetadataFileName);
+            string metadataFilePath = Path.Combine(extensionsPath, ScriptConstants.ExtensionsMetadataFileName);
 
             // parse the extensions file to get declared startup extensions
             ExtensionReference[] extensionItems = ParseExtensions(metadataFilePath);
@@ -138,7 +146,7 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
                             var hintUri = new Uri(path, UriKind.RelativeOrAbsolute);
                             if (!hintUri.IsAbsoluteUri)
                             {
-                                path = Path.Combine(binPath, path);
+                                path = Path.Combine(extensionsPath, path);
                             }
 
                             if (File.Exists(path))