Merge pull request #10737 from microsoft/users/kavipriya/rftendgame

RFT hard stop
microsoft · Jun 25, 2019 · 2fabb87 · 2fabb87
2 parents 101173f + 36acdb0
commit 2fabb87
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/Tasks/DeployVisualStudioTestAgentV2/DeployTestAgent.ps1 b/Tasks/DeployVisualStudioTestAgentV2/DeployTestAgent.ps1
@@ -1,12 +1,7 @@
 [CmdletBinding()]
 param()
 
-# Error out unless there is a workaround
-$supportrft = Get-VstsTaskVariable -Name 'RFTSupport' -AsBool
-if(-not $supportrft)
-{
-    throw "This task and its companion task (Run Functional Tests) are now not supported. Use the 'Visual Studio Test' task instead. The VSTest task can run unit as well as functional tests. Run tests on one or more agents using the multi-agent phase setting. Use the 'Visual Studio Test Platform' task to run tests without needing Visual Studio on the agent. VSTest task also brings new capabilities such as automatically rerunning failed tests. Visit https://aka.ms/testingwithphases for more information."
-}
+throw "This task and its companion task (Run Functional Tests) are now not supported. Use the 'Visual Studio Test' task instead. The VSTest task can run unit as well as functional tests. Run tests on one or more agents using the multi-agent phase setting. Use the 'Visual Studio Test Platform' task to run tests without needing Visual Studio on the agent. VSTest task also brings new capabilities such as automatically rerunning failed tests. Visit https://aka.ms/testingwithphases for more information."
 
 Trace-VstsEnteringInvocation $MyInvocation
 Write-Warning "This task and it’s companion task (Run Functional Tests) are now deprecated and will stop working on 10-March-2019. Use the 'Visual Studio Test' task instead. The VSTest task can run unit as well as functional tests. Run tests on one or more agents using the multi-agent phase setting. Use the ‘Visual Studio Test Platform’ task to run tests without needing Visual Studio on the agent. VSTest task also brings new capabilities such as automatically rerunning failed tests. Visit https://aka.ms/testingwithphases for more information."

diff --git a/Tasks/DeployVisualStudioTestAgentV2/task.json b/Tasks/DeployVisualStudioTestAgentV2/task.json
@@ -13,7 +13,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 151,
+        "Minor": 155,
         "Patch": 1
     },
     "deprecated": true,

diff --git a/Tasks/DeployVisualStudioTestAgentV2/task.loc.json b/Tasks/DeployVisualStudioTestAgentV2/task.loc.json
@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 151,
+    "Minor": 155,
     "Patch": 1
   },
   "deprecated": true,

diff --git a/Tasks/RunDistributedTestsV1/RunDistributedTests.ps1 b/Tasks/RunDistributedTestsV1/RunDistributedTests.ps1
@@ -183,12 +183,7 @@ $checkTestAgentCompatScriptLocationMemberExists  = CmdletHasMember "CheckTestAge
 $checkCustomSlicingEnabledMemberExists  = CmdletHasMember "CustomSlicingEnabled"
 $taskContextMemberExists  = CmdletHasMember "TaskContext"
 
-# Error out unless there is a workaround
-$supportrft = Get-TaskVariable -Context $distributedTaskContext -Name "RFTSupport"
-if ($supportrft -notlike 'true')
-{
-    throw "This task and its companion task (Visual Studio Test Agent Deployment) are now not supported. Use the 'Visual Studio Test' task instead. The VSTest task can run unit as well as functional tests. Run tests on one or more agents using the multi-agent phase setting. Use the 'Visual Studio Test Platform' task to run tests without needing Visual Studio on the agent. VSTest task also brings new capabilities such as automatically rerunning failed tests. Visit https://aka.ms/testingwithphases for more information."
-}
+throw "This task and its companion task (Visual Studio Test Agent Deployment) are now not supported. Use the 'Visual Studio Test' task instead. The VSTest task can run unit as well as functional tests. Run tests on one or more agents using the multi-agent phase setting. Use the 'Visual Studio Test Platform' task to run tests without needing Visual Studio on the agent. VSTest task also brings new capabilities such as automatically rerunning failed tests. Visit https://aka.ms/testingwithphases for more information."
 
 if($overrideRunParams -and $runSettingsFile -and (Test-Path $runSettingsFile))
 {

diff --git a/Tasks/RunDistributedTestsV1/task.json b/Tasks/RunDistributedTestsV1/task.json
@@ -13,7 +13,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 151,
+        "Minor": 155,
         "Patch": 1
     },
     "deprecated": true,

diff --git a/Tasks/RunDistributedTestsV1/task.loc.json b/Tasks/RunDistributedTestsV1/task.loc.json
@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 151,
+    "Minor": 155,
     "Patch": 1
   },
   "deprecated": true,