Skip to content

Commit 79be673

Browse files
VpOfEngineeringyojagadgavin-aguiar
authored
4.19.2 hotfix (#9263)
* Initial commit. * Merging changes from #9261 and #9256 --------- Co-authored-by: Yogesh <[email protected]> Co-authored-by: gavin-aguiar <[email protected]>
1 parent 883bc60 commit 79be673

File tree

6 files changed

+28
-21
lines changed

6 files changed

+28
-21
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>19</MinorVersion>
8-
<PatchVersion>1</PatchVersion>
8+
<PatchVersion>2</PatchVersion>
99
<BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
1010
<PreviewVersion></PreviewVersion>
1111

‎build/python.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="4.13.0" />
3+
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="4.14.0" />
44
</ItemGroup>
55
</Project>

‎release_notes.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<!-- Please add your release notes in the following format:
44
- My change description (#PR)
55
-->
6-
- Update Python Worker Version to [4.13.0](https://github.com/Azure/azure-functions-python-worker/releases/tag/4.13.0)
7-
- Update Java Worker Version to [2.10.0](https://github.com/Azure/azure-functions-java-worker/releases/tag/2.10.0)
8-
- Update PowerShell Worker 7.2 to 4.0.2719 [Release Note](https://github.com/Azure/azure-functions-powershell-worker/releases/tag/v4.0.2719)
9-
- Update Node.js Worker Version to [3.6.0](https://github.com/Azure/azure-functions-nodejs-worker/releases/tag/v3.6.0)
10-
- Upgrade PowerShell language worker 7.0 to 4.0.2733 [Release Note](https://github.com/Azure/azure-functions-powershell-worker/releases/tag/v4.0.2733)
6+
- Update Python Worker Version to [4.14.0](https://github.com/Azure/azure-functions-python-worker/releases/tag/4.14.0)
7+
- Update Java Worker Version to [2.11.0](https://github.com/Azure/azure-functions-java-worker/releases/tag/2.11.0)
118

12-
**Release sprint:** Sprint 140
13-
[ [bugs](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+140%22+label%3Abug+is%3Aclosed) | [features](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+140%22+label%3Afeature+is%3Aclosed) ]
9+
**Release sprint:** Sprint 142
10+
[ [bugs](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+143%22+label%3Abug+is%3Aclosed) | [features](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+143%22+label%3Afeature+is%3Aclosed) ]
11+
- Update PowerShell Worker 7.2 to 4.0.2803 [Release Note](https://github.com/Azure/azure-functions-powershell-worker/releases/tag/v4.0.2803)
12+
- Update PowerShell Worker 7.4 to 4.0.2802 [Release Note](https://github.com/Azure/azure-functions-powershell-worker/releases/tag/v4.0.2802)
13+
- Fixing bug with placeholder misses in dotnet-isolated #9253

‎src/WebJobs.Script.WebHost/Models/AzureStorageInfoValue.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,12 @@ public static AzureStorageInfoValue FromEnvironmentVariable(KeyValuePair<string,
8383
}
8484

8585
var parts = environmentVariable.Value?.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
86-
if (parts == null || parts.Length != 4)
86+
if (parts == null)
87+
{
88+
return null;
89+
}
90+
91+
if (parts.Length != 4 && parts.Length != 5)
8792
{
8893
return null;
8994
}

‎test/WebJobs.Script.Tests.Integration/Management/AzureStorageInfoValueTests.cs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@ namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.Management
1010
public class AzureStorageInfoValueTests
1111
{
1212
[Theory]
13-
[InlineData(null, null, null, null, null, null, false)]
14-
[InlineData("", null, "", "", "", "", false)]
15-
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "", "", "", false)]
16-
[InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "", "", "", "", false)]
17-
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "sharename", "accesskey", "mountpath", false)]
18-
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", true)]
19-
[InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "", "accesskey", "mountpath", false)]
20-
[InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "sharename", "accesskey", "mountpath", true)]
21-
public void Builds_AzureStorageInfoValue(string id, AzureStorageType? type, string accountName, string shareName, string accessKey, string mountPath, bool isValid)
13+
[InlineData(null, null, null, null, null, null, null, false)]
14+
[InlineData("", null, "", "", "", "", "", false)]
15+
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "", "", "", "", false)]
16+
[InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "", "", "", "", "", false)]
17+
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "sharename", "accesskey", "mountpath", "", false)]
18+
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", "", true)]
19+
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", "smb", true)]
20+
[InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "", "accesskey", "mountpath", "", false)]
21+
[InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "sharename", "accesskey", "mountpath", "", true)]
22+
[InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", "http", true)]
23+
public void Builds_AzureStorageInfoValue(string id, AzureStorageType? type, string accountName, string shareName, string accessKey, string mountPath, string protocol, bool isValid)
2224
{
2325
var key = id;
24-
var value = $"{accountName}|{shareName}|{accessKey}|{mountPath}";
26+
var value = $"{accountName}|{shareName}|{accessKey}|{mountPath}|{protocol}";
2527
var environmentVariable = new KeyValuePair<string, string>(key, value);
2628
var azureStorageInfoValue = AzureStorageInfoValue.FromEnvironmentVariable(environmentVariable);
2729
if (isValid)

‎test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<PackageReference Include="appinsights.testlogger" Version="1.0.0" />
5757
<PackageReference Include="FluentAssertions" Version="5.9.0" />
5858
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
59-
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="4.13.0" />
59+
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="4.14.0" />
6060
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
6161
<PackageReference Include="Moq" Version="4.9.0" />
6262
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">

0 commit comments

Comments
 (0)