diff --git a/src/WebJobs.Script/Host/ScriptHost.cs b/src/WebJobs.Script/Host/ScriptHost.cs index 39ca8365a6..a7710b08e3 100644 --- a/src/WebJobs.Script/Host/ScriptHost.cs +++ b/src/WebJobs.Script/Host/ScriptHost.cs @@ -791,10 +791,10 @@ internal async Task> GetFunctionDescriptorsAsync( Collection functionDescriptors = new Collection(); if (!cancellationToken.IsCancellationRequested) { - bool throwOnWorkerRuntimeAndPayloadMetadataMismatch = !(_environment.IsLogicApp() && _environment.IsLogicAppCodefulModeEnabled()); + bool throwOnWorkerRuntimeAndPayloadMetadataMismatch = !_environment.IsLogicApp(); // this dotnet isolated specific logic is temporary to ensure in-proc payload compatibility with "dotnet-isolated" as the FUNCTIONS_WORKER_RUNTIME value. - if (string.Equals(workerRuntime, RpcWorkerConstants.DotNetIsolatedLanguageWorkerName, StringComparison.OrdinalIgnoreCase) && !_environment.IsPlaceholderModeEnabled()) + if (!_environment.IsLogicApp() && string.Equals(workerRuntime, RpcWorkerConstants.DotNetIsolatedLanguageWorkerName, StringComparison.OrdinalIgnoreCase) && !_environment.IsPlaceholderModeEnabled()) { bool payloadMatchesWorkerRuntime = ValidateAndLogRuntimeMismatch(functions, workerRuntime, _hostingConfigOptions, _logger); if (!payloadMatchesWorkerRuntime) diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/MultiLanguageEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/MultiLanguageEndToEndTests.cs index ee639a7d98..89a43dc926 100644 --- a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/MultiLanguageEndToEndTests.cs +++ b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/MultiLanguageEndToEndTests.cs @@ -123,14 +123,17 @@ public async Task CodelessFunction_CanUse_SingleJavaLanguageProviders() /// Runs tests with Node language provider function. /// [Theory] - [InlineData(true)] - [InlineData(false)] - public async Task CodelessFunction_CanUse_SingleJavascriptLanguageProviders(bool enableDynamicWorkerResolution) + [InlineData(true, "dotnet")] + [InlineData(false, "dotnet")] + [InlineData(true, "dotnet-isolated")] + [InlineData(false, "dotnet-isolated")] + public async Task CodelessFunction_CanUse_SingleJavascriptLanguageProviders(bool enableDynamicWorkerResolution, string functionWorkerRuntime) { var sourceFunctionApp = Path.Combine(Environment.CurrentDirectory, "TestScripts", "NoFunction"); var settings = new Dictionary() { [EnvironmentSettingNames.AppKind] = "workflowApp", + [EnvironmentSettingNames.FunctionWorkerRuntime] = functionWorkerRuntime, }; var testEnvironment = new TestEnvironment(settings);