Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge temporary assembly Expressions.Properties into Expressions #3365

Merged
merged 4 commits into from
Feb 10, 2020

Conversation

tomlm
Copy link
Contributor

@tomlm tomlm commented Feb 8, 2020

  • Switch to string Interpolation instead of LGFile
  • Cleaned up semantics around switchcondition (it's not a stringExpression) and case (it's always a constant).
  • Moved Evaluate() from extension method to LGFile

@tomlm tomlm added adaptive R8 Release 8 - March 16th, 2020 labels Feb 8, 2020
@coveralls
Copy link
Collaborator

coveralls commented Feb 8, 2020

Pull Request Test Coverage Report for Build 104851

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 49 unchanged lines in 10 files lost coverage.
  • Overall coverage increased (+1.7%) to 79.372%

Files with Coverage Reduction New Missed Lines %
/libraries/Microsoft.Bot.Builder.Dialogs/ObjectPath.cs 1 86.46%
/libraries/Microsoft.Bot.Builder.Dialogs/Prompts/OAuthPrompt.cs 1 56.4%
/libraries/Microsoft.Bot.Builder/Inspection/InspectionMiddleware.cs 1 78.89%
/libraries/Microsoft.Bot.Expressions/ExpressionFunctions.cs 1 93.25%
/libraries/Microsoft.Bot.Expressions/LRUCache.cs 1 82.93%
/libraries/Microsoft.Bot.Expressions/TriggerTrees/Trigger.cs 1 85.09%
/libraries/Microsoft.Bot.Builder.Azure/CosmosDbStorageOptions.cs 2 75.0%
/libraries/Microsoft.Bot.Builder/MemoryTranscriptStore.cs 2 86.09%
/libraries/Microsoft.Bot.Builder.LanguageGeneration/LGFile.cs 13 87.86%
/libraries/Microsoft.Bot.Expressions/Expression.cs 26 72.86%
Totals Coverage Status
Change from base Build 104840: 1.7%
Covered Lines: 10701
Relevant Lines: 13482

💛 - Coveralls

@fuselabs
Copy link
Collaborator

fuselabs commented Feb 8, 2020

✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.Luis.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.QnA.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.ApplicationInsights.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Azure.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Dialogs.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.AspNet.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.TemplateManager.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Testing.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Configuration.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Connector.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Schema.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Streaming.dll compared against version 4.6.3

…ays to make it consistent on build servers
@fuselabs
Copy link
Collaborator

fuselabs commented Feb 8, 2020

✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.Luis.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.QnA.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.ApplicationInsights.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Azure.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Dialogs.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.AspNet.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.TemplateManager.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Testing.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Configuration.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Connector.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Schema.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Streaming.dll compared against version 4.6.3

@chrimc62
Copy link
Contributor

using Newtonsoft.Json;

Did you decide to keep this namespace?


Refers to: libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/SwitchCondition.cs:11 in bac6832. [](commit_id = bac6832, deletion_comment = False)

@@ -38,7 +38,7 @@ public SwitchCondition([CallerFilePath] string callerPath = "", [CallerLineNumbe
/// Value Expression against memory. This value expression will be combined with value expression in case statements to make a bool expression.
/// </value>
[JsonProperty("condition")]
public ValueExpression Condition { get; set; }
public Expression Condition { get; set; }
Copy link
Contributor

Choose a reason for hiding this comment

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

Expression [](start = 15, length = 10)

You want to require an expression?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it doesn't make any sense to say
switch (13)
or
switch("Hello")

"luis": {
"sandwich_en-us_lu": "236ff454-e019-4ab3-ad5f-0ae22d65ad33"
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you delete these? What is our policy around these? We need at least one checked-in for the mock stuff to work, but we also need people to be able to update the mock. Whose settings win?

Copy link
Contributor

@chrimc62 chrimc62 left a comment

Choose a reason for hiding this comment

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

:shipit:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
R8 Release 8 - March 16th, 2020
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants