Updated assembly resolve routing to handle requests for Full Names (b…

…y comparing to name only at the moment).
jessehouwing · Feb 22, 2016 · cdf8097 · cdf8097
1 parent 58052c5
commit cdf8097
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 10 deletions.
diff --git a/extension-manifest.json b/extension-manifest.json
@@ -1,10 +1,10 @@
 {
     "manifestVersion":  1,
-    "id":  "jessehouwing-vsts-tfvc-tasks",
+    "id":  "jessehouwing-vsts-tfvc-tasks-TEST",
     "name":  "TFVC Build Tasks",
-    "version":  "1.0.26",
+    "version":  "1.0.29",
     "publisher":  "jessehouwing",
-    "public":  true,
+    "public":  false,
     "targets":  [
                     {
                         "id":  "Microsoft.VisualStudio.Services"

diff --git a/vsts-tfvc-add/TfvcAdd.ps1 b/vsts-tfvc-add/TfvcAdd.ps1
@@ -59,16 +59,19 @@ function Load-Assembly
         }
     }
 
+    $assemblyToLoad = New-Object System.Reflection.AssemblyName $name
+
+
     foreach ($path in $ProbingPaths)
     {
         Write-Debug "Checking in $path"
 
-        $path = [System.IO.Path]::Combine($path, "$($Name).dll")
+        $path = [System.IO.Path]::Combine($path, "$($assemblyToLoad.Name).dll")
         Write-Debug "Looking for $path"
         if (Test-Path -PathType Leaf -LiteralPath $path)
         {
             Write-Debug "Found assembly: $path"
-            if ([System.Reflection.AssemblyName]::GetAssemblyName($path).Name -eq $Name)
+            if ([System.Reflection.AssemblyName]::GetAssemblyName($path).Name -eq $assemblyToLoad.Name)
             {
                 Write-Debug "Loading assembly: $path"
                 return [System.Reflection.Assembly]::LoadFrom($path)

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

diff --git a/vsts-tfvc-checkin/TfvcCheckin.ps1 b/vsts-tfvc-checkin/TfvcCheckin.ps1
@@ -68,16 +68,19 @@ function Load-Assembly
         }
     }
 
+    $assemblyToLoad = New-Object System.Reflection.AssemblyName $name
+
+
     foreach ($path in $ProbingPaths)
     {
         Write-Debug "Checking in $path"
 
-        $path = [System.IO.Path]::Combine($path, "$($Name).dll")
+        $path = [System.IO.Path]::Combine($path, "$($assemblyToLoad.Name).dll")
         Write-Debug "Looking for $path"
         if (Test-Path -PathType Leaf -LiteralPath $path)
         {
             Write-Debug "Found assembly: $path"
-            if ([System.Reflection.AssemblyName]::GetAssemblyName($path).Name -eq $Name)
+            if ([System.Reflection.AssemblyName]::GetAssemblyName($path).Name -eq $assemblyToLoad.Name)
             {
                 Write-Debug "Loading assembly: $path"
                 return [System.Reflection.Assembly]::LoadFrom($path)

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

diff --git a/vsts-tfvc-checkin/task.json.lastpatched b/vsts-tfvc-checkin/task.json.lastpatched
diff --git a/vsts-tfvc-checkin/task.json.lastuploaded b/vsts-tfvc-checkin/task.json.lastuploaded
diff --git a/vsts-tfvc-tasks.sln b/vsts-tfvc-tasks.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25008.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "vsts-tfvc-checkin", "vsts-tfvc-checkin\vsts-tfvc-checkin.pssproj", "{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}"
 EndProject
@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension", "Extension", "{
 	ProjectSection(SolutionItems) = preProject
 		extension-manifest.json = extension-manifest.json
 		extension\extension-overview.md = extension\extension-overview.md
+		readme.md = readme.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{ADFB1042-D16B-4621-900A-CFB227C18EA0}"

diff --git a/vsts-tfvc-tasks.vsext b/vsts-tfvc-tasks.vsext
@@ -0,0 +1 @@
+