Fix for #305

Author: nycdotnet

tasks/modules/optionsResolver.js

@@ -129,7 +129,8 @@ function resolveAndWarnOnConfigurationIssues(task: ITargetOptions,
 
     function getAdditionalWarnings(task: any, target: any, targetName: string) {
       const additionalWarnings = [];
-      if (((task && task.src) || (target && target.src)) &&
+
+      if (((task && task.src && targetName !== 'src') || (target && target.src)) &&
           ((task && task.files) || (target && target.files))) {
         additionalWarnings.push(`Warning: In task "${targetName}", either "files" or "src" should be used - not both.`);
       }
@@ -139,7 +140,6 @@ function resolveAndWarnOnConfigurationIssues(task: ITargetOptions,
         additionalWarnings.push(`Warning: In task "${targetName}", either "files" or "vs" should be used - not both.`);
       }
 
-
       if (usingDestArray(task) || usingDestArray(target)) {
         additionalWarnings.push(`Warning: target "${targetName}" has an array specified for the files.dest property.` +
             `  This is not supported.  Taking first element and ignoring the rest.`);

tasks/modules/optionsResolver.ts

@@ -88,6 +88,12 @@ const config : {[name: string]: IGruntTargetOptions} = {
   "reference set to undefined": <any>{
     reference: undefined
   },
+  "files minimalist": <any>{
+    files: [{
+      src: "source/**/*.ts",
+      dest: "build"
+    }]
+  },
   "vs minimalist": <any>{
     vs: "test/vsproj/testproject.csproj"
   },
@@ -192,6 +198,18 @@ export var tests : nodeunit.ITestGroup = {
           test.ok(allWarnings.indexOf('It is also the wrong case and should be sourceMap') > -1);
           test.done();
         }).catch((err) => {test.ifError(err); test.done();});
+    },
+    "No warning on target named src that uses files": (test: nodeunit.Test) => {
+        test.expect(1);
+
+        const cfg = getConfig("files minimalist", true);
+        const fakeTask: any = {src: {}};
+        const result = or.resolveAsync(fakeTask, cfg, "src").then((result) => {
+          let allWarnings = result.warnings.join('\n');
+          console.log(allWarnings);
+          test.strictEqual(allWarnings.length, 0, "expected no warnings.");
+          test.done();
+        }).catch((err) => {test.ifError(err); test.done();});
     }
   },