4.17.5 hotfix (#9258)

* Initial commit.

* installing .net core 3.1 in CI (#9231)

* 4.17.5 Hotfix

---------

Co-authored-by: Yogesh <[email protected]>
Co-authored-by: Brett Samblanet <[email protected]>
Co-authored-by: azfuncgh <[email protected]>

Author: 4 people

build/common.props

@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>17</MinorVersion>
-    <PatchVersion>4</PatchVersion>
+    <PatchVersion>5</PatchVersion>
     <BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
     <PreviewVersion></PreviewVersion>        
 

build/install-dotnet.yml

@@ -1,4 +1,11 @@
 steps:
+- task: PowerShell@2
+  displayName: 'Install .NET 3.1'
+  inputs:
+    targetType: 'inline'
+    script: |
+      Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
+      ./dotnet-install.ps1 -InstallDir 'C:\Program Files\dotnet' -Verbose -Channel 3.1
 - task: PowerShell@2
   displayName: 'Install .NET 6'
   inputs:
@@ -8,3 +15,4 @@ steps:
       # Official release versions can be found at: https://dotnet.microsoft.com/download/dotnet/6.0
       # Newer versions can be found at: https://github.com/dotnet/installer#installers-and-binaries
       ./dotnet-install.ps1 -InstallDir 'C:\Program Files\dotnet' -Verbose -Channel 6.0
+      & dotnet --info

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

@@ -83,7 +83,12 @@ public static AzureStorageInfoValue FromEnvironmentVariable(KeyValuePair<string,
             }
 
             var parts = environmentVariable.Value?.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
-            if (parts == null || parts.Length != 4)
+            if (parts == null)
+            {
+                return null;
+            }
+
+            if (parts.Length != 4 && parts.Length != 5)
             {
                 return null;
             }

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

@@ -10,18 +10,20 @@ namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.Management
     public class AzureStorageInfoValueTests
     {
         [Theory]
-        [InlineData(null, null, null, null, null, null, false)]
-        [InlineData("", null, "", "", "", "", false)]
-        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "", "", "", false)]
-        [InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "", "", "", "", false)]
-        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "sharename", "accesskey", "mountpath", false)]
-        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", true)]
-        [InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "", "accesskey", "mountpath", false)]
-        [InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "sharename", "accesskey", "mountpath", true)]
-        public void Builds_AzureStorageInfoValue(string id, AzureStorageType? type, string accountName, string shareName, string accessKey, string mountPath, bool isValid)
+        [InlineData(null, null, null, null, null, null, null, false)]
+        [InlineData("", null, "", "", "", "", "", false)]
+        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "", "", "", "", false)]
+        [InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "", "", "", "", "", false)]
+        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "", "sharename", "accesskey", "mountpath", "", false)]
+        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", "", true)]
+        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", "smb", true)]
+        [InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "", "accesskey", "mountpath", "", false)]
+        [InlineData("AZUREBLOBSTORAGE_storageid", AzureStorageType.AzureBlob, "accountname", "sharename", "accesskey", "mountpath", "", true)]
+        [InlineData("AZUREFILESSTORAGE_storageid", AzureStorageType.AzureFiles, "accountname", "sharename", "accesskey", "mountpath", "http", true)]
+        public void Builds_AzureStorageInfoValue(string id, AzureStorageType? type, string accountName, string shareName, string accessKey, string mountPath, string protocol, bool isValid)
         {
             var key = id;
-            var value = $"{accountName}|{shareName}|{accessKey}|{mountPath}";
+            var value = $"{accountName}|{shareName}|{accessKey}|{mountPath}|{protocol}";
             var environmentVariable = new KeyValuePair<string, string>(key, value);
             var azureStorageInfoValue = AzureStorageInfoValue.FromEnvironmentVariable(environmentVariable);
             if (isValid)