updating core sdk to 3.0.38 (#9306)

* updating core sdk to 3.0.38 * Fixing the ambiguous call * adding new dependency to dependecy validator * Updating webjobs sdk version
Azure · Jun 2, 2023 · 3f6da05 · 3f6da05
1 parent 9840ced
commit 3f6da05
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="AzureFunctionsTempStaging" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
     <add key="azure_app_service" value="https://www.myget.org/F/azure-appservice/api/v2" />
     <add key="azure_app_service_staging" value="https://www.myget.org/F/azure-appservice-staging/api/v2" />
     <add key="azure-appservice-test" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/azure-appservice-test%40Local/nuget/v3/index.json" />

diff --git a/src/WebJobs.Script.WebHost/DependencyInjection/DependencyValidator/DependencyValidator.cs b/src/WebJobs.Script.WebHost/DependencyInjection/DependencyValidator/DependencyValidator.cs
@@ -56,7 +56,8 @@ private static ExpectedDependencyBuilder CreateExpectedDependencies()
                 .OptionalExternal("Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckPublisherHostedService", "Microsoft.Extensions.Diagnostics.HealthChecks", "adb9793829ddae60") // Popularly-registered by Health Check Monitor.
                 .OptionalExternal("OpenTelemetry.Extensions.Hosting.Implementation.TelemetryHostedService", "OpenTelemetry.Extensions.Hosting", "7bd6737fe5b67e3c") // Enable OpenTelemetry.Net instrumentation library
                 .OptionalExternal("Microsoft.Azure.WebJobs.Hosting.PrimaryHostCoordinator", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35")
-                .OptionalExternal("Microsoft.Azure.WebJobs.Host.Scale.ConcurrencyManagerService", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35");
+                .OptionalExternal("Microsoft.Azure.WebJobs.Host.Scale.ConcurrencyManagerService", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35")
+                .OptionalExternal("Microsoft.Azure.WebJobs.Host.Scale.ScaleMonitorService", "Microsoft.Azure.WebJobs.Host", "31bf3856ad364e35");
 
             expected.ExpectSubcollection<ILoggerProvider>()
                 .Expect<FunctionFileLoggerProvider>()

diff --git a/src/WebJobs.Script.WebHost/Scale/TableStorageScaleMetricsRepository.cs b/src/WebJobs.Script.WebHost/Scale/TableStorageScaleMetricsRepository.cs
@@ -17,6 +17,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using IScaleMetricsRepository = Microsoft.Azure.WebJobs.Script.Scale.IScaleMetricsRepository;
 
 namespace Microsoft.Azure.WebJobs.Script.WebHost
 {

diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -74,7 +74,7 @@
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
     <PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.34-11957" />
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.38-11179" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="4.1.0-11943" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="4.0.2" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />

diff --git a/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs b/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs
@@ -26,6 +26,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using IScaleMetricsRepository = Microsoft.Azure.WebJobs.Script.Scale.IScaleMetricsRepository;
 
 namespace Microsoft.Azure.WebJobs.Script.WebHost
 {

diff --git a/test/WebJobs.Script.Tests/Scale/FunctionsScaleManagerTests.cs b/test/WebJobs.Script.Tests/Scale/FunctionsScaleManagerTests.cs
@@ -11,6 +11,7 @@
 using Microsoft.WebJobs.Script.Tests;
 using Moq;
 using Xunit;
+using IScaleMetricsRepository = Microsoft.Azure.WebJobs.Script.Scale.IScaleMetricsRepository;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests.Scale
 {

diff --git a/test/WebJobs.Script.Tests/Scale/FunctionsScaleMonitorServiceTests.cs b/test/WebJobs.Script.Tests/Scale/FunctionsScaleMonitorServiceTests.cs
@@ -14,6 +14,7 @@
 using Microsoft.WebJobs.Script.Tests;
 using Moq;
 using Xunit;
+using IScaleMetricsRepository = Microsoft.Azure.WebJobs.Script.Scale.IScaleMetricsRepository;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests.Scale
 {