Added servername input (#3706)

microsoft · Mar 2, 2017 · 1cfcf9d · 1cfcf9d
1 parent 87c0a83
commit 1cfcf9d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/Tasks/SqlDacpacDeploymentOnMachineGroup/Main.ps1 b/Tasks/SqlDacpacDeploymentOnMachineGroup/Main.ps1
@@ -47,6 +47,7 @@ $dacpacFile = Get-VstsInput -Name "dacpacFile"
 $sqlFile = Get-VstsInput -Name "sqlFile" 
 $inlineSql = Get-VstsInput -Name "inlineSql"
 $targetMethod = Get-VstsInput -Name "targetMethod"
+$serverName = Get-VstsInput -Name "serverName" -Require
 $databaseName = Get-VstsInput -Name "databaseName" -Require
 $authscheme = Get-VstsInput -Name "authscheme" -Require
 $sqlUsername = Get-VstsInput -Name "sqlUsername"
@@ -60,7 +61,7 @@ Import-Module $PSScriptRoot\ps_modules\TaskModuleSqlUtility
 
 Try
 {
-    $serverName = "localhost"
+
     if ($taskType -ne "dacpac")
     {
         $additionalArguments = $additionalArgumentsSql

diff --git a/Tasks/SqlDacpacDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson b/Tasks/SqlDacpacDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson
@@ -13,6 +13,8 @@
   "loc.input.help.InlineSql": "Sql Queries inline",
   "loc.input.label.TargetMethod": "Specify SQL Using",
   "loc.input.help.TargetMethod": "Specify the option to connect to the target SQL Server Database. The options are either to provide the SQL Server Database details, or the SQL Server connection string, or the Publish profile XML file.",
+  "loc.input.label.ServerName": "Server Name",
+  "loc.input.help.ServerName": "Provide the SQL Server name like, machinename\\FabriakmSQL,1433 or localhost or .\\SQL2012R2. Specifying localhost will connect to the Default SQL Server instance on the machine.",
   "loc.input.label.DatabaseName": "Database Name",
   "loc.input.help.DatabaseName": "Provide the name of the SQL Server database.",
   "loc.input.label.AuthScheme": "Authentication",

diff --git a/Tasks/SqlDacpacDeploymentOnMachineGroup/task.json b/Tasks/SqlDacpacDeploymentOnMachineGroup/task.json
@@ -14,8 +14,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 2,
-        "Patch": 2
+        "Minor": 3,
+        "Patch": 0
     },
     "demands": [],
     "minimumAgentVersion": "1.102.0",
@@ -79,6 +79,15 @@
             },
             "helpMarkDown": "Specify the option to connect to the target SQL Server Database. The options are either to provide the SQL Server Database details, or the SQL Server connection string, or the Publish profile XML file."
         },
+        {
+            "name": "ServerName",
+            "type": "string",
+            "label": "Server Name",
+            "required": true,
+            "defaultValue": "localhost",
+            "visibleRule": "TargetMethod = server || TaskType = sqlQuery || TaskType = sqlInline",
+            "helpMarkDown": "Provide the SQL Server name like, machinename\\FabriakmSQL,1433 or localhost or .\\SQL2012R2. Specifying localhost will connect to the Default SQL Server instance on the machine."
+        },
         {
             "name": "DatabaseName",
             "type": "string",

diff --git a/Tasks/SqlDacpacDeploymentOnMachineGroup/task.loc.json b/Tasks/SqlDacpacDeploymentOnMachineGroup/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 2,
-    "Patch": 2
+    "Minor": 3,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "1.102.0",
@@ -79,6 +79,15 @@
       },
       "helpMarkDown": "ms-resource:loc.input.help.TargetMethod"
     },
+    {
+      "name": "ServerName",
+      "type": "string",
+      "label": "ms-resource:loc.input.label.ServerName",
+      "required": true,
+      "defaultValue": "localhost",
+      "visibleRule": "TargetMethod = server || TaskType = sqlQuery || TaskType = sqlInline",
+      "helpMarkDown": "ms-resource:loc.input.help.ServerName"
+    },
     {
       "name": "DatabaseName",
       "type": "string",