Commitfe9e609

authored

Merge pull requestdotnet#4043 from Microsoft/merges/master-to-dev15.6-20171201-080043

Merge master to dev15.6

2 parents8c65e33 +56fb8e3 commitfe9e609Copy full SHA for fe9e609

File tree

+11

-11

lines changed

+11

-11

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,14 +103,14 @@ ${buildPath}build.cmd ${buildFlavor} ${build_args}""")`
`103`	`103`	`Utilities.setMachineAffinity(newJob, os, affinity)`
`104`	`104`	`Utilities.standardJobSetup(newJob, project, isPullRequest,"*/${branch}")`
`105`	`105`
`106`		`-if (build_args!="none") {`
`107`		`-Utilities.addArchival(newJob,"tests/TestResults/.","", skipIfNoTestFiles,false)`
`108`		`-if (configuration=="Release_fcs") {`
`109`		`-Utilities.addArchival(newJob,"Release/fcs/**")`
`110`		`- }`
`111`		`-else {`
`112`		`-Utilities.addArchival(newJob,"${buildFlavor}/**")`
`113`		`- }`
	`106`	`+if (build_args!="none") {`
	`107`	`+Utilities.addArchival(newJob,"tests/TestResults/.","", skipIfNoTestFiles,false)`
	`108`	`+if (configuration=="Release_fcs") {`
	`109`	`+Utilities.addArchival(newJob,"Release/**")`
	`110`	`+ }`
	`111`	`+else {`
	`112`	`+Utilities.addArchival(newJob,"${buildFlavor}/**")`
	`113`	`+ }`
`114`	`114`	`}`
`115`	`115`	`if (isPullRequest) {`
`116`	`116`	`Utilities.addGithubPRTriggerForBranch(newJob, branch,"${os}${configuration} Build")`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3384,10 +3384,10 @@ let decodeILAttribData (ilg: ILGlobals) (ca: ILAttribute) =`
`3384`	`3384`	`letn,sigptr= sigptr_get_i32 bytes sigptr`
`3385`	`3385`	`if n=0xFFFFFFFFthen ILAttribElem.Null,sigptrelse`
`3386`	`3386`	`let recparseElems acc n sigptr=`
`3387`		`-if n=0then List.rev accelse`
	`3387`	`+if n=0then List.rev acc, sigptrelse`
`3388`	`3388`	`letv,sigptr= parseVal elemTy sigptr`
`3389`	`3389`	`parseElems(v::acc)(n-1) sigptr`
`3390`		`-letelems= parseElems[] n sigptr`
	`3390`	`+letelems,sigptr= parseElems[] n sigptr`
`3391`	`3391`	`ILAttribElem.Array(elemTy,elems), sigptr`
`3392`	`3392`	`\| ILType.Value_->(* assume it is an enumeration*)`
`3393`	`3393`	`letn,sigptr= sigptr_get_i32 bytes sigptr`
`@@ -3409,7 +3409,7 @@ let decodeILAttribData (ilg: ILGlobals) (ca: ILAttribute) =`
`3409`	`3409`	`letet,sigptr= sigptr_get_u8 bytes sigptr`
`3410`	`3410`	`// We have a named value`
`3411`	`3411`	`letty,sigptr=`
`3412`		`-if(0x50=(int et)\|\|0x55=(int et))then`
	`3412`	`+if((0x50 = (int et) \|\|)0x55=(int et))then`
`3413`	`3413`	`letqualified_tname,sigptr= sigptr_get_serstring bytes sigptr`
`3414`	`3414`	`letunqualified_tname,rest=`
`3415`	`3415`	`letpieces= qualified_tname.Split(',')`

Comments

(0)