Updating host version to 3.20.1 (#3444)

* Updating host version to 3.20.1 * Passed an object for the new parameter. * Removed the dependency on myget. * Pipeline build --------- Co-authored-by: [email protected] <[email protected]>
Azure · Sep 11, 2023 · 490d76f · 490d76f
1 parent 097a5ef
commit 490d76f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 49 deletions.
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/packages.config b/.nuget/packages.config
diff --git a/Azure.Functions.Cli.sln b/Azure.Functions.Cli.sln
@@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29519.87
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF86C17E-5C8A-4810-87BF-10548537A771}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5F51C958-39C0-4E0C-9165-71D0BCE647BC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EE1D011-2334-44F2-9D41-608B969DAE6D}"

diff --git a/NuGet.Config b/NuGet.Config
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-    <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="fuse_labs" value="https://www.myget.org/F/fusemandistfeed/api/v2" />
-    <add key="buildTools" value="https://www.myget.org/F/30de4ee06dd54956a82013fa17a3accb/" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="Microsoft.Azure.Functions.PowerShellWorker" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/Microsoft.Azure.Functions.PowerShellWorker/nuget/v3/index.json" />
+    <add key="AzureFunctions" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctions/nuget/v3/index.json" />
     <add key="AzureFunctionsRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsRelease/nuget/v3/index.json" />
     <add key="AzureFunctionsPreRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsPreRelease/nuget/v3/index.json" />
+    <add key="AzureFunctionsTempStaging" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build/BuildSteps.cs b/build/BuildSteps.cs
@@ -26,21 +26,8 @@ public static void Clean()
 
         public static void RestorePackages()
         {
-            var feeds = new[]
-            {
-                "https://www.nuget.org/api/v2/",
-                "https://www.myget.org/F/azure-appservice/api/v2",
-                "https://www.myget.org/F/azure-appservice-staging/api/v2",
-                "https://www.myget.org/F/fusemandistfeed/api/v2",
-                "https://www.myget.org/F/30de4ee06dd54956a82013fa17a3accb/",
-                "https://www.myget.org/F/xunit/api/v3/index.json",
-                "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/Microsoft.Azure.Functions.PowerShellWorker/nuget/v3/index.json",
-                "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsRelease/nuget/v3/index.json",
-                "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsPreRelease/nuget/v3/index.json"
-            }
-            .Aggregate(string.Empty, (a, b) => $"{a} --source {b}");
-
-            Shell.Run("dotnet", $"restore {Settings.ProjectFile} {feeds}");
+            // This will use the sources from the nuget.config file in the repo root
+            Shell.Run("dotnet", $"restore");
         }
 
         public static void UpdatePackageVersionForIntegrationTests()

diff --git a/src/Azure.Functions.Cli/Azure.Functions.Cli.csproj b/src/Azure.Functions.Cli/Azure.Functions.Cli.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" InitialTargets="ExcludeWorkersFromReadyToRun">
+<Project Sdk="Microsoft.NET.Sdk" InitialTargets="ExcludeWorkersFromReadyToRun">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -149,7 +149,7 @@
     <PackageReference Include="DotNetZip" Version="1.13.3" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
     <PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage.Internal" Version="1.4.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="3.17.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="3.20.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="YamlDotNet" Version="6.0.0" />
   </ItemGroup>

diff --git a/src/Azure.Functions.Cli/ExtensionBundle/ExtensionBundleHelper.cs b/src/Azure.Functions.Cli/ExtensionBundle/ExtensionBundleHelper.cs
@@ -1,5 +1,6 @@
 using Azure.Functions.Cli.Common;
 using Microsoft.Azure.WebJobs.Script;
+using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Configuration;
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
 using Microsoft.Azure.WebJobs.Script.ExtensionBundle;
@@ -32,7 +33,7 @@ public static ExtensionBundleManager GetExtensionBundleManager()
                 extensionBundleOption.DownloadPath = GetBundleDownloadPath(extensionBundleOption.Id);
                 extensionBundleOption.EnsureLatest = true;
             }
-            return new ExtensionBundleManager(extensionBundleOption, SystemEnvironment.Instance, NullLoggerFactory.Instance);
+            return new ExtensionBundleManager(extensionBundleOption, SystemEnvironment.Instance, NullLoggerFactory.Instance, new FunctionsHostingConfigOptions());
         }
 
         public static ExtensionBundleContentProvider GetExtensionBundleContentProvider()