Service Fabric active directory DLL

microsoft · Jan 20, 2017 · a47083b · a47083b
1 parent 9fd3f8a
commit a47083b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/Tasks/ServiceFabricDeploy/make.json b/Tasks/ServiceFabricDeploy/make.json
@@ -1,4 +1,18 @@
 {
+    "externals": {
+        "nugetv2": [
+            {
+                "name": "Microsoft.IdentityModel.Clients.ActiveDirectory",
+                "version": "2.23.302261847",
+                "repository": "https://www.nuget.org/api/v2/",
+                "cp": [
+                    {
+                        "source":"lib/net45/Microsoft.IdentityModel.Clients.ActiveDirectory.dll"
+                    }
+                ]
+            }
+        ]
+    },
     "cp": [
         {
             "source": "ServiceFabricSDK",

diff --git a/Tasks/ServiceFabricDeploy/task.json b/Tasks/ServiceFabricDeploy/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 2,
-        "Patch": 1
+        "Patch": 2
     },
     "minimumAgentVersion": "1.95.0",
     "groups": [

diff --git a/Tasks/ServiceFabricDeploy/task.loc.json b/Tasks/ServiceFabricDeploy/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 2,
-    "Patch": 1
+    "Patch": 2
   },
   "minimumAgentVersion": "1.95.0",
   "groups": [

diff --git a/Tasks/ServiceFabricDeploy/utilities.ps1 b/Tasks/ServiceFabricDeploy/utilities.ps1
@@ -90,8 +90,7 @@ function Get-AadSecurityToken
     Write-Host (Get-VstsLocString -Key ClientAppId -ArgumentList $clientApplicationId)
 
     # Acquire AAD access token
-    $serverOMDirectory = Get-VstsTaskVariable -Name 'Agent.ServerOMDirectory' -Require
-	Add-Type -LiteralPath "$serverOMDirectory\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"	
+    Add-Type -LiteralPath "$PSScriptRoot\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"
 	$authContext = Create-Object -TypeName Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationContext -ArgumentList @($authority)
     $authParams = $ConnectedServiceEndpoint.Auth.Parameters
 	$userCredential = Create-Object -TypeName Microsoft.IdentityModel.Clients.ActiveDirectory.UserCredential -ArgumentList @($authParams.Username, $authParams.Password)