Resolve environment variables in CollectFiles