Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit dcad83404f82972e5f6cf9a575882c602294a345
Merge: 2448cc9 5a66adf
Author: Shahin Shayandeh <[email protected]>
Date:   Tue Mar 21 11:20:45 2017 -0700

    Merge branch 'sharedtolibrary' of https://github.com/iedeny/BotBuilder into iedeny-sharedtolibrary1

commit 2448cc9
Author: Steve Ickman <[email protected]>
Date:   Mon Mar 13 18:07:10 2017 -0700

    new RecognizerFiler class

commit d74fe9c
Author: Steve Ickman <[email protected]>
Date:   Mon Mar 13 16:41:17 2017 -0700

    new LocalizedRegExpRecognizer class.

commit 2a78d18
Author: Steve Ickman <[email protected]>
Date:   Mon Mar 13 15:52:43 2017 -0700

    Fixed bug in UniversalBot.send()
    - Didn't protect against empty list of messages,
    - Also wasn't returning errors in an edge case.

commit b74bcb9
Merge: bd76705 9ee2f8d
Author: Robert Standefer <[email protected]>
Date:   Mon Mar 20 08:47:38 2017 -0700

    Merge pull request #2465 from brandonh-msft/patch-1

    Update GettingStarted.cs

commit 9ee2f8d
Author: Brandon H <[email protected]>
Date:   Mon Mar 20 08:32:13 2017 -0700

    use new shorturls for dialog & controller templates

commit 826e9dc
Author: Brandon H <[email protected]>
Date:   Sun Mar 19 13:45:41 2017 -0700

    Update GettingStarted.cs

    Adding links to Dialog and Controller Item templates

commit 5a66adf
Author: Yegor Denisov <[email protected]>
Date:   Wed Mar 15 15:28:41 2017 -0700

    Remove app id and password from sample configs

commit f95ba06
Author: Yegor Denisov <[email protected]>
Date:   Wed Mar 15 15:27:55 2017 -0700

    Regenerate Microsoft.Bot.Connector.xml after merge from master

commit 1f5540d
Merge: a06cee8 bd76705
Author: Andre Esteve <[email protected]>
Date:   Wed Mar 15 23:09:21 2017 +0100

    Merge remote-tracking branch 'origin/master' into sharedtolibrary

commit bd76705
Author: Steve Ickman <[email protected]>
Date:   Mon Mar 13 14:58:01 2017 -0700

    Bug fixes around new debug event.

commit d2f0299
Author: Steve Ickman <[email protected]>
Date:   Thu Mar 9 13:33:31 2017 -0800

    Added customAction() feature.

commit 2d26947
Author: Steve Ickman <[email protected]>
Date:   Wed Mar 8 15:34:59 2017 -0800

    Updated docs with session logger stuff.

commit b77f683
Author: Steve Ickman <[email protected]>
Date:   Tue Mar 7 22:14:35 2017 -0800

    Added watch support.

commit 125f22b
Author: Steve Ickman <[email protected]>
Date:   Tue Mar 7 19:30:58 2017 -0800

    DEBUG event support
    - Stream console logs to emulator

commit b3b602e
Author: Shahin Shayandeh <[email protected]>
Date:   Tue Mar 7 15:14:33 2017 -0800

    Update assembly versions for latest release

commit 07f3e89
Author: Shahin Shayandeh <[email protected]>
Date:   Tue Mar 7 13:53:27 2017 -0800

    Update the french resource file and test

commit 2956e49
Merge: a7e4677 3564235
Author: Shahin Shayandeh <[email protected]>
Date:   Tue Mar 7 13:46:06 2017 -0800

    Merge branch 'develop'

commit a06cee8
Author: Yegor Denisov <[email protected]>
Date:   Tue Mar 7 12:27:01 2017 -0800

    Microsoft.Bot.Builder.VS2017.sln auto-refreshed by RTM version VS 2017

commit 24dcf7c
Author: Andre Esteve <[email protected]>
Date:   Thu Mar 2 20:09:27 2017 +0000

    Apply workaround for netstandard 1.6 tooling

    Issue: dotnet/roslyn#12918

commit a7e4677
Author: Steve Ickman <[email protected]>
Date:   Tue Feb 28 19:21:39 2017 -0800

    Adding snippets needing for new docs.

commit a170fa4
Author: Andre Esteve <[email protected]>
Date:   Fri Feb 24 22:20:46 2017 +0000

    Revert EOL changes

commit 1003f26
Author: Steve Ickman <[email protected]>
Date:   Thu Feb 23 18:26:33 2017 -0800

    Updated package.json version

commit 091e0f4
Author: Carlos Castro <[email protected]>
Date:   Tue Feb 21 11:30:16 2017 -0800

    Prompts methods verification for session parameter

commit df9e9a7
Author: Carlos Castro <[email protected]>
Date:   Tue Feb 21 11:25:29 2017 -0800

    Prompts.text outputs a meaningful error message when session is not provided

commit f67dea2
Author: Yegor Denisov <[email protected]>
Date:   Thu Feb 23 11:47:44 2017 -0800

    Add missing IdentityModel packages to samples

commit 6676183
Author: iedeny <[email protected]>
Date:   Wed Feb 22 19:40:06 2017 -0800

    Downgrade AutoRest back to 0.16.0

commit 3d1745b
Author: iedeny <[email protected]>
Date:   Wed Feb 22 19:23:45 2017 -0800

    Add AspNetCore.Mvc to original solution

commit 40f8b74
Author: Andre Esteve <[email protected]>
Date:   Thu Feb 23 04:00:50 2017 +0000

    Add package for Builder.Framework and Connector.AspNetCore.Mvc

commit e0710fe
Author: Andre Esteve <[email protected]>
Date:   Thu Feb 23 03:06:22 2017 +0000

    Update autorest version in generateClient.cmd

commit 038d647
Author: Andre Esteve <[email protected]>
Date:   Thu Feb 23 00:58:53 2017 +0000

    Add check for service provider registered on autofac composition
     - Add missing packages to samples
     - Fix authentication on AspNetCore project when secret is not provided

commit 72497b1
Author: iedeny <[email protected]>
Date:   Wed Feb 22 19:10:09 2017 -0800

    Add new AspNetCore.Mvc projects

commit 2421b93
Author: iedeny <[email protected]>
Date:   Wed Feb 22 12:33:45 2017 -0800

    Rename Connector.Abstractions folder back to Connector.Shared
     - Remove ApplicationInsights package from AspNetCore.Pizza sample
     - Consolidate packages to latest
     - Fix folder name in packaging script for Shared project
     - Fix remaining unit test failures
     - Consolidate assembly version

commit 30183de
Author: Andre Esteve <[email protected]>
Date:   Wed Feb 22 02:25:39 2017 +0000

    Update nuget package creation

commit 1890960
Author: Andre Esteve <[email protected]>
Date:   Wed Feb 22 00:30:29 2017 +0000

    Update System.Net.Http to 4.3.1

    This is required to address issue https://github.com/dotnet/corefx/issues/11100

commit f2bc432
Author: Andre Esteve <[email protected]>
Date:   Thu Feb 16 23:43:11 2017 +0000

    Enable ASP.NET CORE usage with BotBuilder

     - Fix simple sandwich bot and add TODO comment
     - Improve Service resolution for multi-platform support
     - Remove remaining #IF NET45 compiler conditionals
     - Remove #IF NET45 conditionals merge from upstream

commit aa72e0f
Author: Andre Esteve <[email protected]>
Date:   Thu Feb 16 17:34:01 2017 +0000

    Add IBotConfiguration to abstract ConfigurationManager out of portable code

commit 64f3edc
Author: iedeny <[email protected]>
Date:   Wed Feb 15 15:54:34 2017 -0800

    Update System.Net.Http to 4.3.1

commit 2636a24
Author: iedeny <[email protected]>
Date:   Wed Feb 15 12:39:58 2017 -0800

    Remove xproj
    Add VS2017 solution to support netcore projects

commit 71f1189
Author: iedeny <[email protected]>
Date:   Wed Feb 15 11:37:04 2017 -0800

    Autofac now references common connector library

commit 094213e
Author: Yegor Denisov <[email protected]>
Date:   Mon Feb 13 03:13:00 2017 -0800

    Add AspNet Core pizza bot sample

commit c6b4f69
Author: Yegor Denisov <[email protected]>
Date:   Sat Feb 11 05:39:11 2017 -0800

    Convert AspNetCore Connector into portable library

     - Convert aspnet core connector to netstandard 1.4
     - Fix System.Net.Http binding

commit 0d590d4
Author: Yegor Denisov <[email protected]>
Date:   Sat Feb 11 04:44:41 2017 -0800

    Consolidate all nuget packages.
    Update all packages except Moq, Autofac and Castle.Core

commit d220e63
Author: Yegor Denisov <[email protected]>
Date:   Sat Feb 11 02:29:40 2017 -0800

    Convert shared Connector code into a separate library

commit ce39e2a
Author: Steve Ickman <[email protected]>
Date:   Thu Feb 23 15:08:25 2017 -0800

    Removed node-uuid.
    We're not using it and it's deprecated.

commit 4bccc42
Author: Steve Ickman <[email protected]>
Date:   Wed Feb 22 17:43:00 2017 -0800

    Moved locale files to output

commit ad2c98b
Author: Steve Ickman <[email protected]>
Date:   Tue Feb 21 14:14:10 2017 -0800

    RegExpRecognizer fails on Node-RED
    - Added duck typing based check to constructor as instanceof doesn't work on Node-RED

commit f26b12f
Author: Steve Ickman <[email protected]>
Date:   Tue Feb 21 10:57:02 2017 -0800

    Session.validateDialogStack() always succeeded.

commit c7e981a
Merge: 99bd9ce a8cbef0
Author: Steven Ickman <[email protected]>
Date:   Wed Feb 22 17:40:38 2017 -0800

    Merge pull request #2026 from saveriopalmieri/master

    New locale (PT - Portuguese) for NodeJs BotBuilder

commit 99bd9ce
Author: Andrea-Orimoto <[email protected]>
Date:   Tue Feb 21 14:52:32 2017 -0800

    Update ISSUE_TEMPLATE

commit ea0ed7d
Author: Andrea-Orimoto <[email protected]>
Date:   Tue Feb 21 14:47:14 2017 -0800

    Create ISSUE_TEMPLATE

commit 16dd579
Author: Steve Ickman <[email protected]>
Date:   Thu Feb 16 16:40:16 2017 -0800

    Updated build process
    - Build now builds directly to live.
    - botbuilder.d.ts & locale files are only in lib.

commit 15a6ded
Author: Steve Ickman <[email protected]>
Date:   Thu Feb 16 16:39:13 2017 -0800

    Added support for intent forwarding.

commit b47dab3
Merge: 8542c89 6f3a08c
Author: Chris McConnell <[email protected]>
Date:   Fri Feb 17 11:44:45 2017 -0800

    Merge pull request #2212 from ArtisanDuCode/master

    Fixed Caps non Non

commit 8542c89
Author: Shahin Shayandeh <[email protected]>
Date:   Thu Feb 16 16:41:35 2017 -0800

    Update assembly versions to 3.5.3

commit 497252e
Merge: c769a9f 9ae4978
Author: Shahin Shayandeh <[email protected]>
Date:   Thu Feb 16 16:31:16 2017 -0800

    Merge branch 'develop'

commit 6f3a08c
Author: Un artisan du Code <[email protected]>
Date:   Wed Feb 8 19:49:29 2017 +0100

    Fixed Caps non Non

commit c769a9f
Author: Shahin Shayandeh <[email protected]>
Date:   Tue Feb 7 12:53:39 2017 -0800

    Update bot.builder assembly version to 3.5.2

commit 8cd6598
Author: Shahin Shayandeh <[email protected]>
Date:   Tue Feb 7 13:00:30 2017 -0800

    Update persian resource file with the resource file generated by multilingual app tool

commit 387e7e5
Author: Behnam Emamian <[email protected]>
Date:   Wed Feb 8 07:55:56 2017 +1100

    Fixing persian resources. (#2020)

    * Fixing persian resources.

    * Fixing persian resources

commit a8cbef0
Author: Saverio Palmieri <Saverio Palmieri>
Date:   Thu Jan 12 20:26:29 2017 -0200

    Small typos.

commit 56e6aab
Author: Saverio Palmieri <Saverio Palmieri>
Date:   Thu Jan 12 19:58:47 2017 -0200

    Added locale files for PT (Portuguese) language
  • Loading branch information
@msft-shahins
msft-shahins committed Mar 21, 2017
1 parent 855e9a3 commit 0123c41
Show file tree
Hide file tree
Showing 227 changed files with 13,916 additions and 14,449 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Note: Please only submit Bot Builder SDK bugs here. If you have general questions or implementation issues, please submit a question on Stack Overflow at http://stackoverflow.com/questions/tagged/botframework.
2 changes: 1 addition & 1 deletion CSharp/Documentation/Documentation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<ProjectGuid>{72C60ACB-4804-4584-AD49-00289A89F227}</ProjectGuid>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand Down
4 changes: 3 additions & 1 deletion CSharp/Documentation/GettingStarted.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ 1. Install prerequisite software
- Important: Please update all VS extensions to their latest versions Tools->Extensions and Updates->Updates
2. Download and install the %Bot Application template
- Download the file from the direct download link <a href="http://aka.ms/bf-bc-vstemplate" target="_blank">here</a>:
- Save the zip file to your Visual Studio 2015 templates directory which is traditionally in "%USERPROFILE%\Documents\Visual Studio 2015\Templates\ProjectTemplates\Visual C#\"
- Save the zip file to your Visual Studio 2015 project templates directory which is traditionally in "%USERPROFILE%\Documents\Visual Studio 2015\Templates\ProjectTemplates\Visual C#\"
- Additionally, you can download <a href="https://aka.ms/bf-bc-vsdialogtemplate" target="_blank">Dialog</a> and <a href="https://aka.ms/bf-bc-vscontrollertemplate" target="_blank">Controller</a> Item templates.
- Save these to your Visual Studio 2015 item templates directory which is traditionally in "%USERPROFILE%\Documents\Visual Studio 2015\Templates\ItemTemplates\Visual C#\"
3. Open Visual Studio
4. Create a new C\# project using the new %Bot Application template.
![Create a new C\# project using the new %Bot Application template.](/en-us/images/connector/connector-getstarted-create-project.png)
Expand Down
36 changes: 34 additions & 2 deletions CSharp/Documentation/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
62 changes: 53 additions & 9 deletions CSharp/Library/Microsoft.Bot.Builder.Autofac/Dialogs/DialogModule.cs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
//
//
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license.
//
//
// Microsoft Bot Framework: http://botframework.com
//
//
// Bot Builder SDK GitHub:
// https://github.com/Microsoft/BotBuilder
//
//
// Copyright (c) Microsoft Corporation
// All rights reserved.
//
//
// MIT License:
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
Expand All @@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
//
// THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Expand All @@ -45,7 +45,12 @@
using Microsoft.Bot.Builder.Scorables;
using Microsoft.Bot.Builder.Scorables.Internals;
using Microsoft.Bot.Connector;

using Microsoft.Bot.Builder.Autofac.Base;
using System.Configuration;
using System.Linq;
using System.Collections.Generic;
using Microsoft.Extensions.Logging;

namespace Microsoft.Bot.Builder.Dialogs.Internals
{
/// <summary>
Expand All @@ -72,6 +77,8 @@ protected override void Load(ContainerBuilder builder)

builder.RegisterModule(new FiberModule<DialogTask>());

RegisterBotConnectorImplementation(builder);

// singleton components

builder
Expand Down Expand Up @@ -108,7 +115,7 @@ protected override void Load(ContainerBuilder builder)

// components not marked as [Serializable]
builder
.RegisterType<MicrosoftAppCredentials>()
.Register(c => new MicrosoftAppCredentials(c.Resolve<ServiceProvider>(), null, null, null))
.AsSelf()
.SingleInstance();

Expand Down Expand Up @@ -396,6 +403,43 @@ protected override void Load(ContainerBuilder builder)
)
.InstancePerLifetimeScope();
}

/// <summary>
/// Registers (platform specific) bot connector implementations.
/// </summary>
/// <param name="builder">The builder used to register dependencies.</param>
private void RegisterBotConnectorImplementation(ContainerBuilder builder)
{
if (ServiceProvider.IsRegistered)
{
builder.Register<ServiceProvider>(c => ServiceProvider.Instance)
.AsSelf()
.SingleInstance();
}
else
{
// Finds the bot connector being used in this application domain
// that is not the common connector assembly
System.Reflection.Assembly connectorAssembly = AppDomain.CurrentDomain.
GetAssemblies()
.Where(a => a.FullName.StartsWith("Microsoft.Bot.Connector"))
.Where(a => a != typeof(BotData).Assembly)
.FirstOrDefault();

if (connectorAssembly != null)
{
// register the IServiceProvider instance provided in the connector with the Common connector
builder.RegisterAssemblyTypes(connectorAssembly)
.Where(t => t.IsAssignableTo<IServiceProvider>())
.AsImplementedInterfaces()
.SingleInstance();

builder.Register<ServiceProvider>(c => { if (!ServiceProvider.IsRegistered) { ServiceProvider.RegisterServiceProvider(c.Resolve<IServiceProvider>()); } return ServiceProvider.Instance; })
.AsSelf()
.SingleInstance();
}
}
}
}

public sealed class DialogModule_MakeRoot : Module
Expand Down
94 changes: 85 additions & 9 deletions CSharp/Library/Microsoft.Bot.Builder.Autofac/Microsoft.Bot.Builder.Autofac.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Bot.Builder.Autofac</RootNamespace>
<AssemblyName>Microsoft.Bot.Builder.Autofac</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -45,27 +45,101 @@
<HintPath>..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration" />
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Net.Http.4.3.1\lib\net46\System.Net.Http.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Base\Extensions.cs" />
Expand All @@ -76,7 +150,9 @@
<Compile Include="Scorables\Resolver.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
Expand All @@ -86,9 +162,9 @@
<Project>{cdfec7d6-847e-4c13-956b-0a960ae3eb60}</Project>
<Name>Microsoft.Bot.Builder</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Bot.Connector.NetFramework\Microsoft.Bot.Connector.csproj">
<Project>{df397efc-91db-4911-9971-c509926fc288}</Project>
<Name>Microsoft.Bot.Connector</Name>
<ProjectReference Include="..\Microsoft.Bot.Connector.Shared\Microsoft.Bot.Connector.Common.csproj">
<Project>{645862ff-bf5e-4d5b-b1b5-1462ededbb12}</Project>
<Name>Microsoft.Bot.Connector.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
8 changes: 4 additions & 4 deletions CSharp/Library/Microsoft.Bot.Builder.Autofac/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Resources;
using System.Reflection;
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand Down Expand Up @@ -33,8 +33,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.5.1.0")]
[assembly: AssemblyFileVersion("3.5.1.0")]
[assembly: AssemblyVersion("3.5.5.0")]
[assembly: AssemblyFileVersion("3.5.5.0")]

[assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")]
[assembly: InternalsVisibleTo("Microsoft.Bot.Sample.Tests")]
Expand Down
12 changes: 10 additions & 2 deletions CSharp/Library/Microsoft.Bot.Builder.Autofac/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
Loading

0 comments on commit 0123c41

Please sign in to comment.