From 2e6b0da534591badf2bcd9e78360e155ed78d217 Mon Sep 17 00:00:00 2001 From: Alexandru Oltean Date: Tue, 12 Sep 2023 17:26:01 +0300 Subject: [PATCH] Fix validation errors [STUD-65311] [STUD-65835] --- .../Validation/CSharpExpressionValidator.cs | 4 ++-- src/UiPath.Workflow/Validation/VBExpressionValidator.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/UiPath.Workflow/Validation/CSharpExpressionValidator.cs b/src/UiPath.Workflow/Validation/CSharpExpressionValidator.cs index f58ce1ac..68a3d2c5 100644 --- a/src/UiPath.Workflow/Validation/CSharpExpressionValidator.cs +++ b/src/UiPath.Workflow/Validation/CSharpExpressionValidator.cs @@ -21,8 +21,8 @@ namespace System.Activities.Validation; public class CSharpExpressionValidator : RoslynExpressionValidator { private static readonly Lazy s_instance = new(() => new(s_defaultReferencedAssemblies)); - private const string _valueValidationTemplate = "public static Expression> CreateExpression{1}() => ({2}) => {3};//activityId:{4}"; - private const string _delegateValueValidationTemplate = "{0}\npublic static Expression<{1}<{2}>> CreateExpression{3}() => ({4}) => {5};//activityId:{6}"; + private const string _valueValidationTemplate = "public static System.Linq.Expressions.Expression> CreateExpression{1}() => ({2}) => {3};//activityId:{4}"; + private const string _delegateValueValidationTemplate = "{0}\npublic static System.Linq.Expressions.Expression<{1}<{2}>> CreateExpression{3}() => ({4}) => {5};//activityId:{6}"; private const string _referenceValidationTemplate = "public static {0} IsLocation{1}() => ({2}) => {3} = default({4});//activityId:{5}"; private static readonly CompilerHelper s_compilerHelper = new CSharpCompilerHelper(); diff --git a/src/UiPath.Workflow/Validation/VBExpressionValidator.cs b/src/UiPath.Workflow/Validation/VBExpressionValidator.cs index 3a3465eb..884bb1ac 100644 --- a/src/UiPath.Workflow/Validation/VBExpressionValidator.cs +++ b/src/UiPath.Workflow/Validation/VBExpressionValidator.cs @@ -20,9 +20,9 @@ public class VbExpressionValidator : RoslynExpressionValidator private static readonly Lazy s_instance = new(() => new(s_defaultReferencedAssemblies)); private static readonly CompilerHelper s_compilerHelper = new VBCompilerHelper(); - private const string _valueValidationTemplate = "Public Shared Function CreateExpression{0}() As Expression(Of Func(Of {1}))'activityId:{4}\nReturn Function({2}) ({3})'activityId:{4}\nEnd Function"; - private const string _delegateValueValidationTemplate = "{0}\nPublic Shared Function CreateExpression{1}() As Expression(Of {2}(Of {3}))'activityId:{6}\nReturn Function({4}) ({5})'activityId:{6}\nEnd Function"; - private const string _referenceValidationTemplate = "Public Shared Function IsLocation{0}() As {1}'activityId:{4}\nReturn Function({2}) as Action'activityId:{3}\nReturn Sub() {3} = CType(Nothing, {4})'activityId:{5}\nEnd Function'activityId:{4}\nEnd Function"; + private const string _valueValidationTemplate = "Public Shared Function CreateExpression{0}() As System.Linq.Expressions.Expression(Of System.Func(Of {1}))'activityId:{4}\nReturn Function({2}) ({3})'activityId:{4}\nEnd Function"; + private const string _delegateValueValidationTemplate = "{0}\nPublic Shared Function CreateExpression{1}() As System.Linq.Expressions.Expression(Of {2}(Of {3}))'activityId:{6}\nReturn Function({4}) ({5})'activityId:{6}\nEnd Function"; + private const string _referenceValidationTemplate = "Public Shared Function IsLocation{0}() As {1}'activityId:{5}\nReturn Function({2}) as System.Action'activityId:{5}\nReturn Sub() {3} = CType(Nothing, {4})'activityId:{5}\nEnd Function'activityId:{5}\nEnd Function"; private static readonly VisualBasicParseOptions s_vbScriptParseOptions = new(kind: SourceCodeKind.Script, languageVersion: LanguageVersion.Latest); @@ -113,7 +113,7 @@ protected override string CreateValueCode(string types, string names, string cod protected override string CreateReferenceCode(string types, string names, string code, string activityId, string returnType, int index) { var actionDefinition = !string.IsNullOrWhiteSpace(types) - ? $"Action(Of {string.Join(Comma, types)})" + ? $"Action(Of {string.Join(Comma, types)})" : "Action"; return string.Format(_referenceValidationTemplate, index, actionDefinition, names, code, returnType, activityId); }