Commit3f01dde

dotnet-automerge-bot

authored

Merge pull requestdotnet#5750 from Microsoft/merges/master-to-dev16.0

Merge master to dev16.0

2 parentsbbb2c2f +5d1843b commit3f01ddeCopy full SHA for 3f01dde

File tree

-6

lines changed

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,15 @@ module Scripting =`
`60`	`60`
`61`	`61`	`let(++)a b= Path.Combine(a,b)`
`62`	`62`
`63`		`-letgetBasenamea= Path.GetFileNameWithoutExtension a`
`64`		`-letgetFullPath a= Path.GetFullPath a`
`65`		`-letgetFilenamea= Path.GetFileName a`
`66`		`-letgetDirectoryNamea= Path.GetDirectoryName a`
	`63`	`+letgetBasename(a:string)= Path.GetFileNameWithoutExtension(a)`
	`64`	`+letgetFullPath a= Path.GetFullPath(a)`
	`65`	`+letgetFilename(a:string)= Path.GetFileName(a)`
	`66`	`+letgetDirectoryName(a:string)= Path.GetDirectoryName(a)`
`67`	`67`
`68`	`68`	`letcopyFile source dir=`
`69`	`69`	`letdest=`
`70`	`70`	`ifnot(Directory.Exists dir)then Directory.CreateDirectory dir\|>ignore`
`71`		`-letresult= Path.Combine(dir,Path.GetFileName source)`
	`71`	`+letresult= Path.Combine(dir,getFilename source)`
`72`	`72`	`result`
`73`	`73`	`//printfn "Copy %s --> %s" source dest`
`74`	`74`	`File.Copy(source, dest,true)`
`@@ -96,7 +96,7 @@ module Scripting =`
`96`	`96`	`letprocessExePath baseDir exe=`
`97`	`97`	`if Path.IsPathRooted(exe)then exe`
`98`	`98`	`else`
`99`		`-matchPath.GetDirectoryName(exe)with`
	`99`	`+matchgetDirectoryNameexewith`
`100`	`100`	`\|""-> exe`
`101`	`101`	`\|_-> Path.Combine(baseDir,exe)\|> Path.GetFullPath`
`102`	`102`

Comments

(0)