971. 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.

971.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 DisableLogintoADXPortalduetoSecurityLevelRestricti-8BA0FDA5-AFC2-4BC4-A5B8-9327F94E5782.xaml Wed Dec 7 21:45:32 2016 UTC

971.2 Comparison summary

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

971.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

971.4 Active regular expressions

No regular expressions were active.

971.5 Comparison detail

        1   <Activity  x:Class="X rmWorkflow 8ba0fda5af c24bc4a5b8 9327f94e57 82" xmlns= "http://sc hemas.micr osoft.com/ netfx/2009 /xaml/acti vities" xm lns:mva="c lr-namespa ce:Microso ft.VisualB asic.Activ ities;asse mbly=Syste m.Activiti es, Versio n=4.0.0.0,  Culture=n eutral, Pu blicKeyTok en=31bf385 6ad364e35"  xmlns:mxs ="clr-name space:Micr osoft.Xrm. Sdk;assemb ly=Microso ft.Xrm.Sdk , Version= 8.0.0.0, C ulture=neu tral, Publ icKeyToken =31bf3856a d364e35" x mlns:mxsq= "clr-names pace:Micro soft.Xrm.S dk.Query;a ssembly=Mi crosoft.Xr m.Sdk, Ver sion=8.0.0 .0, Cultur e=neutral,  PublicKey Token=31bf 3856ad364e 35" xmlns: mxswa="clr -namespace :Microsoft .Xrm.Sdk.W orkflow.Ac tivities;a ssembly=Mi crosoft.Xr m.Sdk.Work flow, Vers ion=8.0.0. 0, Culture =neutral,  PublicKeyT oken=31bf3 856ad364e3 5" xmlns:s ="clr-name space:Syst em;assembl y=mscorlib , Version= 4.0.0.0, C ulture=neu tral, Publ icKeyToken =b77a5c561 934e089" x mlns:scg=" clr-namesp ace:System .Collectio ns.Generic ;assembly= mscorlib,  Version=4. 0.0.0, Cul ture=neutr al, Public KeyToken=b 77a5c56193 4e089" xml ns:sco="cl r-namespac e:System.C ollections .ObjectMod el;assembl y=mscorlib , Version= 4.0.0.0, C ulture=neu tral, Publ icKeyToken =b77a5c561 934e089" x mlns:srs=" clr-namesp ace:System .Runtime.S erializati on;assembl y=System.R untime.Ser ialization , Version= 4.0.0.0, C ulture=neu tral, Publ icKeyToken =b77a5c561 934e089" x mlns:this= "clr-names pace:" xml ns:x="http ://schemas .microsoft .com/winfx /2006/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 mWorkflow8 ba0fda5afc 24bc4a5b89 327f94e578 2.InputEnt ities>
        7       <InArg ument x:Ty peArgument s="scg:IDi ctionary(x :String, m xs:Entity) " />
        8     </this:X rmWorkflow 8ba0fda5af c24bc4a5b8 9327f94e57 82.InputEn tities>
        9     <this:Xr mWorkflow8 ba0fda5afc 24bc4a5b89 327f94e578 2.CreatedE ntities>
        10       <InArg ument x:Ty peArgument s="scg:IDi ctionary(x :String, m xs:Entity) " />
        11     </this:X rmWorkflow 8ba0fda5af c24bc4a5b8 9327f94e57 82.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: If th e contact  record sec urity clea rance is b elow a 2 t hen disabl e login to  ADX Porta l by setti ng login e nabled fla g ">
        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:O bject" Nam e="Conditi onBranchSt ep2_1" />
        22              <Variable  x:TypeArgu ments="x:O bject" Nam e="Conditi onBranchSt ep2_2" />
        23           </ sco:Collec tion>
        24           <s co:Collect ion x:Type Arguments= "Activity"  x:Key="Ac tivities">
        25              <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_1] ">
        26                <mxswa:G etEntityPr operty.Tar getType>
        27                  <InArg ument x:Ty peArgument s="s:Type" >
        28                    <mxs wa:Referen ceLiteral  x:TypeArgu ments="s:T ype">
        29                      <x :Null />
        30                    </mx swa:Refere nceLiteral >
        31                  </InAr gument>
        32                </mxswa: GetEntityP roperty.Ta rgetType>
        33              </mxswa:Ge tEntityPro perty>
        34              <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">
        35                <mxswa:A ctivityRef erence.Arg uments>
        36                  <InArg ument x:Ty peArgument s="x:Strin g" x:Key=" Expression Operator"> CreateCrmT ype</InArg ument>
        37                  <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>
        38                  <InArg ument x:Ty peArgument s="s:Type"  x:Key="Ta rgetType">
        39                    <mxs wa:Referen ceLiteral  x:TypeArgu ments="s:T ype" Value ="x:Int32"  />
        40                  </InAr gument>
        41                  <OutAr gument x:T ypeArgumen ts="x:Obje ct" x:Key= "Result">[ ConditionB ranchStep2 _2]</OutAr gument>
        42                </mxswa: ActivityRe ference.Ar guments>
        43              </mxswa:Ac tivityRefe rence>
        44              <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">
        45                <mxswa:A ctivityRef erence.Arg uments>
        46                  <InArg ument x:Ty peArgument s="mxsq:Co nditionOpe rator" x:K ey="Condit ionOperato r">LessTha n</InArgum ent>
        47                  <InArg ument x:Ty peArgument s="s:Objec t[]" x:Key ="Paramete rs">[New O bject() {  ConditionB ranchStep2 _2 }]</InA rgument>
        48                  <InArg ument x:Ty peArgument s="x:Objec t" x:Key=" Operand">[ ConditionB ranchStep2 _1]</InArg ument>
        49                  <OutAr gument x:T ypeArgumen ts="x:Bool ean" x:Key ="Result"> [Condition BranchStep 2_conditio n]</OutArg ument>
        50                </mxswa: ActivityRe ference.Ar guments>
        51              </mxswa:Ac tivityRefe rence>
        52              <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">
        53                <mxswa:A ctivityRef erence.Arg uments>
        54                  <InArg ument x:Ty peArgument s="x:Boole an" x:Key= "Condition ">[Conditi onBranchSt ep2_condit ion]</InAr gument>
        55                </mxswa: ActivityRe ference.Ar guments>
        56                <mxswa:A ctivityRef erence.Pro perties>
        57                  <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">
        58                    <mxs wa:Activit yReference .Propertie s>
        59                      <s co:Collect ion x:Type Arguments= "Variable"  x:Key="Va riables" / >
        60                      <s co:Collect ion x:Type Arguments= "Activity"  x:Key="Ac tivities">
        61                         <Sequence  DisplayNam e="UpdateS tep3: Set  the login  enabled fi eld to unc hecked">
        62                           <Sequenc e.Variable s>
        63                             <Varia ble x:Type Arguments= "x:Object"  Name="Upd ateStep3_1 " />
        64                             <Varia ble x:Type Arguments= "x:Object"  Name="Upd ateStep3_2 " />
        65                           </Sequen ce.Variabl es>
        66                           <Assign  x:TypeArgu ments="mxs :Entity" T o="[Create dEntities( &quot;prim aryEntity# Temp&quot; )]" Value= "[New Enti ty(&quot;c ontact&quo t;)]" />
        67                           <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]" />
        68                           <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 ="[UpdateS tep3_1]">
        69                             <mxswa :SetEntity Property.T argetType>
        70                               <InA rgument x: TypeArgume nts="s:Typ e">
        71                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Bool ean" />
        72                               </In Argument>
        73                             </mxsw a:SetEntit yProperty. TargetType >
        74                           </mxswa: SetEntityP roperty>
        75                           <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="[Update Step3_2]">
        76                             <mxswa :SetEntity Property.T argetType>
        77                               <InA rgument x: TypeArgume nts="s:Typ e">
        78                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Bool ean" />
        79                               </In Argument>
        80                             </mxsw a:SetEntit yProperty. TargetType >
        81                           </mxswa: SetEntityP roperty>
        82                           <mxswa:U pdateEntit y DisplayN ame="Updat eStep3" En tity="[Cre atedEntiti es(&quot;p rimaryEnti ty#Temp&qu ot;)]" Ent ityName="c ontact" />
        83                           <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 ;)]" />
        84                         </Sequence >
        85                         <Sequence  DisplayNam e="StopWor kflowStep6 ">
        86                           <Sequenc e.Variable s>
        87                             <Varia ble x:Type Arguments= "x:Object"  Name="Sto pWorkflowS tep6_1" />
        88                             <Varia ble x:Type Arguments= "x:String"  Default=" 82e8339a-7 109-4c95-b a83-e4b39e 916f41" Na me="stepLa belLabelId " />
        89                             <Varia ble x:Type Arguments= "x:String"  Name="ste pLabelDesc ription">
        90                               <Var iable.Defa ult>
        91                                 <L iteral x:T ypeArgumen ts="x:Stri ng" Value= "" />
        92                               </Va riable.Def ault>
        93                             </Vari able>
        94                             <Varia ble x:Type Arguments= "x:Int32"  Default="1 033" Name= "stepLabel LanguageCo de" />
        95                           </Sequen ce.Variabl es>
        96                           <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">
        97                             <mxswa :ActivityR eference.A rguments>
        98                               <InA rgument x: TypeArgume nts="x:Str ing" x:Key ="Expressi onOperator ">CreateCr mType</InA rgument>
        99                               <InA rgument x: TypeArgume nts="s:Obj ect[]" x:K ey="Parame ters">[New  Object()  { Microsof t.Xrm.Sdk. Workflow.W orkflowPro pertyType. String, "" , "String"  }]</InArg ument>
        100                               <InA rgument x: TypeArgume nts="s:Typ e" x:Key=" TargetType ">
        101                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Stri ng" />
        102                               </In Argument>
        103                               <Out Argument x :TypeArgum ents="x:Ob ject" x:Ke y="Result" >[StopWork flowStep6_ 1]</OutArg ument>
        104                             </mxsw a:Activity Reference. Arguments>
        105                           </mxswa: ActivityRe ference>
        106                           <Termina teWorkflow  DisplayNa me="StopWo rkflowStep 6" Excepti on="[New M icrosoft.X rm.Sdk.Inv alidPlugin ExecutionE xception(M icrosoft.X rm.Sdk.Ope rationStat us.Succeed ed)]" Reas on="[Direc tCast(Stop WorkflowSt ep6_1, Sys tem.String )]" />
        107                         </Sequence >
        108                      </ sco:Collec tion>
        109                    </mx swa:Activi tyReferenc e.Properti es>
        110                  </mxsw a:Activity Reference>
        111                  <x:Nul l x:Key="E lse" />
        112                </mxswa: ActivityRe ference.Pr operties>
        113              </mxswa:Ac tivityRefe rence>
        114              <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 ep4">
        115                <mxswa:A ctivityRef erence.Arg uments>
        116                  <InArg ument x:Ty peArgument s="x:Boole an" x:Key= "Condition ">True</In Argument>
        117                </mxswa: ActivityRe ference.Ar guments>
        118                <mxswa:A ctivityRef erence.Pro perties>
        119                  <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 tep4">
        120                    <mxs wa:Activit yReference .Propertie s>
        121                      <s co:Collect ion x:Type Arguments= "Variable"  x:Key="Va riables" / >
        122                      <s co:Collect ion x:Type Arguments= "Activity"  x:Key="Ac tivities">
        123                         <Sequence  DisplayNam e="StopWor kflowStep5 ">
        124                           <Sequenc e.Variable s>
        125                             <Varia ble x:Type Arguments= "x:Object"  Name="Sto pWorkflowS tep5_1" />
        126                             <Varia ble x:Type Arguments= "x:String"  Default=" 5d302275-1 442-49fb-8 8f9-588d9e df3e97" Na me="stepLa belLabelId " />
        127                             <Varia ble x:Type Arguments= "x:String"  Name="ste pLabelDesc ription">
        128                               <Var iable.Defa ult>
        129                                 <L iteral x:T ypeArgumen ts="x:Stri ng" Value= "" />
        130                               </Va riable.Def ault>
        131                             </Vari able>
        132                             <Varia ble x:Type Arguments= "x:Int32"  Default="1 033" Name= "stepLabel LanguageCo de" />
        133                           </Sequen ce.Variabl es>
        134                           <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">
        135                             <mxswa :ActivityR eference.A rguments>
        136                               <InA rgument x: TypeArgume nts="x:Str ing" x:Key ="Expressi onOperator ">CreateCr mType</InA rgument>
        137                               <InA rgument x: TypeArgume nts="s:Obj ect[]" x:K ey="Parame ters">[New  Object()  { Microsof t.Xrm.Sdk. Workflow.W orkflowPro pertyType. String, "" , "String"  }]</InArg ument>
        138                               <InA rgument x: TypeArgume nts="s:Typ e" x:Key=" TargetType ">
        139                                 <m xswa:Refer enceLitera l x:TypeAr guments="s :Type" Val ue="x:Stri ng" />
        140                               </In Argument>
        141                               <Out Argument x :TypeArgum ents="x:Ob ject" x:Ke y="Result" >[StopWork flowStep5_ 1]</OutArg ument>
        142                             </mxsw a:Activity Reference. Arguments>
        143                           </mxswa: ActivityRe ference>
        144                           <Termina teWorkflow  DisplayNa me="StopWo rkflowStep 5" Excepti on="[New M icrosoft.X rm.Sdk.Inv alidPlugin ExecutionE xception(M icrosoft.X rm.Sdk.Ope rationStat us.Succeed ed)]" Reas on="[Direc tCast(Stop WorkflowSt ep5_1, Sys tem.String )]" />
        145                         </Sequence >
        146                      </ sco:Collec tion>
        147                    </mx swa:Activi tyReferenc e.Properti es>
        148                  </mxsw a:Activity Reference>
        149                  <x:Nul l x:Key="E lse" />
        150                </mxswa: ActivityRe ference.Pr operties>
        151              </mxswa:Ac tivityRefe rence>
        152           </ sco:Collec tion>
        153         </mx swa:Activi tyReferenc e.Properti es>
        154       </mxsw a:Activity Reference>
        155     </mxswa: Workflow>
        156   </Activity >