Skip to content

Commit

Permalink
fix: update framework and package version in template botproject (#1939)
Browse files Browse the repository at this point in the history
* update package version in template

*  add error throw in script

* update netcoreapp version to 3.1

* update schema to 4.7.2 sdk version

* form editor expression err for new schema

* update dotnet sdk in docker

* update dotnet sdk version validation

* update sdk version validation

* refactor: update the validation for new schema (#1988)

* update the validation

* fix some comments

* update some logic

* fix unit test

Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Dong Lei <donglei@microsoft.com>
Co-authored-by: Long Alan <julong@microsoft.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
  • Loading branch information
6 people authored Feb 13, 2020
1 parent 0b680f8 commit 705a7f4
Show file tree
Hide file tree
Showing 18 changed files with 9,241 additions and 1,272 deletions.
26 changes: 12 additions & 14 deletions BotProject/Templates/CSharp/BotProject.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Tests\**" />
Expand All @@ -13,26 +13,24 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<CodeAnalysisRuleSet>BotProject.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<CodeAnalysisRuleSet>BotProject.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.4" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.7.0-preview-191208-1" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.7.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.7.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.7.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.7.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.7.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.7.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.7.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.7.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.7.2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.7.2" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
<PrivateAssets>all</PrivateAssets>
Expand Down
1 change: 1 addition & 0 deletions BotProject/Templates/CSharp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;

namespace Microsoft.Bot.Builder.ComposerBot.Json
{
Expand Down
Loading

0 comments on commit 705a7f4

Please sign in to comment.