970. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:41 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

970.1 Files compared

# Location File Last Modified
1 Wed Feb 1 19:57:41 2017 UTC
2 C:\Araxis_Merge_Comprasion\Pub_re\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM\trunk\Solutions\BTSSS_1_0_0\Workflows ClearLoginLogonEnabledfieldwhenSecurityLevelfallsb-E7D224F6-E4B7-E611-80C8-000D3A17B8CA.xaml Wed Dec 7 21:45:32 2016 UTC

970.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 0 0
Changed 0 0
Inserted 1 151
Removed 0 0

970.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

970.4 Active regular expressions

No regular expressions were active.

970.5 Comparison detail

        1   <Activity  x:Class="X rmWorkflow e7d224f6e4 b7e61180c8 000d3a17b8 ca" xmlns= "http://sc hemas.micr osoft.com/ netfx/2009 /xaml/acti vities" xm lns:mcwc=" clr-namesp ace:Micros oft.Crm.Wo rkflow.Cli entActivit ies;assemb ly=Microso ft.Crm.Wor kflow, Ver sion=8.0.0 .0, Cultur e=neutral,  PublicKey Token=31bf 3856ad364e 35" xmlns: mva="clr-n amespace:M icrosoft.V isualBasic .Activitie s;assembly =System.Ac tivities,  Version=4. 0.0.0, Cul ture=neutr al, Public KeyToken=3 1bf3856ad3 64e35" xml ns:mxs="cl r-namespac e:Microsof t.Xrm.Sdk; assembly=M icrosoft.X rm.Sdk, Ve rsion=8.0. 0.0, Cultu re=neutral , PublicKe yToken=31b f3856ad364 e35" xmlns :mxsq="clr -namespace :Microsoft .Xrm.Sdk.Q uery;assem bly=Micros oft.Xrm.Sd k, Version =8.0.0.0,  Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35"  xmlns:mxsw a="clr-nam espace:Mic rosoft.Xrm .Sdk.Workf low.Activi ties;assem bly=Micros oft.Xrm.Sd k.Workflow , Version= 8.0.0.0, C ulture=neu tral, Publ icKeyToken =31bf3856a d364e35" x mlns:s="cl r-namespac e:System;a ssembly=ms corlib, Ve rsion=4.0. 0.0, Cultu re=neutral , PublicKe yToken=b77 a5c561934e 089" xmlns :scg="clr- namespace: System.Col lections.G eneric;ass embly=msco rlib, Vers ion=4.0.0. 0, Culture =neutral,  PublicKeyT oken=b77a5 c561934e08 9" xmlns:s co="clr-na mespace:Sy stem.Colle ctions.Obj ectModel;a ssembly=ms corlib, Ve rsion=4.0. 0.0, Cultu re=neutral , PublicKe yToken=b77 a5c561934e 089" xmlns :srs="clr- namespace: System.Run time.Seria lization;a ssembly=Sy stem.Runti me.Seriali zation, Ve rsion=4.0. 0.0, Cultu re=neutral , PublicKe yToken=b77 a5c561934e 089" xmlns :this="clr -namespace :" xmlns:x ="http://s chemas.mic rosoft.com /winfx/200 6/xaml">
        2     <x:Membe rs>
        3       <x:Pro perty Name ="InputEnt ities" Typ e="InArgum ent(scg:ID ictionary( x:String,  mxs:Entity ))" />
        4       <x:Pro perty Name ="CreatedE ntities" T ype="InArg ument(scg: IDictionar y(x:String , mxs:Enti ty))" />
        5     </x:Memb ers>
        6     <this:Xr mWorkflowe 7d224f6e4b 7e61180c80 00d3a17b8c a.InputEnt ities>
        7       <InArg ument x:Ty peArgument s="scg:IDi ctionary(x :String, m xs:Entity) " />
        8     </this:X rmWorkflow e7d224f6e4 b7e61180c8 000d3a17b8 ca.InputEn tities>
        9     <this:Xr mWorkflowe 7d224f6e4b 7e61180c80 00d3a17b8c a.CreatedE ntities>
        10       <InArg ument x:Ty peArgument s="scg:IDi ctionary(x :String, m xs:Entity) " />
        11     </this:X rmWorkflow e7d224f6e4 b7e61180c8 000d3a17b8 ca.Created Entities>
        12     <mva:Vis ualBasic.S ettings>As sembly ref erences an d imported  namespace s for inte rnal imple mentation< /mva:Visua lBasic.Set tings>
        13     <mxswa:W orkflow>
        14       <mxswa :ActivityR eference A ssemblyQua lifiedName ="Microsof t.Crm.Work flow.Activ ities.Cond itionSeque nce, Micro soft.Crm.W orkflow, V ersion=8.0 .0.0, Cult ure=neutra l, PublicK eyToken=31 bf3856ad36 4e35" Disp layName="C onditionSt ep1">
        15         <mxs wa:Activit yReference .Arguments >
        16           <I nArgument  x:TypeArgu ments="x:B oolean" x: Key="Wait" >False</In Argument>
        17         </mx swa:Activi tyReferenc e.Argument s>
        18         <mxs wa:Activit yReference .Propertie s>
        19           <s co:Collect ion x:Type Arguments= "Variable"  x:Key="Va riables">
        20              <Variable  x:TypeArgu ments="x:B oolean" De fault="Fal se" Name=" ConditionB ranchStep2 _condition " />
        21              <Variable  x:TypeArgu ments="x:B oolean" De fault="Fal se" Name=" ConditionB ranchStep2 _1" />
        22              <Variable  x:TypeArgu ments="x:O bject" Nam e="Conditi onBranchSt ep2_2" />
        23              <Variable  x:TypeArgu ments="x:O bject" Nam e="Conditi onBranchSt ep2_3" />
        24              <Variable  x:TypeArgu ments="x:B oolean" De fault="Fal se" Name=" ConditionB ranchStep2 _4" />
        25              <Variable  x:TypeArgu ments="x:O bject" Nam e="Conditi onBranchSt ep2_5" />
        26           </ sco:Collec tion>
        27           <s co:Collect ion x:Type Arguments= "Activity"  x:Key="Ac tivities">
        28              <mxswa:Get EntityProp erty Attri bute="btss s_security clearancel evel" Enti ty="[Input Entities(& quot;prima ryEntity&q uot;)]" En tityName=" contact" V alue="[Con ditionBran chStep2_2] ">
        29                <mxswa:G etEntityPr operty.Tar getType>
        30                  <InArg ument x:Ty peArgument s="s:Type" >
        31                    <mxs wa:Referen ceLiteral  x:TypeArgu ments="s:T ype">
        32                      <x :Null />
        33                    </mx swa:Refere nceLiteral >
        34                  </InAr gument>
        35                </mxswa: GetEntityP roperty.Ta rgetType>
        36              </mxswa:Ge tEntityPro perty>
        37              <mxswa:Act ivityRefer ence Assem blyQualifi edName="Mi crosoft.Cr m.Workflow .Activitie s.Evaluate Expression , Microsof t.Crm.Work flow, Vers ion=8.0.0. 0, Culture =neutral,  PublicKeyT oken=31bf3 856ad364e3 5" Display Name="Eval uateExpres sion">
        38                <mxswa:A ctivityRef erence.Arg uments>
        39                  <InArg ument x:Ty peArgument s="x:Strin g" x:Key=" Expression Operator"> CreateCrmT ype</InArg ument>
        40                  <InArg ument x:Ty peArgument s="s:Objec t[]" x:Key ="Paramete rs">[New O bject() {  Microsoft. Xrm.Sdk.Wo rkflow.Wor kflowPrope rtyType.In teger, "2"  }]</InArg ument>
        41                  <InArg ument x:Ty peArgument s="s:Type"  x:Key="Ta rgetType">
        42                    <mxs wa:Referen ceLiteral  x:TypeArgu ments="s:T ype" Value ="x:Int32"  />
        43                  </InAr gument>
        44                  <OutAr gument x:T ypeArgumen ts="x:Obje ct" x:Key= "Result">[ ConditionB ranchStep2 _3]</OutAr gument>
        45                </mxswa: ActivityRe ference.Ar guments>
        46              </mxswa:Ac tivityRefe rence>
        47              <mxswa:Act ivityRefer ence Assem blyQualifi edName="Mi crosoft.Cr m.Workflow .Activitie s.Evaluate Condition,  Microsoft .Crm.Workf low, Versi on=8.0.0.0 , Culture= neutral, P ublicKeyTo ken=31bf38 56ad364e35 " DisplayN ame="Evalu ateConditi on">
        48                <mxswa:A ctivityRef erence.Arg uments>
        49                  <InArg ument x:Ty peArgument s="mxsq:Co nditionOpe rator" x:K ey="Condit ionOperato r">LessTha n</InArgum ent>
        50                  <InArg ument x:Ty peArgument s="s:Objec t[]" x:Key ="Paramete rs">[New O bject() {  ConditionB ranchStep2 _3 }]</InA rgument>
        51                  <InArg ument x:Ty peArgument s="x:Objec t" x:Key=" Operand">[ ConditionB ranchStep2 _2]</InArg ument>
        52                  <OutAr gument x:T ypeArgumen ts="x:Bool ean" x:Key ="Result"> [Condition BranchStep 2_1]</OutA rgument>
        53                </mxswa: ActivityRe ference.Ar guments>
        54              </mxswa:Ac tivityRefe rence>
        55              <mxswa:Get EntityProp erty Attri bute="btss s_security clearancel evel" Enti ty="[Input Entities(& quot;prima ryEntity&q uot;)]" En tityName=" contact" V alue="[Con ditionBran chStep2_5] ">
        56                <mxswa:G etEntityPr operty.Tar getType>
        57                  <InArg ument x:Ty peArgument s="s:Type" >
        58                    <mxs wa:Referen ceLiteral  x:TypeArgu ments="s:T ype">
        59                      <x :Null />
        60                    </mx swa:Refere nceLiteral >
        61                  </InAr gument>
        62                </mxswa: GetEntityP roperty.Ta rgetType>
        63              </mxswa:Ge tEntityPro perty>
        64              <mxswa:Act ivityRefer ence Assem blyQualifi edName="Mi crosoft.Cr m.Workflow .Activitie s.Evaluate Condition,  Microsoft .Crm.Workf low, Versi on=8.0.0.0 , Culture= neutral, P ublicKeyTo ken=31bf38 56ad364e35 " DisplayN ame="Evalu ateConditi on">
        65                <mxswa:A ctivityRef erence.Arg uments>
        66                  <InArg ument x:Ty peArgument s="mxsq:Co nditionOpe rator" x:K ey="Condit ionOperato r">Null</I nArgument>
        67                  <x:Nul l x:Key="P arameters"  />
        68                  <InArg ument x:Ty peArgument s="x:Objec t" x:Key=" Operand">[ ConditionB ranchStep2 _5]</InArg ument>
        69                  <OutAr gument x:T ypeArgumen ts="x:Bool ean" x:Key ="Result"> [Condition BranchStep 2_4]</OutA rgument>
        70                </mxswa: ActivityRe ference.Ar guments>
        71              </mxswa:Ac tivityRefe rence>
        72              <mxswa:Act ivityRefer ence Assem blyQualifi edName="Mi crosoft.Cr m.Workflow .Activitie s.Evaluate LogicalCon dition, Mi crosoft.Cr m.Workflow , Version= 8.0.0.0, C ulture=neu tral, Publ icKeyToken =31bf3856a d364e35" D isplayName ="Evaluate LogicalCon dition">
        73                <mxswa:A ctivityRef erence.Arg uments>
        74                  <InArg ument x:Ty peArgument s="mxsq:Lo gicalOpera tor" x:Key ="LogicalO perator">O r</InArgum ent>
        75                  <InArg ument x:Ty peArgument s="x:Boole an" x:Key= "LeftOpera nd">[Condi tionBranch Step2_1]</ InArgument >
        76                  <InArg ument x:Ty peArgument s="x:Boole an" x:Key= "RightOper and">[Cond itionBranc hStep2_4]< /InArgumen t>
        77                  <OutAr gument x:T ypeArgumen ts="x:Bool ean" x:Key ="Result"> [Condition BranchStep 2_conditio n]</OutArg ument>
        78                </mxswa: ActivityRe ference.Ar guments>
        79              </mxswa:Ac tivityRefe rence>
        80              <mxswa:Act ivityRefer ence Assem blyQualifi edName="Mi crosoft.Cr m.Workflow .Activitie s.Conditio nBranch, M icrosoft.C rm.Workflo w, Version =8.0.0.0,  Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35"  DisplayNam e="Conditi onBranchSt ep2">
        81                <mxswa:A ctivityRef erence.Arg uments>
        82                  <InArg ument x:Ty peArgument s="x:Boole an" x:Key= "Condition ">[Conditi onBranchSt ep2_condit ion]</InAr gument>
        83                </mxswa: ActivityRe ference.Ar guments>
        84                <mxswa:A ctivityRef erence.Pro perties>
        85                  <mxswa :ActivityR eference x :Key="Then " Assembly QualifiedN ame="Micro soft.Crm.W orkflow.Ac tivities.C omposite,  Microsoft. Crm.Workfl ow, Versio n=8.0.0.0,  Culture=n eutral, Pu blicKeyTok en=31bf385 6ad364e35"  DisplayNa me="Condit ionBranchS tep2">
        86                    <mxs wa:Activit yReference .Propertie s>
        87                      <s co:Collect ion x:Type Arguments= "Variable"  x:Key="Va riables" / >
        88                      <s co:Collect ion x:Type Arguments= "Activity"  x:Key="Ac tivities">
        89                         <Sequence  DisplayNam e="SetAttr ibuteValue Step4">
        90                           <Sequenc e.Variable s>
        91                             <Varia ble x:Type Arguments= "x:Object"  Name="Set AttributeV alueStep4_ 1" />
        92                           </Sequen ce.Variabl es>
        93                           <Assign  x:TypeArgu ments="mxs :Entity" T o="[Create dEntities( &quot;prim aryEntity# Temp&quot; )]" Value= "[New Enti ty(&quot;c ontact&quo t;)]" />
        94                           <Assign  x:TypeArgu ments="s:G uid" To="[ CreatedEnt ities(&quo t;primaryE ntity#Temp &quot;).Id ]" Value=" [InputEnti ties(&quot ;primaryEn tity&quot; ).Id]" />
        95                           <mxswa:A ctivityRef erence Ass emblyQuali fiedName=" Microsoft. Crm.Workfl ow.Activit ies.Evalua teExpressi on, Micros oft.Crm.Wo rkflow, Ve rsion=8.0. 0.0, Cultu re=neutral , PublicKe yToken=31b f3856ad364 e35" Displ ayName="Ev aluateExpr ession">
        96                             <mxswa :ActivityR eference.A rguments>
        97                               <InA rgument x: TypeArgume nts="x:Str ing" x:Key ="Expressi onOperator ">CreateCr mType</InA rgument>
        98                               <InA rgument x: TypeArgume nts="s:Obj ect[]" x:K ey="Parame ters">[New  Object()  { Microsof t.Xrm.Sdk. Workflow.W orkflowPro pertyType. Boolean, " 0" }]</InA rgument>
        99                               <InA rgument x: TypeArgume nts="s:Typ e" x:Key=" TargetType ">
        100                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Bool ean" />
        101                               </In Argument>
        102                               <Out Argument x :TypeArgum ents="x:Ob ject" x:Ke y="Result" >[SetAttri buteValueS tep4_1]</O utArgument >
        103                             </mxsw a:Activity Reference. Arguments>
        104                           </mxswa: ActivityRe ference>
        105                           <mxswa:S etEntityPr operty Att ribute="ad x_identity _logonenab led" Entit y="[Create dEntities( &quot;prim aryEntity# Temp&quot; )]" Entity Name="cont act" Value ="[SetAttr ibuteValue Step4_1]">
        106                             <mxswa :SetEntity Property.T argetType>
        107                               <InA rgument x: TypeArgume nts="s:Typ e">
        108                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Bool ean" />
        109                               </In Argument>
        110                             </mxsw a:SetEntit yProperty. TargetType >
        111                           </mxswa: SetEntityP roperty>
        112                           <mcwc:Se tAttribute Value Disp layName="S etAttribut eValueStep 4" Entity= "[CreatedE ntities(&q uot;primar yEntity#Te mp&quot;)] " EntityNa me="contac t" />
        113                           <Assign  x:TypeArgu ments="mxs :Entity" T o="[InputE ntities(&q uot;primar yEntity&qu ot;)]" Val ue="[Creat edEntities (&quot;pri maryEntity #Temp&quot ;)]" />
        114                         </Sequence >
        115                         <Sequence  DisplayNam e="SetAttr ibuteValue Step6">
        116                           <Sequenc e.Variable s>
        117                             <Varia ble x:Type Arguments= "x:Object"  Name="Set AttributeV alueStep6_ 1" />
        118                           </Sequen ce.Variabl es>
        119                           <Assign  x:TypeArgu ments="mxs :Entity" T o="[Create dEntities( &quot;prim aryEntity# Temp&quot; )]" Value= "[New Enti ty(&quot;c ontact&quo t;)]" />
        120                           <Assign  x:TypeArgu ments="s:G uid" To="[ CreatedEnt ities(&quo t;primaryE ntity#Temp &quot;).Id ]" Value=" [InputEnti ties(&quot ;primaryEn tity&quot; ).Id]" />
        121                           <mxswa:A ctivityRef erence Ass emblyQuali fiedName=" Microsoft. Crm.Workfl ow.Activit ies.Evalua teExpressi on, Micros oft.Crm.Wo rkflow, Ve rsion=8.0. 0.0, Cultu re=neutral , PublicKe yToken=31b f3856ad364 e35" Displ ayName="Ev aluateExpr ession">
        122                             <mxswa :ActivityR eference.A rguments>
        123                               <InA rgument x: TypeArgume nts="x:Str ing" x:Key ="Expressi onOperator ">CreateCr mType</InA rgument>
        124                               <InA rgument x: TypeArgume nts="s:Obj ect[]" x:K ey="Parame ters">[New  Object()  { Microsof t.Xrm.Sdk. Workflow.W orkflowPro pertyType. Boolean, " 0" }]</InA rgument>
        125                               <InA rgument x: TypeArgume nts="s:Typ e" x:Key=" TargetType ">
        126                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Bool ean" />
        127                               </In Argument>
        128                               <Out Argument x :TypeArgum ents="x:Ob ject" x:Ke y="Result" >[SetAttri buteValueS tep6_1]</O utArgument >
        129                             </mxsw a:Activity Reference. Arguments>
        130                           </mxswa: ActivityRe ference>
        131                           <mxswa:S etEntityPr operty Att ribute="ad x_logonena bled" Enti ty="[Creat edEntities (&quot;pri maryEntity #Temp&quot ;)]" Entit yName="con tact" Valu e="[SetAtt ributeValu eStep6_1]" >
        132                             <mxswa :SetEntity Property.T argetType>
        133                               <InA rgument x: TypeArgume nts="s:Typ e">
        134                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Bool ean" />
        135                               </In Argument>
        136                             </mxsw a:SetEntit yProperty. TargetType >
        137                           </mxswa: SetEntityP roperty>
        138                           <mcwc:Se tAttribute Value Disp layName="S etAttribut eValueStep 6" Entity= "[CreatedE ntities(&q uot;primar yEntity#Te mp&quot;)] " EntityNa me="contac t" />
        139                           <Assign  x:TypeArgu ments="mxs :Entity" T o="[InputE ntities(&q uot;primar yEntity&qu ot;)]" Val ue="[Creat edEntities (&quot;pri maryEntity #Temp&quot ;)]" />
        140                         </Sequence >
        141                      </ sco:Collec tion>
        142                    </mx swa:Activi tyReferenc e.Properti es>
        143                  </mxsw a:Activity Reference>
        144                  <x:Nul l x:Key="E lse" />
        145                </mxswa: ActivityRe ference.Pr operties>
        146              </mxswa:Ac tivityRefe rence>
        147           </ sco:Collec tion>
        148         </mx swa:Activi tyReferenc e.Properti es>
        149       </mxsw a:Activity Reference>
        150     </mxswa: Workflow>
        151   </Activity >