Skip to content

Commit 15cfcf1

Browse files
authored
v4.15.2 hotfix (#9080)
* Reverting "Removing MultiLanguage feature flag (#8727)" * bumping the patch version
1 parent 7570b6d commit 15cfcf1

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<LangVersion>latest</LangVersion>
66
<MajorVersion>4</MajorVersion>
77
<MinorVersion>15</MinorVersion>
8-
<PatchVersion>1</PatchVersion>
8+
<PatchVersion>2</PatchVersion>
99
<BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
1010
<PreviewVersion></PreviewVersion>
1111

src/WebJobs.Script/Environment/EnvironmentExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ public static bool IsMultiLanguageRuntimeEnvironment(this IEnvironment environme
366366
{
367367
if (!isMultiLanguageEnabled.HasValue)
368368
{
369-
isMultiLanguageEnabled = environment.IsLogicApp();
369+
isMultiLanguageEnabled = environment.IsLogicApp() && FeatureFlags.IsEnabled(ScriptConstants.FeatureFlagEnableMultiLanguageWorker, environment);
370370
}
371371
return isMultiLanguageEnabled.Value;
372372
}

src/WebJobs.Script/ScriptConstants.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public static class ScriptConstants
122122
public const string FeatureFlagDisableMergedWebHostScriptHostConfiguration = "DisableMergedConfiguration";
123123
public const string FeatureFlagEnableWorkerIndexing = "EnableWorkerIndexing";
124124
public const string FeatureFlagEnableDebugTracing = "EnableDebugTracing";
125+
public const string FeatureFlagEnableMultiLanguageWorker = "EnableMultiLanguageWorker";
125126
public const string FeatureFlagEnableProxies = "EnableProxies";
126127
public const string FeatureFlagEnableLinuxEPExecutionCount = "EnableLinuxFEC";
127128

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/MultiLanguageEndToEndTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public async Task CodelessFunction_CanUse_MultipleLanguageProviders()
3939
var settings = new Dictionary<string, string>()
4040
{
4141
[EnvironmentSettingNames.AppKind] = "workflowApp",
42+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
4243
};
4344
var testEnvironment = new TestEnvironment(settings);
4445

@@ -85,6 +86,7 @@ public async Task CodelessFunction_CanUse_SingleJavaLanguageProviders()
8586
var settings = new Dictionary<string, string>()
8687
{
8788
[EnvironmentSettingNames.AppKind] = "workflowApp",
89+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
8890
};
8991
var testEnvironment = new TestEnvironment(settings);
9092

@@ -124,6 +126,7 @@ public async Task CodelessFunction_CanUse_SingleJavascriptLanguageProviders()
124126
var settings = new Dictionary<string, string>()
125127
{
126128
[EnvironmentSettingNames.AppKind] = "workflowApp",
129+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
127130
};
128131
var testEnvironment = new TestEnvironment(settings);
129132

@@ -163,6 +166,7 @@ public async Task CodelessFunction_CanUse_NoLanguageProviders()
163166
var settings = new Dictionary<string, string>()
164167
{
165168
[EnvironmentSettingNames.AppKind] = "workflowApp",
169+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
166170
};
167171
var testEnvironment = new TestEnvironment(settings);
168172

0 commit comments

Comments
 (0)