From b15a8bf49d6e1cd2521a56843d5daec84c3a6133 Mon Sep 17 00:00:00 2001 From: Joel Mut <62260472+sw-joelmut@users.noreply.github.com> Date: Thu, 16 May 2024 10:41:24 -0300 Subject: [PATCH] [#6741] Update generators templates and VSIX to .Net 8 (#6762) * Update dotnet-templates to NET 8 * Update VSIX to NET 8 * Update comment BotBuilder version to latest * include netcoreapp3.1 in the template options * fix README content --------- Co-authored-by: JhontSouth --- .../content/.template.config/template.json | 20 ++++++++++---- .../content/CoreBot/README.md | 4 +-- .../content/.template.config/template.json | 27 ++++++++++++++----- .../content/README.md | 4 +-- .../content/.template.config/template.json | 27 ++++++++++++++----- .../content/README.md | 4 +-- generators/dotnet-templates/README.md | 20 +++++++------- .../vsix-vs-win/BotBuilderVSIX-V4/README.md | 2 +- .../CoreBot/CoreBot.csproj | 2 +- .../CoreBot/CoreBot.vstemplate | 2 +- .../CoreBot/README.md | 4 +-- .../CoreBot.tests/CoreBot.Tests.csproj | 2 +- .../CoreBotWithTests/CoreBot/CoreBot.csproj | 2 +- .../CoreBot/CoreBot.vstemplate | 15 ++++++++--- .../CoreBotWithTests/CoreBot/README.md | 4 +-- .../CoreBotWithTests.vstemplate | 2 +- .../EchoBot/EchoBot.csproj | 2 +- .../EchoBot/EchoBot.vstemplate | 2 +- .../EchoBot/README.md | 4 +-- .../EmptyBot/EmptyBot.csproj | 2 +- .../EmptyBot/EmptyBot.vstemplate | 2 +- .../EmptyBot/README.md | 4 +-- 22 files changed, 102 insertions(+), 55 deletions(-) diff --git a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/.template.config/template.json b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/.template.config/template.json index d144487133..ab46bf3aeb 100644 --- a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/.template.config/template.json +++ b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/.template.config/template.json @@ -45,13 +45,21 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + }, { "choice": "net6.0", "description": "Target net6.0" + }, + { + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "__NETCOREAPP_VERSION__", - "defaultValue": "net6.0" + "defaultValue": "net8.0" }, "IncludeTests": { "type": "parameter", @@ -61,7 +69,7 @@ "isRequired": false }, "ReadmeNetCorePrereqVersion": { - "type":"generated", + "type": "generated", "generator": "switch", "dataType": "string", "replaces": "__NETCORE_VERSION__", @@ -69,8 +77,8 @@ "evaluator": "C++", "cases": [ { - "condition": "(Framework==\"net6.0\")", - "value": "6.0" + "condition": "(Framework==\"net8.0\")", + "value": "8.0" } ] } @@ -109,7 +117,9 @@ "condition": "(!SkipRestore)", "description": "Restore NuGet packages required by this project.", "manualInstructions": [ - { "text": "Run 'dotnet restore'" } + { + "text": "Run 'dotnet restore'" + } ], "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", "continueOnError": true diff --git a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/CoreBot/README.md b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/CoreBot/README.md index d11c65b3b9..e078541c37 100644 --- a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/CoreBot/README.md +++ b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.CoreBot/content/CoreBot/README.md @@ -68,7 +68,7 @@ Once you created the LUIS model, update `appsettings.json` with your `LuisAppId` [Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel. -- Install the Bot Framework Emulator version 4.9.0 or greater from [here](https://github.com/Microsoft/BotFramework-Emulator/releases) +- Install the latest v4 Bot Framework Emulator [here](https://github.com/Microsoft/BotFramework-Emulator/releases/latest) ### Connect to the bot using Bot Framework Emulator @@ -89,7 +89,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0) - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0) - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0) -- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x) +- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools) - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest) - [Azure Portal](https://portal.azure.com) - [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/) diff --git a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/.template.config/template.json b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/.template.config/template.json index a69d513994..642df55c6c 100644 --- a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/.template.config/template.json +++ b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/.template.config/template.json @@ -44,16 +44,24 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + }, { "choice": "net6.0", "description": "Target net6.0" + }, + { + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "__NETCOREAPP_VERSION__", - "defaultValue": "net6.0" + "defaultValue": "net8.0" }, "ReadmeNetCorePrereqVersion": { - "type":"generated", + "type": "generated", "generator": "switch", "dataType": "string", "replaces": "__NETCORE_VERSION__", @@ -61,8 +69,8 @@ "evaluator": "C++", "cases": [ { - "condition": "(Framework==\"net6.0\")", - "value": "6.0" + "condition": "(Framework==\"net8.0\")", + "value": "8.0" } ] } @@ -78,7 +86,12 @@ "sources": [ { "modifiers": [ - {"exclude": [ "**/NuGet.Config", "**/.DS_Store" ]} + { + "exclude": [ + "**/NuGet.Config", + "**/.DS_Store" + ] + } ] } ], @@ -87,7 +100,9 @@ "condition": "(!SkipRestore)", "description": "Restore NuGet packages required by this project.", "manualInstructions": [ - { "text": "Run 'dotnet restore'" } + { + "text": "Run 'dotnet restore'" + } ], "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", "continueOnError": true diff --git a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/README.md b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/README.md index 5f3af9837d..091aedfe61 100644 --- a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/README.md +++ b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EchoBot/content/README.md @@ -43,7 +43,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i [Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel. -- Install the Bot Framework Emulator version 4.9.0 or greater from [here](https://github.com/Microsoft/BotFramework-Emulator/releases) +- Install the latest v4 Bot Framework Emulator [here](https://github.com/Microsoft/BotFramework-Emulator/releases/latest) ### Connect to the bot using Bot Framework Emulator @@ -62,7 +62,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0) - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0) - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0) -- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x) +- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools) - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest) - [Azure Portal](https://portal.azure.com) - [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/) diff --git a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/.template.config/template.json b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/.template.config/template.json index ab549fbf5f..7eeb345ce9 100644 --- a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/.template.config/template.json +++ b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/.template.config/template.json @@ -44,16 +44,24 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + }, { "choice": "net6.0", "description": "Target net6.0" + }, + { + "choice": "net8.0", + "description": "Target net8.0" } ], "replaces": "__NETCOREAPP_VERSION__", - "defaultValue": "net6.0" + "defaultValue": "net8.0" }, "ReadmeNetCorePrereqVersion": { - "type":"generated", + "type": "generated", "generator": "switch", "dataType": "string", "replaces": "__NETCORE_VERSION__", @@ -61,8 +69,8 @@ "evaluator": "C++", "cases": [ { - "condition": "(Framework==\"net6.0\")", - "value": "6.0" + "condition": "(Framework==\"net8.0\")", + "value": "8.0" } ] } @@ -78,7 +86,12 @@ "sources": [ { "modifiers": [ - {"exclude": [ "**/NuGet.Config", "**/.DS_Store" ]} + { + "exclude": [ + "**/NuGet.Config", + "**/.DS_Store" + ] + } ] } ], @@ -87,7 +100,9 @@ "condition": "(!SkipRestore)", "description": "Restore NuGet packages required by this project.", "manualInstructions": [ - { "text": "Run 'dotnet restore'" } + { + "text": "Run 'dotnet restore'" + } ], "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", "continueOnError": true diff --git a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/README.md b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/README.md index 544e0cb8dc..a6aa170932 100644 --- a/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/README.md +++ b/generators/dotnet-templates/Microsoft.BotFramework.CSharp.EmptyBot/content/README.md @@ -43,7 +43,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i [Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel. -- Install the Bot Framework Emulator version 4.9.0 or greater from [here](https://github.com/Microsoft/BotFramework-Emulator/releases) +- Install the latest v4 Bot Framework Emulator [here](https://github.com/Microsoft/BotFramework-Emulator/releases/latest) ### Connect to the bot using Bot Framework Emulator @@ -62,7 +62,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0) - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0) - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0) -- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x) +- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools) - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest) - [Azure Portal](https://portal.azure.com) - [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/) diff --git a/generators/dotnet-templates/README.md b/generators/dotnet-templates/README.md index 98160c9fd0..7e6120c708 100644 --- a/generators/dotnet-templates/README.md +++ b/generators/dotnet-templates/README.md @@ -3,7 +3,7 @@ using core AI capabilities. ## About -.NET Core Templates will help you to quickly build new conversational AI bots using [Bot Framework v4][1]. As of May 2020, these templates and the code they generate **require** [.NET Core 3.1][60]. +.NET Core Templates will help you to quickly build new conversational AI bots using [Bot Framework v4][1]. As of March 2024, these templates and the code they generate **require** [.NET Core 8.0][60]. ## Templates There are three different template options. The table below can help guide which template is right for you. @@ -58,7 +58,7 @@ The Empty Bot template is the minimal skeleton code for a bot. It provides a st ## Installation -1. Install [.NET Core SDK][4] version 3.1 or higher +1. Install [.NET Core SDK][60] version 8.0 or higher ```bash # determine dotnet version dotnet --version @@ -97,17 +97,17 @@ The above installation steps will install all three Bot Framework templates. If ```bash # Install EchoBot template -dotnet new -i Microsoft.Bot.Framework.CSharp.EchoBot +dotnet new install Microsoft.Bot.Framework.CSharp.EchoBot ``` ```bash # Install CoreBot template -dotnet new -i Microsoft.Bot.Framework.CSharp.CoreBot +dotnet new install Microsoft.Bot.Framework.CSharp.CoreBot ``` ```bash # Install EmptyBot template -dotnet new -i Microsoft.Bot.Framework.CSharp.EmptyBot +dotnet new install Microsoft.Bot.Framework.CSharp.EmptyBot ``` @@ -204,7 +204,7 @@ You can get the latest development builds from the [BotBuilder MyGet][51] feed. To install the latest development build: ```bash # install the development build of Echo Bot template -dotnet new -i Microsoft.Bot.Framework.CSharp.EchoBot --nuget-source https://botbuilder.myget.org/F/aitemplates/api/v3/index.json +dotnet new install Microsoft.Bot.Framework.CSharp.EchoBot --nuget-source https://botbuilder.myget.org/F/aitemplates/api/v3/index.json ``` To see a list of currently installed templates: @@ -216,7 +216,7 @@ dotnet new --list To uninstall the development build: ```bash # uninstall the development build of Echo Bot template -dotnet new -u Microsoft.Bot.Framework.CSharp.EchoBot +dotnet new uninstall Microsoft.Bot.Framework.CSharp.EchoBot ``` ## Creating a Local Development Environment @@ -255,8 +255,8 @@ The `nuget pack` command will build a package using a filename convention that i Given the example above with `.nuspec` `version` of 4.22.0, running `nuget pack Microsoft.BotFramework.CSharp.EchoBot` will create a NuGet package named `Microsoft.Bot.Framework.CSharp.EchoBot.4.22.0.nupkg`. We'll use this NuGet package name in subsequent steps. ```bash -# install the locally built .nupkg (EchoBot template, assuming 4.9.0 version tag) -dotnet new -i ./Microsoft.Bot.Framework.CSharp.EchoBot.4.22.0.nupkg +# install the locally built .nupkg (EchoBot template, assuming 4.22.0 version tag) +dotnet new install ./Microsoft.Bot.Framework.CSharp.EchoBot.4.22.0.nupkg ``` To see a list of currently installed templates. With this command you should now see the locally build and installed NuGet package. @@ -274,7 +274,7 @@ Build and test the newly generated project. ```bash # uninstall the locally built .nupkg (EchoBot template) -dotnet new -u Microsoft.Bot.Framework.CSharp.EchoBot +dotnet new uninstall Microsoft.Bot.Framework.CSharp.EchoBot ``` ## Logging Issues and Providing Feedback diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/README.md b/generators/vsix-vs-win/BotBuilderVSIX-V4/README.md index cc33a938e5..8de27221b0 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/README.md +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/README.md @@ -96,7 +96,7 @@ Select template of choice from Bot Builder v4 templates, then click **OK**. ### .NET Core CLI -* Install the [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x). +* Install the [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools). * Using the command line, navigate to your project's root folder. * Type `dotnet run`. diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.csproj b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.csproj index 8a1e17e1fe..2d0e458d48 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.csproj +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 latest diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.vstemplate b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.vstemplate index 5adc0edb2a..485d279594 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.vstemplate +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/CoreBot.vstemplate @@ -1,6 +1,6 @@ - Core Bot (Bot Framework v4 - .NET Core 3.1) + Core Bot (Bot Framework v4 - .NET Core 8.0) Core Bot Template for Bot Framework v4. Our most feature rich template, it shows how to use LUIS and multi-turn conversational patterns. CSharp diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/README.md b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/README.md index f4a9bb8bc5..8db3c6bdad 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/README.md +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBot/README.md @@ -19,7 +19,7 @@ This bot uses [LUIS](https://www.luis.ai), an AI based cognitive service, to imp ### Install .NET CLI -- [.NET SDK](https://dotnet.microsoft.com/download) version 6.0 +- [.NET SDK](https://dotnet.microsoft.com/download) version 8.0 ```bash # determine dotnet version @@ -92,7 +92,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0) - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0) - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0) -- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x) +- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools) - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest) - [Azure Portal](https://portal.azure.com) - [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/) diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot.tests/CoreBot.Tests.csproj b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot.tests/CoreBot.Tests.csproj index 0410765459..02c0c22d5d 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot.tests/CoreBot.Tests.csproj +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot.tests/CoreBot.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false latest diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.csproj b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.csproj index 50975eb554..252e4b2a34 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.csproj +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 latest diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.vstemplate b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.vstemplate index f81b4daa72..497807fd3c 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.vstemplate +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/CoreBot.vstemplate @@ -72,10 +72,17 @@ Startup.cs - template-with-new-rg.json - template-with-preexisting-rg.json - new-rg-parameters.json - preexisting-rg-parameters.json + DeployUseExistResourceGroup\template-AzureBot-with-rg.json + DeployUseExistResourceGroup\template-BotApp-with-rg.json + DeployUseExistResourceGroup\parameters-for-template-AzureBot-with-rg.json + DeployUseExistResourceGroup\parameters-for-template-BotApp-with-rg.json + DeployUseExistResourceGroup\readme.md + + DeployWithNewResourceGroup\template-AzureBot-new-rg.json + DeployWithNewResourceGroup\template-BotApp-new-rg.json + DeployWithNewResourceGroup\parameters-for-template-AzureBot-new-rg.json + DeployWithNewResourceGroup\parameters-for-template-BotApp-new-rg.json + DeployWithNewResourceGroup\readme.md diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/README.md b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/README.md index 106fc046ec..b4f869114c 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/README.md +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBot/README.md @@ -19,7 +19,7 @@ This bot uses [LUIS](https://www.luis.ai), an AI based cognitive service, to imp ### Install .NET CLI -- [.NET SDK](https://dotnet.microsoft.com/download) version 6.0 +- [.NET SDK](https://dotnet.microsoft.com/download) version 8.0 ```bash # determine dotnet version @@ -89,7 +89,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0) - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0) - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0) -- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x) +- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools) - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest) - [Azure Portal](https://portal.azure.com) - [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/) diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBotWithTests.vstemplate b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBotWithTests.vstemplate index 7f1477608e..602abe688b 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBotWithTests.vstemplate +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/CoreBotWithTests/CoreBotWithTests.vstemplate @@ -1,6 +1,6 @@ - Core Bot with Tests (Bot Framework v4 - .NET 6.0) + Core Bot with Tests (Bot Framework v4 - .NET 8.0) Core Bot Template with Unit Tests for Bot Framework v4. Same features as Core Bot, plus a full unit test project. CSharp diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.csproj b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.csproj index 224f9d1db4..3b85a49636 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.csproj +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 latest diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.vstemplate b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.vstemplate index 8d88e4a4b0..901c7b06ee 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.vstemplate +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/EchoBot.vstemplate @@ -1,6 +1,6 @@ - Echo Bot (Bot Framework v4 - .NET Core 3.1) + Echo Bot (Bot Framework v4 - .NET Core 8.0) Echo Bot Template for Bot Framework v4. A good template if you want a little more than "Hello World!". Echo Bot simply "echoes" back to the user anything the user says to the bot. CSharp diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/README.md b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/README.md index d475b6f534..3052a711ee 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/README.md +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EchoBot/README.md @@ -6,7 +6,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ## Prerequisites -- [.NET SDK](https://dotnet.microsoft.com/download) version 6.0 +- [.NET SDK](https://dotnet.microsoft.com/download) version 8.0 ```bash # determine dotnet version @@ -62,7 +62,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0) - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0) - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0) -- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x) +- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools) - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest) - [Azure Portal](https://portal.azure.com) - [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/) diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.csproj b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.csproj index 224f9d1db4..3b85a49636 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.csproj +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 latest diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.vstemplate b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.vstemplate index 4653c900ad..f6a1ecd50d 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.vstemplate +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/EmptyBot.vstemplate @@ -1,6 +1,6 @@ - Empty Bot (Bot Framework v4 - .NET Core 3.1) + Empty Bot (Bot Framework v4 - .NET Core 8.0) Empty Bot Template for Bot Framework v4. A good template if you want a skeleton project or want to take sample code from the documentation and paste it into a minimal bot in order to learn. CSharp diff --git a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/README.md b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/README.md index f9f1780e40..42a1e7a1f7 100644 --- a/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/README.md +++ b/generators/vsix-vs-win/BotBuilderVSIX-V4/UncompressedProjectTemplates/EmptyBot/README.md @@ -6,7 +6,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ## Prerequisites -- [.NET SDK](https://dotnet.microsoft.com/download) version 6.0 +- [.NET SDK](https://dotnet.microsoft.com/download) version 8.0 ```bash # determine dotnet version @@ -62,7 +62,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0) - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0) - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0) -- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x) +- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools) - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest) - [Azure Portal](https://portal.azure.com) - [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/)