Fixing launch.json, IConfiguration mock behaviour and ProxyFunctionDescriptorProviderTests

Author: liliankasem

.vscode/launch.json

@@ -10,7 +10,7 @@
       "request": "launch",
       "preLaunchTask": "build",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/src/WebJobs.Script.WebHost/bin/Debug/net6.0/Microsoft.Azure.WebJobs.Script.WebHost.dll",
+      "program": "${workspaceFolder}/out/bin/WebJobs.Script.WebHost/debug_net8/Microsoft.Azure.WebJobs.Script.WebHost.dll",
       "args": [],
       "cwd": "${workspaceFolder}/sample/Node",
       "stopAtEntry": false,
@@ -22,7 +22,7 @@
       "env": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "AZURE_FUNCTIONS_ENVIRONMENT": "Development",
-        "AzureWebJobsSecretStorageType": "Files"
+        "AzureWebJobsStorage": "UseDevelopmentStorage=true",
       },
       "sourceFileMap": {
         "/Views": "${workspaceFolder}/Views"
@@ -35,4 +35,4 @@
       "processId": "${command:pickProcess}"
     }
   ]
-}
+}

src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

@@ -73,7 +73,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
     <PackageReference Include="Microsoft.Azure.AppService.Middleware.Functions" Version="1.5.4" />
-    <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.2.20220831.41" />
+    <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.3.20240307.67" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
 

test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/CSharpPrecompiledTestProjects/DependencyA/Dependency55.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/WebJobs.Script.Tests/Description/Proxy/ProxyFunctionDescriptorProviderTests.cs

@@ -131,7 +131,7 @@ public async Task ValidateProxyFunctionDescriptor()
             var proxy = _proxyClient as ProxyClientExecutor;
             Assert.NotNull(proxy);
 
-            var proxyFunctionDescriptor = new ProxyFunctionDescriptorProvider(_scriptHost, _scriptHost.ScriptOptions, _host.Services.GetService<ICollection<IScriptBindingProvider>>(), NullLoggerFactory.Instance);
+            var proxyFunctionDescriptor = new ProxyFunctionDescriptorProvider(_scriptHost, _scriptHost.ScriptOptions, _host.Services.GetService<IEnumerable<IScriptBindingProvider>>().ToArray(), NullLoggerFactory.Instance);
 
             var (created, functionDescriptor) = await proxyFunctionDescriptor.TryCreate(_metadataCollection[0]);
 
@@ -145,7 +145,7 @@ public async Task ValidateProxyFunctionDescriptor()
         [Fact]
         public async Task ValidateProxyFunctionInvoker()
         {
-            var proxyFunctionDescriptor = new ProxyFunctionDescriptorProvider(_scriptHost, _scriptHost.ScriptOptions, _host.Services.GetService<ICollection<IScriptBindingProvider>>(), NullLoggerFactory.Instance);
+            var proxyFunctionDescriptor = new ProxyFunctionDescriptorProvider(_scriptHost, _scriptHost.ScriptOptions, _host.Services.GetService<IEnumerable<IScriptBindingProvider>>().ToArray(), NullLoggerFactory.Instance);
 
             var (created, functionDescriptor) = await proxyFunctionDescriptor.TryCreate(_metadataCollection[0]);
 

test/WebJobs.Script.Tests/Managment/WebFunctionsManagerTests.cs

@@ -72,6 +72,7 @@ public WebFunctionsManagerTests()
             secretManagerMock.Setup(p => p.GetFunctionSecretsAsync("httptrigger", false)).ReturnsAsync(functionSecrets);
 
             var configurationMock = new Mock<IConfiguration>(MockBehavior.Strict);
+            configurationMock.Setup(p => p[It.IsAny<string>()]).Returns(It.IsAny<string>());
             configurationMock.Setup(p => p.GetReloadToken()).Returns(new Mock<IChangeToken>().Object);
 
             var hostIdProviderMock = new Mock<IHostIdProvider>(MockBehavior.Strict);

test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs

@@ -204,6 +204,9 @@ public void GetWorkerProcessCount_Tests(bool defaultWorkerConfig, bool setProces
                 _testEnvironment.SetEnvironmentVariable(RpcWorkerConstants.FunctionsWorkerProcessCountSettingName, "7");
             }
 
+            var expectedMaxProcessCount = (setProcessCountToNumberOfCpuCores && Environment.ProcessorCount > maxProcessCount)
+                                        ? Environment.ProcessorCount : maxProcessCount;
+
             var config = new ConfigurationBuilder().Build();
             var testLogger = new TestLogger("test");
 
@@ -237,7 +240,7 @@ public void GetWorkerProcessCount_Tests(bool defaultWorkerConfig, bool setProces
             }
 
             Assert.Equal(TimeSpan.Parse(processStartupInterval), result.ProcessStartupInterval);
-            Assert.Equal(maxProcessCount, result.MaxProcessCount);
+            Assert.Equal(expectedMaxProcessCount, result.MaxProcessCount);
         }
 
         [Fact]