Skip to content

Commit 1e76a24

Browse files
updating default TFM and help strings (#3570)
* updating default TFM and help strings * updating webhost version for transitive deps
1 parent bab208b commit 1e76a24

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public override ICommandLineParserResult ParseArgs(string[] args)
116116

117117
Parser
118118
.Setup<string>("target-framework")
119-
.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\", \"net7.0\", and \"net8.0\"")
119+
.WithDescription("Initialize a project with the given target framework moniker. Currently supported only when --worker-runtime set to dotnet-isolated. Options are - \"net8.0\", \"net7.0\", \"net6.0\", and \"net48\"")
120120
.Callback(tf => TargetFramework = tf);
121121

122122
Parser
@@ -331,13 +331,13 @@ private void ValidateTargetFramework()
331331
{
332332
if (string.IsNullOrEmpty(TargetFramework))
333333
{
334-
// Default to .NET 6 if the target framework is not specified
334+
// Default to .NET 8 if the target framework is not specified
335335
// 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
336-
TargetFramework = Common.TargetFramework.net6;
336+
TargetFramework = Common.TargetFramework.net8;
337337
}
338338
if (!TargetFrameworkHelper.GetSupportedTargetFrameworks().Contains(TargetFramework, StringComparer.InvariantCultureIgnoreCase))
339339
{
340-
throw new CliArgumentsException($"Unable to parse target framework {TargetFramework}. Valid options are \"net48\", \"net6.0\", and \"net7.0\"");
340+
throw new CliArgumentsException($"Unable to parse target framework {TargetFramework}. Valid options are \"net8.0\", \"net7.0\", \"net6.0\", and \"net48\"");
341341
}
342342
}
343343
else if (!string.IsNullOrEmpty(TargetFramework))

src/Azure.Functions.Cli/Azure.Functions.Cli.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="ExcludeWorkersFromReadyToRun">
1+
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="ExcludeWorkersFromReadyToRun">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<TargetFramework>net6.0</TargetFramework>
@@ -273,7 +273,7 @@
273273
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
274274
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
275275
<PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage.Internal" Version="1.4.0" />
276-
<PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="4.28.3" />
276+
<PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="4.28.5" />
277277
<PackageReference Include="Microsoft.Build" Version="17.0.0" />
278278
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
279279
<PackageReference Include="WindowsAzure.Storage" Version="9.3.1" />

test/Azure.Functions.Cli.Tests/E2E/InitTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public Task init_with_dotnetIsolated_dockerfile()
290290
new FileResult
291291
{
292292
Name = "Dockerfile",
293-
ContentContains = new[] { $"FROM mcr.microsoft.com/azure-functions/dotnet-isolated:4-dotnet-isolated6.0" }
293+
ContentContains = new[] { $"FROM mcr.microsoft.com/azure-functions/dotnet-isolated:4-dotnet-isolated8.0" }
294294
}
295295
},
296296
OutputContains = new[] { "Dockerfile" }

0 commit comments

Comments
 (0)