Skip to content

Commit

Permalink
Updated generator BF dependency versions (#6295)
Browse files Browse the repository at this point in the history
  • Loading branch information
tracyboehrer authored Apr 22, 2022
1 parent f9f50fc commit 9ea8e13
Show file tree
Hide file tree
Showing 32 changed files with 106 additions and 42 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ PublishProfiles/

appsettings.local.json
appsettings.Development.json
!generators/**/appsettings.Development.json
**/*/.luisrc
/.vscode/launch.json
/outputpackages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Microsoft.Bot.Framework.CSharp.CoreBot</id>
<version>4.15.2</version>
<version>4.16.0</version>
<description>
A .NET Core Template for Microsoft Bot Framework v4. Will let you quickly set up a conversational AI bot with core features every bot is likely to use.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"defaultName": "CoreBot",
"groupIdentity": "Microsoft.BotFramework.CSharp.CoreBot",
"identity": "Microsoft.BotFramework.CSharp.CoreBot",
"name": "Bot Framework Core Bot (v4.15.2)",
"name": "Bot Framework Core Bot (v4.16.0)",
"preferNameDirectory": true,
"sourceName": "Microsoft.BotFramework.CoreBot",
"shortName": "corebot",
Expand All @@ -26,7 +26,7 @@
"type": "generated",
"generator": "constant",
"parameters": {
"value": "v4.15.2"
"value": "v4.16.0"
},
"replaces": "__vX.X.X__"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Testing" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
<PackageReference Include="Microsoft.Bot.Builder.Testing" Version="4.16.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.16.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.16.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
<PackageReference Include="Microsoft.Recognizers.Text.DataTypes.TimexExpression" Version="1.3.2" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Microsoft.Bot.Framework.CSharp.EchoBot</id>
<version>4.15.2</version>
<version>4.16.0</version>
<description>
A .NET Core Template for Microsoft Bot Framework v4. Will let you quickly set up a bot that simply "echoes" back to the user anything the user says to the bot.
This is a little more than "Hello World!"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"defaultName": "EchoBot",
"groupIdentity": "Microsoft.BotFramework.CSharp.EchoBot",
"identity": "Microsoft.BotFramework.CSharp.EchoBot",
"name": "Bot Framework Echo Bot (v4.15.2)",
"name": "Bot Framework Echo Bot (v4.16.0)",
"preferNameDirectory": true,
"sourceName": "Microsoft.BotFramework.EchoBot",
"shortName": "echobot",
Expand All @@ -25,7 +25,7 @@
"type": "generated",
"generator": "constant",
"parameters": {
"value": "v4.15.2"
"value": "v4.16.0"
},
"replaces": "__vX.X.X__"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Microsoft.Bot.Framework.CSharp.EmptyBot</id>
<version>4.15.2</version>
<version>4.16.0</version>
<description>
A .NET Core Template for Microsoft Bot Framework v4. A good template if you are familiar with Bot Framework v4, and simple want a basic skeleton project.
A .NET Core Template for Microsoft Bot Framework v4. A good template if you are familiar with Bot Framework v4, and simple want a basic skeleton project.
</description>
<authors>Microsoft</authors>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"defaultName": "EmptyBot",
"groupIdentity": "Microsoft.BotFramework.CSharp.EmptyBot",
"identity": "Microsoft.BotFramework.CSharp.EmptyBot",
"name": "Bot Framework Empty Bot (v4.15.2)",
"name": "Bot Framework Empty Bot (v4.16.0)",
"preferNameDirectory": true,
"sourceName": "Microsoft.BotFramework.EmptyBot",
"shortName": "emptybot",
Expand All @@ -25,7 +25,7 @@
"type": "generated",
"generator": "constant",
"parameters": {
"value": "v4.15.2"
"value": "v4.16.0"
},
"replaces": "__vX.X.X__"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
16 changes: 8 additions & 8 deletions generators/dotnet-templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 May 2020, these templates and the code they generate **require** [.NET Core 3.1][60].

## Templates
There are three different template options. The table below can help guide which template is right for you.
Expand Down Expand Up @@ -121,7 +121,7 @@ dotnet new -i Microsoft.Bot.Framework.CSharp.EmptyBot
dotnet new echobot -n MyEchoBot
```

#### Create CoreBot
#### Create CoreBot
> Note: For a core bot project, only the parent folder receives the bot name
```bash
# Generate a Core Bot
Expand Down Expand Up @@ -226,7 +226,7 @@ To work on the templates you need to package, install, and test locally build so
Install [NuGet CLI][70] version 3.3 or higher:
```bash
# determine nuget cli version
nuget
nuget
```
```bash
Expand All @@ -250,16 +250,16 @@ nuget pack Microsoft.BotFramework.CSharp.CoreBot

The `nuget pack` command will build a package using a filename convention that includes the value of the `version` tag of the project's `.nuspec` file. For example, a `.nuspec` file that has the following `version` tag specified:
```xml
<version>4.15.2</version>
<version>4.16.0</version>
```
Given the example above with `.nuspec` `version` of 4.15.2, running `nuget pack Microsoft.BotFramework.CSharp.EchoBot` will create a NuGet package named `Microsoft.Bot.Framework.CSharp.EchoBot.4.15.2.nupkg`. We'll use this NuGet package name in subsequent steps.
Given the example above with `.nuspec` `version` of 4.16.0, running `nuget pack Microsoft.BotFramework.CSharp.EchoBot` will create a NuGet package named `Microsoft.Bot.Framework.CSharp.EchoBot.4.16.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.15.2.nupkg
dotnet new -i ./Microsoft.Bot.Framework.CSharp.EchoBot.4.16.0.nupkg
```

To see a list of currently installed templates. With this command you should now see the locally build and installed NuGet package.
To see a list of currently installed templates. With this command you should now see the locally build and installed NuGet package.
```bash
# list installed templates
dotnet new --list
Expand All @@ -270,7 +270,7 @@ dotnet new --list
dotnet new echobot -n MyEchoBot
```

Build and test the newly generated project.
Build and test the newly generated project.

```bash
# uninstall the locally built .nupkg (EchoBot template)
Expand Down
2 changes: 1 addition & 1 deletion generators/vsix-vs-win/BotBuilderVSIX-V4/HOW_TO_VERSION.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The `.vstemplate` files have a `<CustomParameters></CustomParameters>` tag that

```xml
<CustomParameters>
<CustomParameter Name="$templateversion$" Value="4.15.2"/> <<<-HAND-CRAFTED-semver
<CustomParameter Name="$templateversion$" Value="4.16.0"/> <<<-HAND-CRAFTED-semver
</CustomParameters>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.16.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.16.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
<PackageReference Include="Microsoft.Recognizers.Text.DataTypes.TimexExpression" Version="1.4.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</TemplateData>
<TemplateContent>
<CustomParameters>
<CustomParameter Name="$templateversion$" Value="4.15.2"/>
<CustomParameter Name="$templateversion$" Value="4.16.0"/>
</CustomParameters>
<Project File="CoreBot.csproj" ReplaceParameters="true">
<Folder Name="Bots" TargetFolderName="Bots">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.Testing" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Testing" Version="4.16.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</TemplateData>
<TemplateContent>
<CustomParameters>
<CustomParameter Name="$templateversion$" Value="4.15.2"/>
<CustomParameter Name="$templateversion$" Value="4.16.0"/>
</CustomParameters>
<Project File="CoreBot.Tests.csproj" ReplaceParameters="true" TargetFileName="$projectname$.Tests.csproj">
<Folder Name="Bots" TargetFolderName="Bots">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.16.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.16.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
<PackageReference Include="Microsoft.Recognizers.Text.DataTypes.TimexExpression" Version="1.4.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</TemplateData>
<TemplateContent>
<CustomParameters>
<CustomParameter Name="$templateversion$" Value="4.15.2"/>
<CustomParameter Name="$templateversion$" Value="4.16.0"/>
</CustomParameters>
<Project File="CoreBot.csproj" ReplaceParameters="true">
<Folder Name="Bots" TargetFolderName="Bots">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</TemplateData>
<TemplateContent>
<CustomParameters>
<CustomParameter Name="$templateversion$" Value="4.15.2"/>
<CustomParameter Name="$templateversion$" Value="4.16.0"/>
</CustomParameters>
<ProjectCollection>
<ProjectTemplateLink CopyParameters="true" ProjectName="$safeprojectname$">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</TemplateData>
<TemplateContent>
<CustomParameters>
<CustomParameter Name="$templateversion$" Value="4.15.2"/>
<CustomParameter Name="$templateversion$" Value="4.16.0"/>
</CustomParameters>
<Project File="EchoBot.csproj" ReplaceParameters="true">
<Folder Name="Bots" TargetFolderName="Bots">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.15.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.16.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</TemplateData>
<TemplateContent>
<CustomParameters>
<CustomParameter Name="$templateversion$" Value="4.15.2"/>
<CustomParameter Name="$templateversion$" Value="4.16.0"/>
</CustomParameters>
<Project File="EmptyBot.csproj" ReplaceParameters="true">
<Folder Name="controllers" TargetFolderName="Controllers">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="BotBuilderV4.fbe0fc50-a6f1-4500-82a2-189314b7bea2" Version="4.15.2" Language="en-US" Publisher="Microsoft" />
<Identity Id="BotBuilderV4.fbe0fc50-a6f1-4500-82a2-189314b7bea2" Version="4.16.0" Language="en-US" Publisher="Microsoft" />
<DisplayName>Bot Framework v4 SDK Templates for Visual Studio</DisplayName>
<Description xml:space="preserve">Templates for Microsoft Bot Framework v4. Will let you quickly create a bot that uses core AI capabilities.</Description>
<MoreInfo>https://aka.ms/BotBuilderOverview</MoreInfo>
Expand Down

0 comments on commit 9ea8e13

Please sign in to comment.