diff --git a/Granfeldt.FIM.ActivityLibrary/Activity.CodeRun/Activity.CodeRun.cs b/Granfeldt.FIM.ActivityLibrary/Activity.CodeRun/Activity.CodeRun.cs
index 0ac1b7e..7a210f2 100644
--- a/Granfeldt.FIM.ActivityLibrary/Activity.CodeRun/Activity.CodeRun.cs
+++ b/Granfeldt.FIM.ActivityLibrary/Activity.CodeRun/Activity.CodeRun.cs
@@ -1,326 +1,331 @@
-// January 15, 2013 | Soren Granfeldt
+// january 15, 2013 | Soren Granfeldt
// - initial version
-// January 17, 2013 | Soren Granfeldt
+// january 17, 2013 | Soren Granfeldt
// - changed activity name from CodeActivity to CodeRunActivity
// due to clashes with built-in naming convention
-// January 18, 2013 | Soren Granfeldt
+// january 18, 2013 | Soren Granfeldt
// - changed update to use helper update activity
-// December 16, 2015 | soren granfeldt
-// - changed logging to tuse tracer
+// december 16, 2015 | soren granfeldt
+// - changed logging to use tracer
+// february 16, 2015 | soren granfeldt
+// - added additional logging information
+using Microsoft.ResourceManagement.WebServices.WSResourceManagement;
+using Microsoft.ResourceManagement.Workflow.Activities;
using System;
using System.CodeDom.Compiler;
-using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.ComponentModel.Design;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Web;
using System.Workflow.Activities;
-using System.Workflow.Activities.Rules;
using System.Workflow.ComponentModel;
-using System.Workflow.ComponentModel.Compiler;
-using System.Workflow.ComponentModel.Design;
-using System.Workflow.ComponentModel.Serialization;
-using System.Workflow.Runtime;
-using Microsoft.ResourceManagement.WebServices.WSResourceManagement;
-using Microsoft.ResourceManagement.Workflow.Activities;
namespace Granfeldt.FIM.ActivityLibrary
{
- public partial class CodeRunActivity : SequenceActivity
- {
+ public partial class CodeRunActivity : SequenceActivity
+ {
- #region Properties
+ #region Properties
- public static DependencyProperty TargetResourceProperty = DependencyProperty.Register("TargetResource", typeof(Microsoft.ResourceManagement.WebServices.WSResourceManagement.ResourceType), typeof(Granfeldt.FIM.ActivityLibrary.CodeRunActivity));
- [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Visible)]
- [BrowsableAttribute(true)]
- [CategoryAttribute("Parameters")]
- public Microsoft.ResourceManagement.WebServices.WSResourceManagement.ResourceType TargetResource
- {
- get
- {
- return ((ResourceType)(base.GetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.TargetResourceProperty)));
- }
- set
- {
- base.SetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.TargetResourceProperty, value);
- }
- }
+ public static DependencyProperty TargetResourceProperty = DependencyProperty.Register("TargetResource", typeof(Microsoft.ResourceManagement.WebServices.WSResourceManagement.ResourceType), typeof(Granfeldt.FIM.ActivityLibrary.CodeRunActivity));
+ [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Visible)]
+ [BrowsableAttribute(true)]
+ [CategoryAttribute("Parameters")]
+ public Microsoft.ResourceManagement.WebServices.WSResourceManagement.ResourceType TargetResource
+ {
+ get
+ {
+ return ((ResourceType)(base.GetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.TargetResourceProperty)));
+ }
+ set
+ {
+ base.SetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.TargetResourceProperty, value);
+ }
+ }
+ ///
+ /// The title of the current instance of the workflow
+ ///
+ public static DependencyProperty TitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(CodeRunActivity));
+ [Description("Title")]
+ [Category("Title Category")]
+ [Browsable(true)]
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+ public string Title
+ {
+ get
+ {
+ return ((string)(base.GetValue(CodeRunActivity.TitleProperty)));
+ }
+ set
+ {
+ base.SetValue(CodeRunActivity.TitleProperty, value);
+ }
+ }
- ///
- /// The title of the current instance of the workflow
- ///
- public static DependencyProperty TitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(CodeRunActivity));
- [Description("Title")]
- [Category("Title Category")]
- [Browsable(true)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
- public string Title
- {
- get
- {
- return ((string)(base.GetValue(CodeRunActivity.TitleProperty)));
- }
- set
- {
- base.SetValue(CodeRunActivity.TitleProperty, value);
- }
- }
+ public static DependencyProperty ReferencesProperty = DependencyProperty.Register("References", typeof(string[]), typeof(CodeRunActivity));
+ [Description("References")]
+ [Category("References Category")]
+ [Browsable(true)]
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+ public string[] References
+ {
+ get
+ {
+ return ((string[])(base.GetValue(CodeRunActivity.ReferencesProperty)));
+ }
+ set
+ {
+ base.SetValue(CodeRunActivity.ReferencesProperty, value);
+ }
+ }
- public static DependencyProperty ReferencesProperty = DependencyProperty.Register("References", typeof(string[]), typeof(CodeRunActivity));
- [Description("References")]
- [Category("References Category")]
- [Browsable(true)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
- public string[] References
- {
- get
- {
- return ((string[])(base.GetValue(CodeRunActivity.ReferencesProperty)));
- }
- set
- {
- base.SetValue(CodeRunActivity.ReferencesProperty, value);
- }
- }
+ public static DependencyProperty ParametersProperty = DependencyProperty.Register("Parameters", typeof(string[]), typeof(CodeRunActivity));
+ [Description("Parameters")]
+ [Category("Parameters Category")]
+ [Browsable(true)]
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+ public string[] Parameters
+ {
+ get
+ {
+ return ((string[])(base.GetValue(CodeRunActivity.ParametersProperty)));
+ }
+ set
+ {
+ base.SetValue(CodeRunActivity.ParametersProperty, value);
+ }
+ }
- public static DependencyProperty ParametersProperty = DependencyProperty.Register("Parameters", typeof(string[]), typeof(CodeRunActivity));
- [Description("Parameters")]
- [Category("Parameters Category")]
- [Browsable(true)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
- public string[] Parameters
- {
- get
- {
- return ((string[])(base.GetValue(CodeRunActivity.ParametersProperty)));
- }
- set
- {
- base.SetValue(CodeRunActivity.ParametersProperty, value);
- }
- }
+ public static DependencyProperty ResolvedParameterExpressionProperty = DependencyProperty.Register("ResolvedParameterExpression", typeof(System.String), typeof(Granfeldt.FIM.ActivityLibrary.CodeRunActivity));
+ [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Visible)]
+ [BrowsableAttribute(true)]
+ [CategoryAttribute("Misc")]
+ public String ResolvedParameterExpression
+ {
+ get
+ {
+ return ((string)(base.GetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.ResolvedParameterExpressionProperty)));
+ }
+ set
+ {
+ base.SetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.ResolvedParameterExpressionProperty, value);
+ }
+ }
- public static DependencyProperty ResolvedParameterExpressionProperty = DependencyProperty.Register("ResolvedParameterExpression", typeof(System.String), typeof(Granfeldt.FIM.ActivityLibrary.CodeRunActivity));
- [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Visible)]
- [BrowsableAttribute(true)]
- [CategoryAttribute("Misc")]
- public String ResolvedParameterExpression
- {
- get
- {
- return ((string)(base.GetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.ResolvedParameterExpressionProperty)));
- }
- set
- {
- base.SetValue(Granfeldt.FIM.ActivityLibrary.CodeRunActivity.ResolvedParameterExpressionProperty, value);
- }
- }
+ public static DependencyProperty CodeProperty = DependencyProperty.Register("Code", typeof(string), typeof(CodeRunActivity));
+ [Description("Code")]
+ [Category("Code Category")]
+ [Browsable(true)]
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+ public string Code
+ {
+ get
+ {
+ return ((string)(base.GetValue(CodeRunActivity.CodeProperty)));
+ }
+ set
+ {
+ base.SetValue(CodeRunActivity.CodeProperty, value);
+ }
+ }
- public static DependencyProperty CodeProperty = DependencyProperty.Register("Code", typeof(string), typeof(CodeRunActivity));
- [Description("Code")]
- [Category("Code Category")]
- [Browsable(true)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
- public string Code
- {
- get
- {
- return ((string)(base.GetValue(CodeRunActivity.CodeProperty)));
- }
- set
- {
- base.SetValue(CodeRunActivity.CodeProperty, value);
- }
- }
+ public static DependencyProperty DestinationProperty = DependencyProperty.Register("Destination", typeof(string), typeof(CodeRunActivity));
+ [Description("Destination")]
+ [Category("Destination Category")]
+ [Browsable(true)]
+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+ public string Destination
+ {
+ get
+ {
+ return ((string)(base.GetValue(CodeRunActivity.DestinationProperty)));
+ }
+ set
+ {
+ base.SetValue(CodeRunActivity.DestinationProperty, value);
+ }
+ }
- public static DependencyProperty DestinationProperty = DependencyProperty.Register("Destination", typeof(string), typeof(CodeRunActivity));
- [Description("Destination")]
- [Category("Destination Category")]
- [Browsable(true)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
- public string Destination
- {
- get
- {
- return ((string)(base.GetValue(CodeRunActivity.DestinationProperty)));
- }
- set
- {
- base.SetValue(CodeRunActivity.DestinationProperty, value);
- }
- }
+ #endregion
- #endregion
+ ///
+ /// Contains in-memory compiled code
+ ///
+ private static object compiled = null;
+ ///
+ /// List of unresolved parameters
+ ///
+ List UnresolvedParameters = null;
+ ///
+ /// List of resolved parameters. These are passed to the default code method
+ ///
+ List