Skip to content

Commit 110b287

Browse files
[v3.x] Updating default extension bundle version to v3 (#8726)
* Updating default extension bundle version to v3 * Reverting unnecessary test changes Co-authored-by: Naren Soni <[email protected]>
1 parent ea4e6e0 commit 110b287

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/WebJobs.Script.WebHost/Resources/Functions/host.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"version": "2.0",
33
"extensionBundle": {
44
"id": "Microsoft.Azure.Functions.ExtensionBundle",
5-
"version": "[2.*, 3.0.0)"
5+
"version": "[3.*, 4.0.0)"
66
}
77
}

src/WebJobs.Script/ScriptConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public static class ScriptConstants
184184
public const string Windows32BitRID = "win-x86";
185185
public const string WorkFlowAppKind = "workflowapp";
186186
public const string LogicAppDefaultExtensionBundleVersion = "[1.*, 2.0.0)";
187-
public const string DefaultExtensionBundleVersion = "[2.*, 3.0.0)";
187+
public const string DefaultExtensionBundleVersion = "[3.*, 4.0.0)";
188188

189189
public const string AzureMonitorTraceCategory = "FunctionAppLogs";
190190

test/WebJobs.Script.Tests.Integration/Management/FunctionsSyncManagerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ private JObject GetHostConfig(JObject durableConfig, bool useBundles = false)
749749
{
750750
var extensionBundleConfig = new JObject();
751751
extensionBundleConfig["id"] = "Microsoft.Azure.Functions.ExtensionBundle";
752-
extensionBundleConfig["version"] = "[2.*, 3.0.0)";
752+
extensionBundleConfig["version"] = "[3.*, 4.0.0)";
753753
hostConfig["extensionBundle"] = extensionBundleConfig;
754754
}
755755

test/WebJobs.Script.Tests/Configuration/ExtensionBundleConfigHelperTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public ExtensionBundleConfigHelperTest()
5555
'version': '2.0',
5656
'extensionBundle': {
5757
'id': 'Microsoft.Azure.Functions.ExtensionBundle',
58-
'version': '[2.*, 3.0.0)'
58+
'version': '[3.*, 4.0.0)'
5959
}
6060
}")]
6161
public void MissingOrValidExtenstionConfig_DoesNotThrowException(string hostJsonContent)
@@ -76,7 +76,7 @@ public void ValidExtenstionConfig_ForAppServiceEnvironment_ConfiguresDownloadPat
7676
'version': '2.0',
7777
'extensionBundle': {
7878
'id': 'Microsoft.Azure.Functions.ExtensionBundle',
79-
'version': '[2.*, 3.0.0)'
79+
'version': '[3.*, 4.0.0)'
8080
}
8181
}";
8282
File.WriteAllText(_hostJsonFile, hostJsonContent);
@@ -101,7 +101,7 @@ public void ValidExtenstionConfig_ForAppServiceEnvironment_ConfiguresProbingPath
101101
'version': '2.0',
102102
'extensionBundle': {
103103
'id': 'Microsoft.Azure.Functions.ExtensionBundle',
104-
'version': '[2.*, 3.0.0)'
104+
'version': '[3.*, 4.0.0)'
105105
}
106106
}";
107107
File.WriteAllText(_hostJsonFile, hostJsonContent);
@@ -132,7 +132,7 @@ public void ValidExtenstionConfig_NonAppServiceEnvironment_DoesNotConfigureDownl
132132
'version': '2.0',
133133
'extensionBundle': {
134134
'id': 'Microsoft.Azure.Functions.ExtensionBundle',
135-
'version': '[2.*, 3.0.0)'
135+
'version': '[3.*, 4.0.0)'
136136
}
137137
}";
138138
File.WriteAllText(_hostJsonFile, hostJsonContent);
@@ -143,7 +143,7 @@ public void ValidExtenstionConfig_NonAppServiceEnvironment_DoesNotConfigureDownl
143143
setup.Configure(options);
144144

145145
Assert.Equal(options.Id, "Microsoft.Azure.Functions.ExtensionBundle");
146-
Assert.Equal(options.Version.OriginalString, "[2.*, 3.0.0)");
146+
Assert.Equal(options.Version.OriginalString, "[3.*, 4.0.0)");
147147
Assert.True(string.IsNullOrEmpty(options.DownloadPath));
148148
Assert.Equal(options.ProbingPaths.Count, 0);
149149
}

test/WebJobs.Script.Tests/Configuration/HostJsonFileConfigurationSourceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.WebJobs.Script.Tests.Configuration
1919
{
2020
public class HostJsonFileConfigurationSourceTests
2121
{
22-
private readonly string _hostJsonWithBundles = "{\r\n \"version\": \"2.0\",\r\n \"extensionBundle\": {\r\n \"id\": \"Microsoft.Azure.Functions.ExtensionBundle\",\r\n \"version\": \"[2.*, 3.0.0)\"\r\n }\r\n}";
22+
private readonly string _hostJsonWithBundles = "{\r\n \"version\": \"2.0\",\r\n \"extensionBundle\": {\r\n \"id\": \"Microsoft.Azure.Functions.ExtensionBundle\",\r\n \"version\": \"[3.*, 4.0.0)\"\r\n }\r\n}";
2323
private readonly string _hostJsonWithWorkFlowBundle = "{\r\n \"version\": \"2.0\",\r\n \"extensionBundle\": {\r\n \"id\": \"Microsoft.Azure.Functions.ExtensionBundle.Workflows\",\r\n \"version\": \"[1.*, 2.0.0)\"\r\n }\r\n}";
2424
private readonly string _defaultHostJson = "{\r\n \"version\": \"2.0\"\r\n}";
2525
private readonly ScriptApplicationHostOptions _options;

0 commit comments

Comments
 (0)