migrate expression namespace from Microsoft.Bot.Expressions to AdaptiveExpressions (#3375)

CodeCoverage.runsettings

@@ -30,7 +30,7 @@
                 <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Twilio.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Slack.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Facebook.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Expressions.dll$</ModulePath>
+                <ModulePath>.*\AdaptiveExpressions.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Adaptive.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Declarative.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.LanguageGeneration.dll$</ModulePath>                

Microsoft.Bot.Builder.Skills.sln

@@ -80,9 +80,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.TestB
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Dialogs.Declarative", "libraries\Microsoft.Bot.Builder.Dialogs.Declarative\Microsoft.Bot.Builder.Dialogs.Declarative.csproj", "{1BC05915-044E-4776-8956-B44BBEFF2F84}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Expressions.Tests", "tests\Microsoft.Bot.Expressions.Tests\Microsoft.Bot.Expressions.Tests.csproj", "{AE3FC7F6-B212-4438-B1D7-C121BB4C15ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveExpressions.Tests", "tests\AdaptiveExpressions.Tests\AdaptiveExpressions.Tests.csproj", "{AE3FC7F6-B212-4438-B1D7-C121BB4C15ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Expressions", "libraries\Microsoft.Bot.Expressions\Microsoft.Bot.Expressions.csproj", "{8DC1257B-7650-40EB-97A2-C1CBA306DA6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveExpressions", "libraries\AdaptiveExpressions\AdaptiveExpressions.csproj", "{8DC1257B-7650-40EB-97A2-C1CBA306DA6A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Dialogs.Declarative.Tests", "tests\Microsoft.Bot.Builder.Dialogs.Declarative.Tests\Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj", "{D5E70443-4BA2-42ED-992A-010268440B08}"
 EndProject

Microsoft.Bot.Builder.sln

@@ -80,9 +80,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.TestB
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Dialogs.Declarative", "libraries\Microsoft.Bot.Builder.Dialogs.Declarative\Microsoft.Bot.Builder.Dialogs.Declarative.csproj", "{1BC05915-044E-4776-8956-B44BBEFF2F84}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Expressions.Tests", "tests\Microsoft.Bot.Expressions.Tests\Microsoft.Bot.Expressions.Tests.csproj", "{AE3FC7F6-B212-4438-B1D7-C121BB4C15ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveExpressions.Tests", "tests\AdaptiveExpressions.Tests\AdaptiveExpressions.Tests.csproj", "{AE3FC7F6-B212-4438-B1D7-C121BB4C15ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Expressions", "libraries\Microsoft.Bot.Expressions\Microsoft.Bot.Expressions.csproj", "{8DC1257B-7650-40EB-97A2-C1CBA306DA6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveExpressions", "libraries\AdaptiveExpressions\AdaptiveExpressions.csproj", "{8DC1257B-7650-40EB-97A2-C1CBA306DA6A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Dialogs.Declarative.Tests", "tests\Microsoft.Bot.Builder.Dialogs.Declarative.Tests\Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj", "{D5E70443-4BA2-42ED-992A-010268440B08}"
 EndProject

libraries/AdaptiveExpressions/AdaptiveExpressions.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DocumentationFile>bin\$(Configuration)\netstandard2.0\Microsoft.Bot.Expressions.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\netstandard2.0\AdaptiveExpressions.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -20,7 +20,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.Bot.Expressions</PackageId>
+    <PackageId>AdaptiveExpressions</PackageId>
     <Description>This library implements Microsoft Bot Builder Expression evaluator for .NET</Description>
     <Summary>This library implements Microsoft Bot Builder Expression evaluator for .NET</Summary>
   </PropertyGroup>

libraries/AdaptiveExpressions/CommonRegex.cs

@@ -6,7 +6,7 @@ using System.Text.RegularExpressions;
 using Antlr4.Runtime;
 using Antlr4.Runtime.Tree;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Convert PCRE regex string to <see cref="Regex"/> object.

libraries/AdaptiveExpressions/Constant.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Constant expression.

libraries/AdaptiveExpressions/Converters/ArrayExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/BoolExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/EnumExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/ExpressionPropertyConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/IntExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/NumberExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/ObjectExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/StringExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Converters/ValueExpressionConverter.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Converters
+namespace AdaptiveExpressions.Converters
 {
     /// <summary>
     /// Converter which allows json to be expression to object or static object.

libraries/AdaptiveExpressions/Expression.cs

@@ -4,10 +4,10 @@
 using System;
 using System.Linq;
 using System.Text;
-using Microsoft.Bot.Expressions.Memory;
+using AdaptiveExpressions.Memory;
 using Newtonsoft.Json;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Type expected from evaluating an expression.

libraries/AdaptiveExpressions/ExpressionEvaluator.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Bot.Expressions.Memory;
+using AdaptiveExpressions.Memory;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Delegate for doing static validation on an expression.

libraries/AdaptiveExpressions/ExpressionFunctions.cs

@@ -14,12 +14,12 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Linq;
-using Microsoft.Bot.Expressions.Memory;
+using AdaptiveExpressions.Memory;
 using Microsoft.Recognizers.Text.DataTypes.TimexExpression;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Definition of default built-in functions for expressions.

libraries/AdaptiveExpressions/ExpressionProperties/ArrayExpression.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// ArrayExpression - represents a property which is either a value of array of T or a string expression to bind to a array of T.

libraries/AdaptiveExpressions/ExpressionProperties/BoolExpression.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Bot.Expressions.Converters;
+using AdaptiveExpressions.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// BoolExpression - represents a property which is either a boolean or a string expression which resolves to a boolean.

libraries/AdaptiveExpressions/ExpressionProperties/EnumExpression.cs

@@ -4,7 +4,7 @@
 using System;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// EnumExpression - represents a property which is either a enum(T) or a string expression which resolves to a enum(T).

libraries/AdaptiveExpressions/ExpressionProperties/ExpressionProperty.cs

@@ -5,7 +5,7 @@ using Microsoft.Win32.SafeHandles;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// Base class which defines a Expression or value for a property.

libraries/AdaptiveExpressions/ExpressionProperties/IntExpression.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Bot.Expressions.Converters;
+using AdaptiveExpressions.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// IntExpression - represents a property which is either an Integer or a string expression which resolves to a Integer.

libraries/AdaptiveExpressions/ExpressionProperties/NumberExpression.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Bot.Expressions.Converters;
+using AdaptiveExpressions.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// NumberExpression - represents a property which is either a float or a string expression which resolves to a float.

libraries/AdaptiveExpressions/ExpressionProperties/ObjectExpression.cs

@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// ObjectExpression(T) - represents a property which is either an object of type T or a string expression which resolves to a object of type T.

libraries/AdaptiveExpressions/ExpressionProperties/StringExpression.cs

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Bot.Expressions.Converters;
+using AdaptiveExpressions.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// StringExpression - represents a property which is either a string value or a string expression.

libraries/AdaptiveExpressions/ExpressionProperties/ValueExpression.cs

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Bot.Expressions.Converters;
+using AdaptiveExpressions.Converters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Properties
+namespace AdaptiveExpressions.Properties
 {
     /// <summary>
     /// ValueExpression - represents a property which is an object of any kind or a string expression.

libraries/AdaptiveExpressions/ExpressionType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Built-in expression types.

libraries/AdaptiveExpressions/Extensions.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Extension methods for detecting or value testing of various types.

libraries/AdaptiveExpressions/ExtensionsRewriters.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Extension methods for manipulation of <see cref="Expression"/> values.

libraries/AdaptiveExpressions/IComponentExpressionFunctions.cs

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 using System.Collections.Generic;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Interface for adding custom functions to the expression engine.

libraries/AdaptiveExpressions/IExpressionParser.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Interface to parse a string into an <see cref="Expression"/>.

libraries/AdaptiveExpressions/LRUCache.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// A least-recently-used cache stored like a dictionary.

libraries/AdaptiveExpressions/Memory/IMemory.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Bot.Expressions.Memory
+namespace AdaptiveExpressions.Memory
 {
     /// <summary>
     /// Memory interface.

libraries/AdaptiveExpressions/Memory/SimpleObjectMemory.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions.Memory
+namespace AdaptiveExpressions.Memory
 {
     /// <summary>
     /// Simple implement of <see cref="IMemory"/>.

libraries/AdaptiveExpressions/Memory/StackedMemory.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Bot.Expressions.Memory
+namespace AdaptiveExpressions.Memory
 {
     /// <summary>
     /// Stack implements of <see cref="IMemory"/>.

libraries/AdaptiveExpressions/RegexErrorListener.cs

@@ -5,7 +5,7 @@ using System;
 using Antlr4.Runtime;
 using Antlr4.Runtime.Misc;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     internal class RegexErrorListener : BaseErrorListener
     {

libraries/AdaptiveExpressions/TimeZoneConverter.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Time zone converter.
@@ -58,7 +58,7 @@ namespace Microsoft.Bot.Expressions
             var assembly = Assembly.GetExecutingAssembly();
             string[] names = assembly.GetManifestResourceNames();
 
-            using (var sr = new StreamReader(assembly.GetManifestResourceStream("Microsoft.Bot.Expressions.WindowsIanaMapping")))
+            using (var sr = new StreamReader(assembly.GetManifestResourceStream("AdaptiveExpressions.WindowsIanaMapping")))
             {
                 string line;
                 while ((line = sr.ReadLine()) != null)

libraries/AdaptiveExpressions/TriggerTrees/Clause.cs

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     using System.Collections.Generic;
     using System.Linq;
     using System.Runtime.Serialization;
     using System.Text;
-    using Microsoft.Bot.Expressions;
+    using AdaptiveExpressions;
 
     public class Clause : Expression
     {

libraries/AdaptiveExpressions/TriggerTrees/Extensions.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     /// <summary>
     /// Extension method to swap between <see cref="RelationshipType"/> "Generalizes" and "Specializes".

libraries/AdaptiveExpressions/TriggerTrees/IOptimizer.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.Bot.Expressions;
+using AdaptiveExpressions;
 
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     /// <summary>
     /// Optimize a clause by rewriting it.

libraries/AdaptiveExpressions/TriggerTrees/Node.cs

@@ -15,7 +15,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     /// <summary>
     /// Node in a trigger tree.

libraries/AdaptiveExpressions/TriggerTrees/Quantifier.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     /// <summary>
     /// Type of quantifier for expanding trigger expressions.

libraries/AdaptiveExpressions/TriggerTrees/RelationshipType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     /// <summary>
     /// Relationship between trigger expressions.

libraries/AdaptiveExpressions/TriggerTrees/Trigger.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     /// <summary>
     /// A trigger is a combination of a trigger expression and the corresponding action.

libraries/AdaptiveExpressions/TriggerTrees/TriggerTree.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Microsoft.Bot.Expressions.TriggerTrees
+namespace AdaptiveExpressions.TriggerTrees
 {
     // Each trigger is normalized to disjunctive normal form and then expanded with quantifiers.
     // Each of those clauses is then put into a DAG where the most restrictive clauses are at the bottom.

libraries/AdaptiveExpressions/parser/ExpressionEngine.cs

@@ -5,13 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using AdaptiveExpressions.parser;
 using Antlr4.Runtime;
 using Antlr4.Runtime.Misc;
 using Antlr4.Runtime.Tree;
-using Microsoft.Bot.Expressions.parser;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Parser to turn strings into an <see cref="Expression"/>.

libraries/AdaptiveExpressions/parser/ParserErrorListener.cs

@@ -6,7 +6,7 @@ using System.Data;
 using Antlr4.Runtime;
 using Antlr4.Runtime.Misc;
 
-namespace Microsoft.Bot.Expressions
+namespace AdaptiveExpressions
 {
     /// <summary>
     /// Expression parser error listener.

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/BaseInvokeDialog.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/BeginDialog.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/BreakLoop.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/CancelAllDialogs.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/Case.cs

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 
 using System.Collections.Generic;
-using Microsoft.Bot.Expressions;
+using AdaptiveExpressions;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/CodeAction.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/ContinueLoop.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/DebugBreak.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/DeleteActivity.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/DeleteProperties.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/DeleteProperty.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EditActions.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EditArray.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EmitEvent.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EndDialog.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EndTurn.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/ForEach.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/ForEachPage.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/GetActivityMembers.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/GetConversationMembers.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/GotoAction.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/HttpRequest.cs

@@ -10,8 +10,8 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.TraceExtensions;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/IfCondition.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/LogAction.cs

@@ -5,8 +5,8 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Templates;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/PropertyAssignment.cs

@@ -1,7 +1,7 @@
 // Licensed under the MIT License.
 // Copyright (c) Microsoft Corporation. All rights reserved.
 
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/RepeatDialog.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/ReplaceDialog.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SendActivity.cs

@@ -6,8 +6,8 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Templates;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SetProperties.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SetProperty.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SignOutUser.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SwitchCondition.cs

@@ -6,8 +6,8 @@ using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/TraceActivity.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/UpdateActivity.cs

@@ -5,8 +5,8 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Templates;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveComponentRegistration.cs

@@ -2,6 +2,8 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
+using AdaptiveExpressions;
+using AdaptiveExpressions.Converters;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Actions;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Conditions;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Converters;
@@ -19,8 +21,6 @@ using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
 using Microsoft.Bot.Builder.Dialogs.Memory;
 using Microsoft.Bot.Builder.Dialogs.Memory.PathResolvers;
 using Microsoft.Bot.Builder.Dialogs.Memory.Scopes;
-using Microsoft.Bot.Expressions;
-using Microsoft.Bot.Expressions.Converters;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveDialog.cs

@@ -9,10 +9,10 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Conditions;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Selectors;
 using Microsoft.Bot.Builder.Dialogs.Debugging;
-using Microsoft.Bot.Expressions;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Generators/TemplateEngineLanguageGenerator.cs

@@ -7,7 +7,6 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
 using Microsoft.Bot.Builder.LanguageGeneration;
-using Microsoft.Bot.Expressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Generators

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/ITriggerSelector.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Conditions;
-using Microsoft.Bot.Expressions;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive
 {

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/Ask.cs

@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Adaptive.Templates;
-using Microsoft.Bot.Expressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/AttachmentInput.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/ChoiceInput.cs

@@ -6,8 +6,8 @@ using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Choices;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 using static Microsoft.Recognizers.Text.Culture;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/ConfirmInput.cs

@@ -5,8 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Choices;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Microsoft.Recognizers.Text.Choice;
 using Newtonsoft.Json;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/DateTimeInput.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Microsoft.Recognizers.Text.DateTime;
 using Newtonsoft.Json;
 using static Microsoft.Recognizers.Text.Culture;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/InputDialog.cs

@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Builder.Dialogs.Choices;
-using Microsoft.Bot.Expressions;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/NumberInput.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Microsoft.Recognizers.Text.Number;
 using Newtonsoft.Json;
 using static Microsoft.Recognizers.Text.Culture;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/OAuthInput.cs

@@ -7,8 +7,8 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using AdaptiveExpressions.Properties;
 using Microsoft.Bot.Connector;
-using Microsoft.Bot.Expressions.Properties;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/TextInput.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.Bot.Expressions.Properties;
+using AdaptiveExpressions.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Input