Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CodeCoverage.runsettings
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Bot.Builder.Skills.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Bot.Builder.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand All @@ -20,7 +20,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Microsoft.Bot.Expressions</PackageId>
<PackageId>AdaptiveExpressions</PackageId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be Adaptive.Expressions with a period. Adaptive already has a number of a packages which use the dot nomenclature
Adaptive.WPF
Adaptive.Xaml
etc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm..Actually, they are AdaptiveCards.WPF, AdaptiveCards.Xaml etc.
Do we want Adaptive or AdaptiveCards?


In reply to: 377424557 [](ancestors = 377424557)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vishwacsena maybe we should confirm this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, let @vishwacsena to confirm, i thought we should call this AdapativeExpression

<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Antlr4.Runtime;
using Antlr4.Runtime.Tree;

namespace Microsoft.Bot.Expressions
namespace AdaptiveExpressions
{
/// <summary>
/// Convert PCRE regex string to <see cref="Regex"/> object.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;

namespace Microsoft.Bot.Expressions
namespace AdaptiveExpressions
{
/// <summary>
/// Extension methods for detecting or value testing of various types.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Collections.Generic;

namespace Microsoft.Bot.Expressions
namespace AdaptiveExpressions
{
/// <summary>
/// A least-recently-used cache stored like a dictionary.
Expand Down
Loading