Add .NET 7 Support (#3088)

* Update templates for in-proc and isolated

* Added helper methods for .NET 7 project deployment

* Update isolated templates version

* Alter template package source and modify dotnet project deployment

* Add the target-framework parameter

* Corrected typo

* Updated .nupkg versions

Author: michaelpeng36

build/BuildSteps.cs

@@ -240,7 +240,7 @@ public static void AddDistLib()
         public static void AddTemplatesNupkgs()
         {
             var templatesPath = Path.Combine(Settings.OutputDir, "nupkg-templates");
-            var isolatedTemplatesPath = Path.Combine(templatesPath, "net6-isolated");
+            var isolatedTemplatesPath = Path.Combine(templatesPath, "net-isolated");
 
             Directory.CreateDirectory(templatesPath);
             Directory.CreateDirectory(isolatedTemplatesPath);

build/Settings.cs

@@ -19,10 +19,10 @@ private static string config(string @default = null, [CallerMemberName] string k
                 : value;
         }
 
-        public const string DotnetIsolatedItemTemplatesVersion = "4.0.2057";
-        public const string DotnetIsolatedProjectTemplatesVersion = "4.0.2057";
-        public const string DotnetItemTemplatesVersion = "4.0.2057";
-        public const string DotnetProjectTemplatesVersion = "4.0.2057";
+        public const string DotnetIsolatedItemTemplatesVersion = "4.0.2226";
+        public const string DotnetIsolatedProjectTemplatesVersion = "4.0.2226";
+        public const string DotnetItemTemplatesVersion = "4.0.2185";
+        public const string DotnetProjectTemplatesVersion = "4.0.2185";
         public const string TemplateJsonVersion = "3.1.1648";
 
         public static readonly string SBOMManifestToolPath = Path.GetFullPath("../ManifestTool/Microsoft.ManifestTool.dll");
@@ -108,7 +108,7 @@ private static string config(string @default = null, [CallerMemberName] string k
         public static readonly string PreSignTestDir = "PreSignTest";
 
         public static readonly string SignTestDir = "SignTest";
-
+       
         public static readonly string DotnetIsolatedItemTemplates = $"https://www.nuget.org/api/v2/package/Microsoft.Azure.Functions.Worker.ItemTemplates/{DotnetIsolatedItemTemplatesVersion}";
 
         public static readonly string DotnetIsolatedProjectTemplates = $"https://www.nuget.org/api/v2/package/Microsoft.Azure.Functions.Worker.ProjectTemplates/{DotnetIsolatedProjectTemplatesVersion}";

src/Azure.Functions.Cli/Actions/LocalActions/InitAction.cs

@@ -42,6 +42,8 @@ internal class InitAction : BaseAction
 
         public string Language { get; set; }
 
+        public string TargetFramework { get; set; }
+
         public bool? ManagedDependencies { get; set; }
 
         public WorkerRuntime ResolvedWorkerRuntime { get; set; }
@@ -107,6 +109,11 @@ public override ICommandLineParserResult ParseArgs(string[] args)
                 .WithDescription("Initialize a language specific project. Currently supported when --worker-runtime set to node. Options are - \"typescript\" and \"javascript\"")
                 .Callback(l => Language = l);
 
+            Parser
+                .Setup<string>("target-framework")
+                .WithDescription("Initialize a project with the given target framework moniker. Currently supported only when --worker-runtime set to dotnet-isolated. Options are - \"net48\", \"net6.0\", and \"net7.0\"")
+                .Callback(tf => TargetFramework = tf);
+
             Parser
                 .Setup<bool>("managed-dependencies")
                 .WithDescription("Installs managed dependencies. Currently, only the PowerShell worker runtime supports this functionality.")
@@ -170,10 +177,11 @@ private async Task InitFunctionAppProject()
             }
 
             TelemetryHelpers.AddCommandEventToDictionary(TelemetryCommandEvents, "WorkerRuntime", ResolvedWorkerRuntime.ToString());
-
+            
+            ValidateTargetFramework();
             if (WorkerRuntimeLanguageHelper.IsDotnet(ResolvedWorkerRuntime) && !Csx)
             {
-                await DotnetHelpers.DeployDotnetProject(Utilities.SanitizeLiteral(Path.GetFileName(Environment.CurrentDirectory), allowed: "-"), Force, ResolvedWorkerRuntime);
+                await DotnetHelpers.DeployDotnetProject(Utilities.SanitizeLiteral(Path.GetFileName(Environment.CurrentDirectory), allowed: "-"), Force, ResolvedWorkerRuntime, TargetFramework);
             }
             else
             {
@@ -298,6 +306,27 @@ private static async Task InitLanguageSpecificArtifacts(WorkerRuntime workerRunt
             }
         }
 
+        private void ValidateTargetFramework()
+        {
+            if (ResolvedWorkerRuntime == Helpers.WorkerRuntime.dotnetIsolated)
+            {
+                if (string.IsNullOrEmpty(TargetFramework))
+                {
+                    // Default to .NET 6 if the target framework is not specified
+                    // NOTE: we must have TargetFramework be non-empty for a dotnet-isolated project, even if it is not specified by the user, due to the structure of the new templates
+                    TargetFramework = Common.TargetFramework.net6;
+                }
+                if (!TargetFrameworkHelper.GetSupportedTargetFrameworks().Contains(TargetFramework, StringComparer.InvariantCultureIgnoreCase))
+                {
+                    throw new CliArgumentsException($"Unable to parse target framework {TargetFramework}. Valid options are \"net48\", \"net6.0\", and \"net7.0\"");
+                }
+            }
+            else if (!string.IsNullOrEmpty(TargetFramework))
+            {
+                throw new CliArgumentsException("The --target-framework option is supported only when --worker-runtime is set to dotnet-isolated");
+            }
+        }
+
         private static async Task WriteLocalSettingsJson(WorkerRuntime workerRuntime)
         {
             var localSettingsJsonContent = await StaticResources.LocalSettingsJson;

src/Azure.Functions.Cli/Common/TargetFramework.cs

@@ -0,0 +1,9 @@
+namespace Azure.Functions.Cli.Common
+{
+    public static class TargetFramework
+    {
+        public const string net48 = "net48";
+        public const string net6 = "net6.0";
+        public const string net7 = "net7.0";
+    }
+}

src/Azure.Functions.Cli/Helpers/DotnetHelpers.cs

@@ -25,14 +25,17 @@ public static void EnsureDotnet()
             }
         }
 
-        public async static Task DeployDotnetProject(string Name, bool force, WorkerRuntime workerRuntime)
+        public async static Task DeployDotnetProject(string Name, bool force, WorkerRuntime workerRuntime, string targetFramework = "")
         {
             await TemplateOperation(async () =>
             {
+                var frameworkString = string.IsNullOrEmpty(targetFramework)
+                    ? string.Empty
+                    : $"--Framework \"{targetFramework}\"";
                 var connectionString = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
                     ? $"--StorageConnectionStringValue \"{Constants.StorageEmulatorConnectionString}\""
                     : string.Empty;
-                var exe = new Executable("dotnet", $"new func --AzureFunctionsVersion v4 --name {Name} {connectionString} {(force ? "--force" : string.Empty)}");
+                var exe = new Executable("dotnet", $"new func {frameworkString} --AzureFunctionsVersion v4 --name {Name} {connectionString} {(force ? "--force" : string.Empty)}");
                 var exitCode = await exe.RunAsync(o => { }, e => ColoredConsole.Error.WriteLine(ErrorColor(e)));
                 if (exitCode != 0)
                 {
@@ -206,7 +209,7 @@ private static Task TemplateOperation(Func<Task> action, WorkerRuntime workerRun
             }
             else
             {
-                return WebJobsTemplateOpetation(action);
+                return WebJobsTemplateOperation(action);
             }
         }
 
@@ -224,7 +227,7 @@ private static async Task IsolatedTemplateOperation(Func<Task> action)
             }
         }
 
-        private static async Task WebJobsTemplateOpetation(Func<Task> action)
+        private static async Task WebJobsTemplateOperation(Func<Task> action)
         {
             try
             {
@@ -264,7 +267,7 @@ private static async Task UninstallWebJobsTemplates()
 
         private static Task InstallWebJobsTemplates() => DotnetTemplatesAction("install", "templates");
 
-        private static Task InstallIsolatedTemplates() => DotnetTemplatesAction("install", Path.Combine("templates", "net6-isolated"));
+        private static Task InstallIsolatedTemplates() => DotnetTemplatesAction("install", Path.Combine("templates", $"net-isolated"));
 
         private static async Task DotnetTemplatesAction(string action, string templateDirectory)
         {

src/Azure.Functions.Cli/Helpers/TargetFrameworkHelper.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Azure.Functions.Cli.Common;
+
+namespace Azure.Functions.Cli.Helpers
+{
+    public static class TargetFrameworkHelper
+    {
+        private static IEnumerable<string> supportedTargetFrameworks = new string[] { TargetFramework.net48, TargetFramework.net6, TargetFramework.net7 };
+
+        public static IEnumerable<string> GetSupportedTargetFrameworks()
+        {
+            return supportedTargetFrameworks;
+        }
+    }
+}