diff --git a/resources/backupTemplates/dotnet/~4/net6.0-isolated/item.nupkg b/resources/backupTemplates/dotnet/~4/net6.0-isolated/item.nupkg index 28654c803..acfc42797 100644 Binary files a/resources/backupTemplates/dotnet/~4/net6.0-isolated/item.nupkg and b/resources/backupTemplates/dotnet/~4/net6.0-isolated/item.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net6.0-isolated/project.nupkg b/resources/backupTemplates/dotnet/~4/net6.0-isolated/project.nupkg index 40f67f183..81c9b80e0 100644 Binary files a/resources/backupTemplates/dotnet/~4/net6.0-isolated/project.nupkg and b/resources/backupTemplates/dotnet/~4/net6.0-isolated/project.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net6.0/item.nupkg b/resources/backupTemplates/dotnet/~4/net6.0/item.nupkg index 87b04df7a..68c858b39 100644 Binary files a/resources/backupTemplates/dotnet/~4/net6.0/item.nupkg and b/resources/backupTemplates/dotnet/~4/net6.0/item.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net6.0/project.nupkg b/resources/backupTemplates/dotnet/~4/net6.0/project.nupkg index f571e603e..a14a12f92 100644 Binary files a/resources/backupTemplates/dotnet/~4/net6.0/project.nupkg and b/resources/backupTemplates/dotnet/~4/net6.0/project.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net7.0-isolated/item.nupkg b/resources/backupTemplates/dotnet/~4/net7.0-isolated/item.nupkg index 28654c803..acfc42797 100644 Binary files a/resources/backupTemplates/dotnet/~4/net7.0-isolated/item.nupkg and b/resources/backupTemplates/dotnet/~4/net7.0-isolated/item.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net7.0-isolated/project.nupkg b/resources/backupTemplates/dotnet/~4/net7.0-isolated/project.nupkg index 40f67f183..81c9b80e0 100644 Binary files a/resources/backupTemplates/dotnet/~4/net7.0-isolated/project.nupkg and b/resources/backupTemplates/dotnet/~4/net7.0-isolated/project.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net8.0-isolated/item.nupkg b/resources/backupTemplates/dotnet/~4/net8.0-isolated/item.nupkg index 28654c803..acfc42797 100644 Binary files a/resources/backupTemplates/dotnet/~4/net8.0-isolated/item.nupkg and b/resources/backupTemplates/dotnet/~4/net8.0-isolated/item.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net8.0-isolated/project.nupkg b/resources/backupTemplates/dotnet/~4/net8.0-isolated/project.nupkg index 40f67f183..81c9b80e0 100644 Binary files a/resources/backupTemplates/dotnet/~4/net8.0-isolated/project.nupkg and b/resources/backupTemplates/dotnet/~4/net8.0-isolated/project.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net9.0-isolated/item.nupkg b/resources/backupTemplates/dotnet/~4/net9.0-isolated/item.nupkg new file mode 100644 index 000000000..acfc42797 Binary files /dev/null and b/resources/backupTemplates/dotnet/~4/net9.0-isolated/item.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/net9.0-isolated/project.nupkg b/resources/backupTemplates/dotnet/~4/net9.0-isolated/project.nupkg new file mode 100644 index 000000000..81c9b80e0 Binary files /dev/null and b/resources/backupTemplates/dotnet/~4/net9.0-isolated/project.nupkg differ diff --git a/resources/backupTemplates/dotnet/~4/version.txt b/resources/backupTemplates/dotnet/~4/version.txt index 9529dc550..e6da41542 100644 --- a/resources/backupTemplates/dotnet/~4/version.txt +++ b/resources/backupTemplates/dotnet/~4/version.txt @@ -1 +1 @@ -4.83.0 \ No newline at end of file +4.91.0 \ No newline at end of file diff --git a/resources/backupTemplates/script/~4/version.txt b/resources/backupTemplates/script/~4/version.txt index 9529dc550..e6da41542 100644 --- a/resources/backupTemplates/script/~4/version.txt +++ b/resources/backupTemplates/script/~4/version.txt @@ -1 +1 @@ -4.83.0 \ No newline at end of file +4.91.0 \ No newline at end of file diff --git a/src/templates/dotnet/executeDotnetTemplateCommand.ts b/src/templates/dotnet/executeDotnetTemplateCommand.ts index 7de9bbf09..72b359a5a 100644 --- a/src/templates/dotnet/executeDotnetTemplateCommand.ts +++ b/src/templates/dotnet/executeDotnetTemplateCommand.ts @@ -61,7 +61,7 @@ async function getFramework(context: IActionContext, workingDirectory: string | } // Prioritize "LTS", then "Current", then "Preview" - const netVersions: string[] = ['6.0', '7.0', '8.0']; + const netVersions: string[] = ['6.0', '7.0', '8.0', '9.0']; const semVersions: SemVer[] = netVersions.map(v => semVerCoerce(v) as SemVer); let pickedVersion: SemVer | undefined; diff --git a/test/updateBackupTemplates.ts b/test/updateBackupTemplates.ts index 8a46a9bed..668169aec 100644 --- a/test/updateBackupTemplates.ts +++ b/test/updateBackupTemplates.ts @@ -34,6 +34,7 @@ suite('Backup templates', () => { { language: ProjectLanguage.CSharp, projectTemplateKey: 'net6.0-isolated', versions: [FuncVersion.v4] }, { language: ProjectLanguage.CSharp, projectTemplateKey: 'net7.0-isolated', versions: [FuncVersion.v4] }, { language: ProjectLanguage.CSharp, projectTemplateKey: 'net8.0-isolated', versions: [FuncVersion.v4] }, + { language: ProjectLanguage.CSharp, projectTemplateKey: 'net9.0-isolated', versions: [FuncVersion.v4] }, { language: ProjectLanguage.Java, versions: [FuncVersion.v4] } ]; diff --git a/tools/JsonCli/.vscode/tasks.json b/tools/JsonCli/.vscode/tasks.json index 91b0e4933..664a69f4c 100644 --- a/tools/JsonCli/.vscode/tasks.json +++ b/tools/JsonCli/.vscode/tasks.json @@ -58,6 +58,22 @@ "${workspaceFolder}/src/Microsoft.TemplateEngine.JsonCli.csproj" ], "problemMatcher": "$msCompile" + }, + { + "label": "publish (9.0)", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "--configuration", + "Release", + "--framework", + "net9.0", + "--output", + "${workspaceFolder}/../../resources/dotnetJsonCli/net9.0/", + "${workspaceFolder}/src/Microsoft.TemplateEngine.JsonCli.csproj" + ], + "problemMatcher": "$msCompile" } ] }