Merge pull request #25 from aslaakso/master

Add missing file to installation/UFT.zip
hpsa · May 27, 2019 · 2d170a5 · 2d170a5
2 parents 808384b + 79460a0
commit 2d170a5
Show file tree

Hide file tree

Showing 32 changed files with 85 additions and 69 deletions.
diff --git a/.vs/UFTBuildTask/v15/.suo b/.vs/UFTBuildTask/v15/.suo
diff --git a/.vs/UFTBuildTask/v15/Server/sqlite3/storage.ide b/.vs/UFTBuildTask/v15/Server/sqlite3/storage.ide
diff --git a/.vs/UFTBuildTask/v15/Server/sqlite3/storage.ide-shm b/.vs/UFTBuildTask/v15/Server/sqlite3/storage.ide-shm
diff --git a/.vs/UFTBuildTask/v15/Server/sqlite3/storage.ide-wal b/.vs/UFTBuildTask/v15/Server/sqlite3/storage.ide-wal
diff --git a/PSModule/InvokeAlmLabManagementTaskCmdlet.cs b/PSModule/InvokeAlmLabManagementTaskCmdlet.cs
@@ -14,45 +14,45 @@ public class InvokeAlmLabManagementTaskCmdlet : AbstractLauncherTaskCmdlet
 
         [Parameter(Position = 1, Mandatory = true)]
         public string ALMUserName;
-        
-        [Parameter(Position = 2, Mandatory = true)]
-        public string ALMDomain;
+
+        [Parameter(Position = 2)]
+        public string ALMPassword;
 
         [Parameter(Position = 3, Mandatory = true)]
-        public string ALMProject;
+        public string ALMDomain;
 
         [Parameter(Position = 4, Mandatory = true)]
-        public string ALMTestSet;
+        public string ALMProject;
 
-        [Parameter(Position = 5, Mandatory = true)]
-        public string TimeslotDuration;
+        [Parameter(Position = 5)]
+        public string TestRunType;
 
-        [Parameter(Position = 6)]
-        public string ALMPassword;
+        [Parameter(Position = 6, Mandatory = true)]
+        public string ALMTestSet;
 
         [Parameter(Position = 7)]
-        public string TestRunType;
-
-        [Parameter(Position = 8)]
         public string Description;
 
+        [Parameter(Position = 8, Mandatory = true)]
+        public string TimeslotDuration;
+
         [Parameter(Position = 9)]
         public string EnvironmentConfigurationID;
 
         [Parameter(Position = 10)]
-        public bool UseCDA;
+        public string ReportName;
 
         [Parameter(Position = 11)]
-        public string DeploymentAction;
+        public bool UseCDA;
 
         [Parameter(Position = 12)]
-        public string DeploymentEnvironmentName;
+        public string DeploymentAction;
 
         [Parameter(Position = 13)]
-        public string DeprovisioningAction;
+        public string DeploymentEnvironmentName;
 
         [Parameter(Position = 14)]
-        public string ReportName;
+        public string DeprovisioningAction;
 
         [Parameter(Position = 15)]
         public string almRunHost;
@@ -100,7 +100,6 @@ public override Dictionary<string, string> GetTaskProperties()
                 {
                     builder.SetTestSet(i++, testSet.Replace(@"\", @"\\"));
                 }
-                //builder.SetTestSet(1, ALMTestSet.Replace("\\", "\\\\")); 
             }
             else
             {

diff --git a/PSModule/obj/Debug/PSModule.csproj.FileListAbsolute.txt b/PSModule/obj/Debug/PSModule.csproj.FileListAbsolute.txt
@@ -18,8 +18,8 @@ C:\Users\laakso.CORPDOM\TFS\ADM-TFS-Extension-master\PSModule\obj\Debug\PSModule
 C:\Users\laakso.CORPDOM\TFS\ADM-TFS-Extension-master\PSModule\obj\Debug\PSModule.pdb
 C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\vsts-agent-win7-x64-2.117.2\bin\plugins\UFTBuildTask\PSModule.dll
 C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\vsts-agent-win7-x64-2.117.2\bin\plugins\UFTBuildTask\PSModule.pdb
-C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Debug\PSModule.csprojAssemblyReference.cache
 C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Debug\PSModule.csproj.CoreCompileInputs.cache
 C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Debug\PSModule.csproj.CopyComplete
 C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Debug\PSModule.dll
 C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Debug\PSModule.pdb
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Debug\PSModule.csprojAssemblyReference.cache
diff --git a/PSModule/obj/Debug/PSModule.csprojAssemblyReference.cache b/PSModule/obj/Debug/PSModule.csprojAssemblyReference.cache
diff --git a/PSModule/obj/Debug/PSModule.dll b/PSModule/obj/Debug/PSModule.dll
diff --git a/PSModule/obj/Debug/PSModule.pdb b/PSModule/obj/Debug/PSModule.pdb
diff --git a/PSModule/obj/Release/PSModule.csproj.CoreCompileInputs.cache b/PSModule/obj/Release/PSModule.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f9bb61767f1d85ec54562d2fc562fb03c1a478d3
+1fb0c50455c56164c94af8034ca55b44b2b3cfd3
diff --git a/PSModule/obj/Release/PSModule.csproj.FileListAbsolute.txt b/PSModule/obj/Release/PSModule.csproj.FileListAbsolute.txt
@@ -9,3 +9,10 @@ C:\Users\laakso.CORPDOM\TFS\ADM-TFS-Extension-master\PSModule\obj\Release\PSModu
 C:\Users\laakso.CORPDOM\TFS\ADM-TFS-Extension-master\PSModule\obj\Release\PSModule.csproj.CoreCompileInputs.cache
 C:\Users\laakso.CORPDOM\TFS\ADM-TFS-Extension-master\PSModule\obj\Release\PSModule.csproj.CopyComplete
 C:\Users\laakso.CORPDOM\TFS\ADM-TFS-Extension-master\PSModule\obj\Release\PSModule.csprojAssemblyReference.cache
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\bin\PSModule.dll
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\bin\PSModule.pdb
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Release\PSModule.csprojAssemblyReference.cache
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Release\PSModule.csproj.CoreCompileInputs.cache
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Release\PSModule.csproj.CopyComplete
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Release\PSModule.dll
+C:\Users\laakso.CORPDOM\TFS\UFT_TFS_plugin\ADM-TFS-Extension\PSModule\obj\Release\PSModule.pdb
diff --git a/PSModule/obj/Release/PSModule.csprojAssemblyReference.cache b/PSModule/obj/Release/PSModule.csprojAssemblyReference.cache
diff --git a/PSModule/obj/Release/PSModule.dll b/PSModule/obj/Release/PSModule.dll
diff --git a/PSModule/obj/Release/PSModule.pdb b/PSModule/obj/Release/PSModule.pdb
diff --git a/UFTBuildTask/AlmLabEnvPrepareTask/task.json b/UFTBuildTask/AlmLabEnvPrepareTask/task.json
@@ -12,7 +12,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [
     "UFT_LAUNCHER"

diff --git a/UFTBuildTask/AlmLabManagementTask/localTask.ps1 b/UFTBuildTask/AlmLabManagementTask/localTask.ps1
@@ -4,19 +4,19 @@
 param(
 	[string][Parameter(Mandatory=$true)] $varAlmServ, 
 	[string][Parameter(Mandatory=$true)] $varUserName,
+	[string] $varPass,
 	[string][Parameter(Mandatory=$true)] $varDomain,
 	[string][Parameter(Mandatory=$true)] $varProject,
-	[string][Parameter(Mandatory=$true)] $varTestSet,
-	[string][Parameter(Mandatory=$true)] $varTimeslotDuration,
-	[string] $varPass,
 	[string] $varRunType,
+	[string][Parameter(Mandatory=$true)] $varTestSet,
 	[string] $varDescription,
+	[string][Parameter(Mandatory=$true)] $varTimeslotDuration,
 	[string] $varEnvironmentConfigurationID,
+	[string] [Parameter(Mandatory=$false)] $varReportName,
 	[string] $varUseCDA,
 	[string] $varDeploymentAction,
 	[string] $varDeploymentEnvironmentName,
-	[string] $varDeprovisioningAction,
-	[string] [Parameter(Mandatory=$false)] $varReportName
+	[string] $varDeprovisioningAction
 )
 
 
@@ -46,7 +46,7 @@ if (Test-Path $retcodefile)
 
 
 $CDA1 = [bool]($varUseCDA) 
-Invoke-AlmLabManagementTask $varAlmServ $varUserName $varDomain $varProject $varTestSet $varTimeslotDuration $varPass $varRunType $varDescription $varEnvironmentConfigurationID $CDA1 $varDeploymentAction $varDeploymentEnvironmentName $varDeprovisioningAction $varReportName -Verbose
+Invoke-AlmLabManagementTask $varAlmServ $varUserName $varPass $varDomain $varProject $varRunType $varTestSet $varDescription $varTimeslotDuration $varEnvironmentConfigurationID $varReportName $CDA1 $varDeploymentAction $varDeploymentEnvironmentName $varDeprovisioningAction -Verbose
 
 Write-Verbose "Remove temp files"
 $results = Join-Path $env:UFT_LAUNCHER -ChildPath "res\*.xml"

diff --git a/UFTBuildTask/AlmLabManagementTask/task.json b/UFTBuildTask/AlmLabManagementTask/task.json
@@ -12,7 +12,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [
     "UFT_LAUNCHER"
@@ -41,6 +41,14 @@
       "required": true,
       "helpMarkDown": "The user name that will access this ALM server during the build step run."
     },
+    {
+      "name": "varPass",
+      "type": "string",
+      "label": "Password",
+      "defaultValue": "",
+      "required": false,
+      "helpMarkDown": "The password for the user that will access this ALM server during the build step run."
+    },
     {
       "name": "varDomain",
       "type": "string",
@@ -57,30 +65,6 @@
       "required": true,
       "helpMarkDown": "The ALM project in which the tests to run are stored."
     },
-    {
-      "name": "varTestSet",
-      "type": "string",
-      "label": "Test Set/Build Verification Suite ID",
-      "defaultValue": "",
-      "required": true,
-      "helpMarkDown": "The ID number (found in ALM) for the test set or build verification suite."
-    },
-    {
-      "name": "varTimeslotDuration",
-      "type": "string",
-      "label": "Timeslot Duration (in minutes, minimum = 30)",
-      "defaultValue": "",
-      "required": true,
-      "helpMarkDown": "The amount of time needed on the host to run this test set/verification suite."
-    },
-    {
-      "name": "varPass",
-      "type": "string",
-      "label": "Password",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "The password for the user that will access this ALM server during the build step run."
-    },
     {
       "name": "varRunType",
       "type": "radio",
@@ -93,14 +77,30 @@
         "BVS": "Build verification suite"
       }
     },
-     {
+    {
+      "name": "varTestSet",
+      "type": "string",
+      "label": "Test Set/Build Verification Suite ID",
+      "defaultValue": "",
+      "required": true,
+      "helpMarkDown": "The ID number (found in ALM) for the test set or build verification suite."
+    },
+    {
       "name": "varDescription",
       "type": "string",
       "label": "Description",
       "defaultValue": "",
       "required": false,
       "helpMarkDown": "The description of this test set/build verification suite."
     },
+    {
+      "name": "varTimeslotDuration",
+      "type": "string",
+      "label": "Timeslot Duration (in minutes, minimum = 30)",
+      "defaultValue": "",
+      "required": true,
+      "helpMarkDown": "The amount of time needed on the host to run this test set/verification suite."
+    },
     {
       "name": "varEnvironmentConfigurationID",
       "type": "string",
@@ -109,6 +109,14 @@
       "required": false,
       "helpMarkDown": "To find the ID of your environment configuration, right-click the entity, copy the URL, and paste it to a text editor. Use the number associated with the EntityID at the end of the URL."
     },
+    {
+      "name": "varReportName",
+      "type": "string",
+      "label": "Report Name",
+      "defaultValue": "",
+      "required": false,
+      "helpMarkDown": ""
+    },
     {
       "name": "varUseCDA",
       "type": "boolean",
@@ -122,7 +130,7 @@
       "name": "varDeploymentAction",
       "type": "pickList",
       "label": "Deployment Action",
-      "defaultValue": "useDeployed",
+      "defaultValue": "Use Deployed",
       "groupName": "useCDAGroup",
       "required": false,
       "helpMarkDown": "The action to perform on deploying the server for running tests.",
@@ -145,22 +153,14 @@
       "name": "varDeprovisioningAction",
       "type": "pickList",
       "label": "Deprovisioning Action",
-      "defaultValue": "leaveEnvironmentDeployed",
+      "defaultValue": "Leave environment deployed",
       "groupName": "useCDAGroup",
       "required": false,
       "helpMarkDown": "The action to perform after the testing run when you are ready to end the server deployment.",
       "options": {
         "Leave environment deployed": "Leave environment deployed",
         "Deprovision at end": "Deprovision end"
       }
-    },
-    {
-      "name": "varReportName",
-      "type": "string",
-      "label": "Report Name",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": ""
     }
   ],
       "instanceNameFormat": "AlmLabManagementTask",

diff --git a/UFTBuildTask/RunFromALM/task.json b/UFTBuildTask/RunFromALM/task.json
@@ -12,7 +12,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [
     "UFT_LAUNCHER"

diff --git a/UFTBuildTask/RunFromFileSystemTask/task.json b/UFTBuildTask/RunFromFileSystemTask/task.json
@@ -12,7 +12,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": "UFT_LAUNCHER",
   "inputs": [

diff --git a/UFTBuildTask/UFTBuildTask.csproj b/UFTBuildTask/UFTBuildTask.csproj
@@ -23,6 +23,7 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,6 +49,7 @@
     <Content Include="AlmLabEnvPrepareTask\icon.png" />
     <Content Include="AlmLabManagementTask\task.json" />
     <Content Include="AlmLabEnvPrepareTask\task.json" />
+    <Content Include="img\UFT_logo.png" />
     <Content Include="RunFromALM\resources\screenshots\buildProcess.PNG" />
     <Content Include="RunFromALM\resources\screenshots\fs.PNG" />
     <Content Include="RunFromALM\resources\screenshots\log.PNG" />

diff --git a/UFTBuildTask/UFTBuildTask.csproj.user b/UFTBuildTask/UFTBuildTask.csproj.user
@@ -4,6 +4,12 @@
     <UseIISExpress>true</UseIISExpress>
     <ToolsVersionPromptShown>2.1</ToolsVersionPromptShown>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

diff --git a/UFTBuildTask/img/UFT_logo.png b/UFTBuildTask/img/UFT_logo.png
diff --git a/UFTBuildTask/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/UFTBuildTask/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/...r.application-UFT-TFS-Version2-1.0.2.vsix → ...r.application-UFT-TFS-Version2-1.0.3.vsix b/...r.application-UFT-TFS-Version2-1.0.2.vsix → ...r.application-UFT-TFS-Version2-1.0.3.vsix
diff --git a/UFTBuildTask/vss-extension.json b/UFTBuildTask/vss-extension.json
@@ -2,7 +2,7 @@
   "manifestVersion": 1,
   "id": "application-UFT-TFS-Version2",
   "name": "Unified Functional Testing (UFT)",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publisher": "uftpublisher",
   "targets": [
     {
@@ -11,7 +11,9 @@
   ],
   "description": "Enables you to run UFT tests as a build in a TFS build process. This extension includes 4 tasks.",
   "categories": [
-    "Azure Repos"
+    "Azure Repos",
+    "Azure Pipelines",
+    "Azure Test Plans"
   ],
   "resources": [
     "some stuff"
@@ -21,7 +23,7 @@
     "ALM"
   ],
   "icons": {
-    "default": "img/tfs.png"
+    "default": "img/UFT_logo.png"
   },
   "screenshots ": [
     {
@@ -54,7 +56,7 @@
     }
   },
   "branding": {
-    "color": "rgb(89, 141, 88)",
+    "color": "rgb(1, 66, 114)",
     "theme": "dark"
   },
   "files": [

diff --git a/bin/Microsoft.Management.Infrastructure.dll b/bin/Microsoft.Management.Infrastructure.dll
diff --git a/bin/Microsoft.PowerShell.ConsoleHost.dll b/bin/Microsoft.PowerShell.ConsoleHost.dll
diff --git a/bin/PSModule.dll b/bin/PSModule.dll
diff --git a/bin/PSModule.pdb b/bin/PSModule.pdb
diff --git a/bin/System.Management.Automation.dll b/bin/System.Management.Automation.dll
diff --git a/installation/UFT.zip b/installation/UFT.zip
diff --git a/...r.application-UFT-TFS-Version2-1.0.2.vsix → ...r.application-UFT-TFS-Version2-1.0.3.vsix b/...r.application-UFT-TFS-Version2-1.0.2.vsix → ...r.application-UFT-TFS-Version2-1.0.3.vsix
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f9bb61767f1d85ec54562d2fc562fb03c1a478d3
		1fb0c50455c56164c94af8034ca55b44b2b3cfd3