diff --git a/src/Test/TestCases.Workflows/TestXamls/SalaryCalculation.xaml b/src/Test/TestCases.Workflows/TestXamls/SalaryCalculation.xaml
index 247570c6..f508d076 100644
--- a/src/Test/TestCases.Workflows/TestXamls/SalaryCalculation.xaml
+++ b/src/Test/TestCases.Workflows/TestXamls/SalaryCalculation.xaml
@@ -11,8 +11,8 @@
-
-
+
+
[SalaryStats.MinSalary]
@@ -37,6 +37,6 @@
[(Employee1.Salary + Employee2.Salary) / 2.0]
-
+
\ No newline at end of file
diff --git a/src/Test/TestCases.Workflows/WF4Samples/Expressions.cs b/src/Test/TestCases.Workflows/WF4Samples/Expressions.cs
index 6e23ffe1..d1f0f190 100644
--- a/src/Test/TestCases.Workflows/WF4Samples/Expressions.cs
+++ b/src/Test/TestCases.Workflows/WF4Samples/Expressions.cs
@@ -8,6 +8,7 @@
using System.Activities.XamlIntegration;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Globalization;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
@@ -256,8 +257,8 @@ static Activity FuncCodeOnlyWorkflow() => CreateSequence(
CreateVariable(name: "SalaryStats", @default: ctx => new SalaryStats()),
CreateVariable(name: "average")},
activities: new Activity[]{
- CreateWriteLine(text: ctx => ctx.GetValue("Employee1").FirstName + " " + ctx.GetValue("Employee1").LastName + " earns " + ctx.GetValue("Employee1").Salary.ToString("$0.00")),
- CreateWriteLine(text: ctx => ctx.GetValue("Employee2").FirstName + " " + ctx.GetValue("Employee2").LastName + " earns " + ctx.GetValue("Employee2").Salary.ToString("$0.00")),
+ CreateWriteLine(text: ctx => ctx.GetValue("Employee1").FirstName + " " + ctx.GetValue("Employee1").LastName + " earns " + ctx.GetValue("Employee1").Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
+ CreateWriteLine(text: ctx => ctx.GetValue("Employee2").FirstName + " " + ctx.GetValue("Employee2").LastName + " earns " + ctx.GetValue("Employee2").Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
CreateAssign(to: (OutArgument)new FuncReference("SalaryStats", s => s.MinSalary, (s, value) =>
{
s.MinSalary = value;
@@ -275,8 +276,10 @@ static Activity FuncCodeOnlyWorkflow() => CreateSequence(
}), value: (InArgument)(Func)(ctx => (ctx.GetValue("Employee1").Salary + ctx.GetValue("Employee2").Salary) / 2.0)),
CreateAssign(to: (OutArgument)new Reference("average"), value: (InArgument)(Func)
(ctx => ctx.GetValue("SalaryStats").AvgSalary)),
- CreateWriteLine(text: ctx => string.Format("Salary statistics: minimum salary is {0:$0.00}, maximum salary is {1:$0.00}, average salary is {2:$0.00}",
- ctx.GetValue("SalaryStats").MinSalary, ctx.GetValue("SalaryStats").MaxSalary, ctx.GetValue("SalaryStats").AvgSalary))});
+ CreateWriteLine(text: ctx => string.Format("Salary statistics: minimum salary is {0}, maximum salary is {1}, average salary is {2}",
+ ctx.GetValue("SalaryStats").MinSalary.ToString("$0.00", CultureInfo.InvariantCulture),
+ ctx.GetValue("SalaryStats").MaxSalary.ToString("$0.00", CultureInfo.InvariantCulture),
+ ctx.GetValue("SalaryStats").AvgSalary.ToString("$0.00", CultureInfo.InvariantCulture)))});
static Variable CreateVariable(string name = null, Func @default = null)
{
var variable = new Variable();
@@ -402,11 +405,11 @@ private Activity CreateCodeOnlyWorkflow()
{
new WriteLine()
{
- Text = new LambdaValue(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00")),
+ Text = new LambdaValue(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new WriteLine()
{
- Text = new LambdaValue(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00")),
+ Text = new LambdaValue(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new Assign()
{
@@ -426,8 +429,10 @@ private Activity CreateCodeOnlyWorkflow()
new WriteLine()
{
Text = new LambdaValue(ctx => String.Format(
- "Salary statistics: minimum salary is {0:$0.00}, maximum salary is {1:$0.00}, average salary is {2:$0.00}",
- stats.Get(ctx).MinSalary, stats.Get(ctx).MaxSalary, stats.Get(ctx).AvgSalary))
+ "Salary statistics: minimum salary is {0}, maximum salary is {1}, average salary is {2}",
+ stats.Get(ctx).MinSalary.ToString("$0.00", CultureInfo.InvariantCulture),
+ stats.Get(ctx).MaxSalary.ToString("$0.00", CultureInfo.InvariantCulture),
+ stats.Get(ctx).AvgSalary.ToString("$0.00", CultureInfo.InvariantCulture)))
}
},
};
@@ -458,11 +463,11 @@ private Activity CreateXamlSerializableCodeWorkflow()
{
new WriteLine()
{
- Text = ExpressionServices.Convert(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00")),
+ Text = ExpressionServices.Convert(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new WriteLine()
{
- Text = ExpressionServices.Convert(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00")),
+ Text = ExpressionServices.Convert(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new Assign()
{
@@ -482,8 +487,10 @@ private Activity CreateXamlSerializableCodeWorkflow()
new WriteLine()
{
Text = ExpressionServices.Convert(ctx => String.Format(
- "Salary statistics: minimum salary is {0:$0.00}, maximum salary is {1:$0.00}, average salary is {2:$0.00}",
- stats.Get(ctx).MinSalary, stats.Get(ctx).MaxSalary, stats.Get(ctx).AvgSalary))
+ "Salary statistics: minimum salary is {0}, maximum salary is {1}, average salary is {2}",
+ stats.Get(ctx).MinSalary.ToString("$0.00", CultureInfo.InvariantCulture),
+ stats.Get(ctx).MaxSalary.ToString("$0.00", CultureInfo.InvariantCulture),
+ stats.Get(ctx).AvgSalary.ToString("$0.00", CultureInfo.InvariantCulture)))
}
},
};