Skip to content

Commit 3280117

Browse files
authored
Updating IsDotnetIsolatedApp to be more accurately captured (#9850)
* Updating IsDotnetIsolatedApp to be more accurately captured * incorporating pr feedback
1 parent 31d6f48 commit 3280117

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
8181
var bundleConfigured = _extensionBundleManager.IsExtensionBundleConfigured();
8282
bool isLegacyExtensionBundle = _extensionBundleManager.IsLegacyExtensionBundle();
8383
bool isPrecompiledFunctionApp = false;
84-
bool isDotnetIsolatedApp = false;
8584

8685
// dotnet app precompiled -> Do not use bundles
8786
var workerConfigs = _languageWorkerOptions.CurrentValue.WorkerConfigs;
87+
ImmutableArray<FunctionMetadata> functionMetadataCollection = ImmutableArray<FunctionMetadata>.Empty;
8888
if (bundleConfigured)
8989
{
9090
ExtensionBundleDetails bundleDetails = await _extensionBundleManager.GetExtensionBundleDetails();
9191
ValidateBundleRequirements(bundleDetails);
9292

93-
var functionMetadataCollection = _functionMetadataManager.GetFunctionMetadata(forceRefresh: true, includeCustomProviders: false, workerConfigs: workerConfigs);
93+
functionMetadataCollection = _functionMetadataManager.GetFunctionMetadata(forceRefresh: true, includeCustomProviders: false, workerConfigs: workerConfigs);
9494
bindingsSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
9595

9696
// Generate a Hashset of all the binding types used in the function app
@@ -102,10 +102,9 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
102102
}
103103
isPrecompiledFunctionApp = isPrecompiledFunctionApp || functionMetadata.Language == DotNetScriptTypes.DotNetAssembly;
104104
}
105-
106-
isDotnetIsolatedApp = IsDotnetIsolatedApp(functionMetadataCollection, SystemEnvironment.Instance);
107105
}
108106

107+
bool isDotnetIsolatedApp = IsDotnetIsolatedApp(functionMetadataCollection, SystemEnvironment.Instance);
109108
bool isDotnetApp = isPrecompiledFunctionApp || isDotnetIsolatedApp;
110109
var isLogicApp = SystemEnvironment.Instance.IsLogicApp();
111110

0 commit comments

Comments
 (0)