Fixes an issue where ApplyLocalItemExclusions was ignored

jessehouwing · Feb 22, 2016 · d20d7f6 · d20d7f6
1 parent 960a7e1
commit d20d7f6
Show file tree

Hide file tree

Showing 8 changed files with 1,050 additions and 8 deletions.
diff --git a/.tfIgnore b/.tfIgnore
@@ -0,0 +1,4 @@
+*.vsix
+*.user
+*.lastpatched
+*.lastpackaged
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
diff --git a/.vs/vsts-tfvc-tasks/v14/.suo b/.vs/vsts-tfvc-tasks/v14/.suo
diff --git a/extension-manifest.json b/extension-manifest.json
@@ -2,7 +2,7 @@
     "manifestVersion":  1,
     "id":  "jessehouwing-vsts-tfvc-tasks",
     "name":  "TFVC Build Tasks",
-    "version":  "1.0.35",
+    "version":  "1.0.44",
     "publisher":  "jessehouwing",
     "public":  true,
     "targets":  [

diff --git a/vsts-tfvc-add/TfvcAdd.ps1 b/vsts-tfvc-add/TfvcAdd.ps1
@@ -202,16 +202,23 @@ Try
         {
             Write-Warning  $e.Exception.Message
         }
-        if ($e.Faulure -ne $null)
+        if ($e.Failure -ne $null -and $e.Failure.Message -ne $null)
         {
-            Write-Warning  $e.Failure.ToString()
+            Write-Warning  $e.Failure.Message
+            if ($e.Failure.Warnings.Length -gt 0)
+            {
+                foreach ($warning in $e.Failure.Warnings)
+                {
+                    Write-Warning $warning.ParentOrChildTask
+                }
+            }
         }
     }
     $provider.VersionControlServer.add_NonFatalError($OnNonFatalError)
 
     $provider.Workspace.Refresh()
 
-    Write-Output "Adding ItemSpec: $ItemSpec, Recursive: $recursive"
+    Write-Output "Adding ItemSpec: $ItemSpec, Recursive: $recursive, Apply Ignorefile: $ApplyLocalitemExclusions"
 
     if (-not $Itemspec -eq "")
     {
@@ -226,8 +233,8 @@ Try
             $null,
             [Microsoft.TeamFoundation.VersionControl.Client.LockLevel]"Unchanged",
             $false,
-            $true,
-            $ApplyLocalitemExclusions
+            $false,
+            ($ApplyLocalitemExclusions -eq $true)
         )  | Out-Null
     }
 }

diff --git a/vsts-tfvc-add/task.json b/vsts-tfvc-add/task.json
@@ -9,7 +9,7 @@
     "version":  {
                     "Major":  1,
                     "Minor":  0,
-                    "Patch":  103
+                    "Patch":  113
                 },
     "minimumAgentVersion":  "1.83.0",
     "groups":  [

diff --git a/vsts-tfvc-checkin/task.json b/vsts-tfvc-checkin/task.json
@@ -9,7 +9,7 @@
     "version":  {
                     "Major":  1,
                     "Minor":  0,
-                    "Patch":  134
+                    "Patch":  144
                 },
     "visibility":  [
                        "Build"

diff --git a/vsts-tfvc-tasks.sln b/vsts-tfvc-tasks.sln
@@ -41,6 +41,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Licenses", "Licenses", "{E2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76607A2E-B176-45F4-8452-181A5FF89EC4}"
 	ProjectSection(SolutionItems) = preProject
+		.tfIgnore = .tfIgnore
 		commands.json = commands.json
 		publish.ps1 = publish.ps1
 	EndProjectSection