From 6964123159f9d557c999d2b5090936c6f8e950f4 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Thu, 20 Oct 2016 10:22:00 -0700
Subject: [PATCH] ExtraArgs, Project, TypeCheck, and Version (beta1)

---
 README.md                                     | 28 +++++++++++--
 TSLint.MSBuild.nuspec                         |  2 +-
 gulpfile.js                                   |  2 +-
 package.json                                  |  2 +-
 src/build/TSLint.MSBuild.targets              | 10 +++--
 test/TSLintArgs/TSLintArgs/TSLintArgs.csproj  |  5 ++-
 test/TSLintVersion/TSLintVersion.sln          | 13 +++++++
 .../TSlintVersion/TSLintVersion.csproj        | 39 +++++++++++++++++++
 .../node_modules/tslint/lib/tslint-cli.js     |  1 +
 .../node_modules/tslint/lib/tslint-cli.js     |  1 +
 .../node_modules/tslint/lib/tslint-cli.js     |  1 +
 .../node_modules/tslint/lib/tslint-cli.js     |  1 +
 12 files changed, 93 insertions(+), 12 deletions(-)
 create mode 100644 test/TSLintVersion/TSLintVersion.sln
 create mode 100644 test/TSLintVersion/TSlintVersion/TSLintVersion.csproj
 create mode 100644 test/TSLintVersion/packages/tslint.0.4.5/tools/node_modules/tslint/lib/tslint-cli.js
 create mode 100644 test/TSLintVersion/packages/tslint.1.11.4/tools/node_modules/tslint/lib/tslint-cli.js
 create mode 100644 test/TSLintVersion/packages/tslint.1.12.2/tools/node_modules/tslint/lib/tslint-cli.js
 create mode 100644 test/TSLintVersion/packages/tslint.1.3.5/tools/node_modules/tslint/lib/tslint-cli.js

diff --git a/README.md b/README.md
index 919cfbe..5e112ec 100644
--- a/README.md
+++ b/README.md
@@ -33,12 +33,12 @@ Read the [TSLint documentation](https://github.com/palantir/tslint) for TSLint-s
         <tr>
             <th><code>TSLintExclude</code></th>
             <td>Globs of file names to exclude.</td>
-            <td><em>(blank)</em></td>
+            <td><em><code>(blank)</code></em></td>
         </tr>
         <tr>
             <th><code>TSLintRulesDirectory</code></th>
             <td>Directories for user-created rules</td>
-            <td><em>(blank)</em></td>
+            <td><em><code>(blank)</code></em></td>
         </tr>
     </tbody>
 </table>
@@ -69,7 +69,7 @@ Note that to use special characters (such as `*` wildcards) in `TSLintExclude` y
         <tr>
             <th><code>TSLintConfig</code></th>
             <td>Path to a specific tslint.json.</td>
-            <td><em>(blank)</em></td>
+            <td><em><code>(blank)</code></em></td>
         </tr>
         <tr>
             <th><code>TSLintCli</code></th>
@@ -81,15 +81,35 @@ Note that to use special characters (such as `*` wildcards) in `TSLintExclude` y
             <td>Whether to skip running TSLint.</td>
             <td><code>false</code></td>
         </tr>
+        <tr>
+            <th><code>TSLintExtraArgs</code></th>
+            <td>Any extra arguments to pass to the TSLint CLI.</td>
+            <td><code>(blank)</code></td>
+        </tr>
         <tr>
             <th><code>TSLintNodeExe</code></th>
             <td>Path to a Node executable to execute the runner script.</td>
             <td>The <code>tools\node-6.1.0.exe</code> in the package.</td>
         </tr>
+        <tr>
+            <th><code>TSLintProject</code></th>
+            <td>Path to a <code>tsconfig.json</code> file to use as a type checker project.</td>
+            <td><em><code>(blank)</code></em></td>
+        </tr>
         <tr>
             <th><code>TSLintRunOutsideBuildingProject</code></th>
             <td>Whether to run even if `BuildingProject` isn't `true`.</td>
-            <td><em>(blank)</em></td>
+            <td><em><code>(blank)</code></em></td>
+        </tr>
+        <tr>
+            <th><code>TSLintTypeCheck</code></th>
+            <td>Whether to enable the type checker (requires <code>TSLintProject</code> be set).</td>
+            <td><code>false</code></td>
+        </tr>
+        <tr>
+            <th><code>TSLintVersion</code></th>
+            <td>Glob filter for the version of TSLint to use <em>(ignored if <code>TSLintConfig</code> is provided)</em>.</td>
+            <td><code>*.*.*</code></td>
         </tr>
     </tbody>
 </table>
diff --git a/TSLint.MSBuild.nuspec b/TSLint.MSBuild.nuspec
index 628a8a3..f7727ca 100644
--- a/TSLint.MSBuild.nuspec
+++ b/TSLint.MSBuild.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>TSLint.MSBuild</id>
     <title>TSLint.MSBuild</title>
-    <version>1.0.0-beta0</version>
+    <version>1.0.0-beta1</version>
     <authors>palantir, joshuakgoldberg</authors>
     <owners>joshuakgoldberg</owners>
     <licenseUrl>https://github.com/JoshuaKGoldberg/TSLint.MSBuild/blob/master/LICENSE.md</licenseUrl>
diff --git a/gulpfile.js b/gulpfile.js
index 32d37d8..e16a9fe 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -5,7 +5,7 @@ const request = require("request");
 const runSequence = require("run-sequence");
 const msbuild = require("gulp-msbuild");
 
-const tests = ["TSLintArgs", "TSLintCli", "TSLintOutput"];
+const tests = ["TSLintArgs", "TSLintCli", "TSLintOutput", "TSLintVersion"];
 const testTasks = tests.map(testName => `test:${testName}`);
 
 tests.forEach(testName => {
diff --git a/package.json b/package.json
index ffc9b3e..e20d615 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint-msbuild",
-  "version": "1.0.0-beta0",
+  "version": "1.0.0-beta1",
   "description": "An MSBuild target for linting TypeScript code using TSLint.",
   "author": "Joshua K Goldberg",
   "license": "MIT",
diff --git a/src/build/TSLint.MSBuild.targets b/src/build/TSLint.MSBuild.targets
index 7b77b65..64a4f5d 100644
--- a/src/build/TSLint.MSBuild.targets
+++ b/src/build/TSLint.MSBuild.targets
@@ -13,15 +13,14 @@
     <!-- PropertyGroup settings -->
     <PropertyGroup>
       <TSLintBreakBuildOnError Condition="'$(TSLintBreakBuildOnError)' == ''">false</TSLintBreakBuildOnError>
-      <TSLintConfig Condition="'$(TSLintConfig)' == ''"></TSLintConfig>
-      <TSLintErrorSeverity Condition="'$(TSLintErrorSeverity)' == ''"></TSLintErrorSeverity>
       <TSLintNodeExe Condition="'$(TSLintNodeExe)' == ''">$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)..\tools\node-6.1.0.exe"))</TSLintNodeExe>
+      <TSLintVersion Condition="'$(TSLintVersion)' == ''">*.*.*</TSLintVersion>
     </PropertyGroup>
 
     <!-- Grab the first matching TSLint CLI in a NuGet packages install -->
     <ItemGroup Condition="'$(TSLintCli)' == ''">
-      <TSLintPotentialCli Include="$(SolutionDir)packages\tslint.*.*.*\tools\node_modules\tslint\lib\tslint-cli.js" />
-      <TSLintPotentialCli Include="$(MSBuildThisFileDirectory)..\..\tslint.*.*.*\tools\node_modules\tslint\lib\tslint-cli.js" />
+      <TSLintPotentialCli Include="$(SolutionDir)packages\tslint.$(TSLintVersion)\tools\node_modules\tslint\lib\tslint-cli.js" />
+      <TSLintPotentialCli Include="$(MSBuildThisFileDirectory)..\..\tslint.$(TSLintVersion)\tools\node_modules\tslint\lib\tslint-cli.js" />
     </ItemGroup>
     <PropertyGroup Condition="'$(TSLintCli)' == ''">
       <TSLintCliProperty>@(TSLintPotentialCli);</TSLintCliProperty>
@@ -40,7 +39,10 @@
       <TSLintArgs Condition="'$(TSLintConfig)' != ''">$(TSLintArgs) --config $(TSLintConfig)</TSLintArgs>
       <TSLintArgs Condition="'@(TSLintExclude)' != ''">$(TSLintArgs) --exclude $(TSLintExcludeJoined)</TSLintArgs>
       <TSLintArgs>$(TSLintArgs) --format msbuild</TSLintArgs>
+      <TSLintArgs Condition="'$(TSLintProject)' != ''">$(TSLintArgs) --project $(TSLintProject)</TSLintArgs>
+      <TSLintArgs Condition="'$(TSLintTypeCheck)' != ''">$(TSLintArgs) --type-check $(TSLintTypeCheck)</TSLintArgs>
       <TSLintArgs Condition="'@(TSLintRulesDirectory)' != ''">$(TSLintArgs) --rules-dir @(TSLintRulesDirectory, ' --rules-dir ')</TSLintArgs>
+      <TSLintArgs Condition="'$(TSLintExtraArgs)' != ''">$(TSLintArgs) $(TSLintExtraArgs)</TSLintArgs>
       <TSLintArgs Condition="'@(TypeScriptCompile)' != ''">$(TSLintArgs) @(TypeScriptCompile, ' ')</TSLintArgs>
     </PropertyGroup>
 
diff --git a/test/TSLintArgs/TSLintArgs/TSLintArgs.csproj b/test/TSLintArgs/TSLintArgs/TSLintArgs.csproj
index 99598bb..9c3e5e5 100644
--- a/test/TSLintArgs/TSLintArgs/TSLintArgs.csproj
+++ b/test/TSLintArgs/TSLintArgs/TSLintArgs.csproj
@@ -28,12 +28,15 @@
   <PropertyGroup>
     <TSLintDisabled>true</TSLintDisabled>
     <TSLintConfig>tslint.json</TSLintConfig>
+    <TSLintExtraArgs>--baz qux</TSLintExtraArgs>
+    <TSLintProject>tsconfig.json</TSLintProject>
+    <TSLintTypeCheck>true</TSLintTypeCheck>
   </PropertyGroup>
 
   <!-- Post-TSLint verification -->
   <Target AfterTargets="TSLint" Name="Test">
     <PropertyGroup>
-      <TSLintArgsExpected> --config tslint.json --exclude foo.ts --exclude bar.ts --format msbuild --rules-dir rules/foo --rules-dir rules/bar foo.ts bar.ts baz.ts qux.ts</TSLintArgsExpected>
+      <TSLintArgsExpected> --config tslint.json --exclude foo.ts --exclude bar.ts --format msbuild --project tsconfig.json --type-check true --rules-dir rules/foo --rules-dir rules/bar --baz qux foo.ts bar.ts baz.ts qux.ts</TSLintArgsExpected>
     </PropertyGroup>
 
     <Error
diff --git a/test/TSLintVersion/TSLintVersion.sln b/test/TSLintVersion/TSLintVersion.sln
new file mode 100644
index 0000000..3c6a782
--- /dev/null
+++ b/test/TSLintVersion/TSLintVersion.sln
@@ -0,0 +1,13 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TSLintVersion", "TSLintVersion/TSLintVersion.csproj", "{TSLintVersion-Guid}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{TSLintVersion-Guid}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{TSLintVersion-Guid}.Debug|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/test/TSLintVersion/TSlintVersion/TSLintVersion.csproj b/test/TSLintVersion/TSlintVersion/TSLintVersion.csproj
new file mode 100644
index 0000000..45055d7
--- /dev/null
+++ b/test/TSLintVersion/TSlintVersion/TSLintVersion.csproj
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\src\build\TSLint.MSBuild.targets" />
+
+  <Target Name="Rebuild" />
+
+  <!-- Fake setup for the TypeScript build environment -->
+  <Target AfterTargets="Rebuild" Name="CompileTypeScript">
+    <ItemGroup>
+      <TypeScriptCompile Include="foo.ts" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <BuildingProject>true</BuildingProject>
+    </PropertyGroup>
+  </Target>
+
+  <!-- Fake properties for the TSLint task -->
+  <PropertyGroup>
+    <TSLintDisabled>true</TSLintDisabled>
+    <TSLintVersion>1.1?.2</TSLintVersion>
+  </PropertyGroup>
+
+  <!-- Post-TSLint verification -->
+  <Target AfterTargets="TSLint" Name="Test">
+    <PropertyGroup>
+      <TSLintCliExpected>$(SolutionDir)packages\tslint.1.12.2\tools\node_modules\tslint\lib\tslint-cli.js</TSLintCliExpected>
+    </PropertyGroup>
+
+    <Error
+      Condition="'$(TSLintCliExpected)' != '$(TSLintCli)'"
+      Text="Expected TSLintCli to be%0a'$(TSLintCliExpected)'%0abut got%0a'$(TSLintCli)'.." />
+
+    <Message
+      Condition="'$(TSLintCliExpected)' == '$(TSLintCli)'"
+      Importance="High"
+      Text="TSLintCli passed." />
+  </Target>
+</Project>
diff --git a/test/TSLintVersion/packages/tslint.0.4.5/tools/node_modules/tslint/lib/tslint-cli.js b/test/TSLintVersion/packages/tslint.0.4.5/tools/node_modules/tslint/lib/tslint-cli.js
new file mode 100644
index 0000000..c15f26f
--- /dev/null
+++ b/test/TSLintVersion/packages/tslint.0.4.5/tools/node_modules/tslint/lib/tslint-cli.js
@@ -0,0 +1 @@
+// ...
diff --git a/test/TSLintVersion/packages/tslint.1.11.4/tools/node_modules/tslint/lib/tslint-cli.js b/test/TSLintVersion/packages/tslint.1.11.4/tools/node_modules/tslint/lib/tslint-cli.js
new file mode 100644
index 0000000..c15f26f
--- /dev/null
+++ b/test/TSLintVersion/packages/tslint.1.11.4/tools/node_modules/tslint/lib/tslint-cli.js
@@ -0,0 +1 @@
+// ...
diff --git a/test/TSLintVersion/packages/tslint.1.12.2/tools/node_modules/tslint/lib/tslint-cli.js b/test/TSLintVersion/packages/tslint.1.12.2/tools/node_modules/tslint/lib/tslint-cli.js
new file mode 100644
index 0000000..c15f26f
--- /dev/null
+++ b/test/TSLintVersion/packages/tslint.1.12.2/tools/node_modules/tslint/lib/tslint-cli.js
@@ -0,0 +1 @@
+// ...
diff --git a/test/TSLintVersion/packages/tslint.1.3.5/tools/node_modules/tslint/lib/tslint-cli.js b/test/TSLintVersion/packages/tslint.1.3.5/tools/node_modules/tslint/lib/tslint-cli.js
new file mode 100644
index 0000000..c15f26f
--- /dev/null
+++ b/test/TSLintVersion/packages/tslint.1.3.5/tools/node_modules/tslint/lib/tslint-cli.js
@@ -0,0 +1 @@
+// ...