Sync RunVSTestTask task params (#540)

microsoft · Mar 8, 2024 · fe8bb08 · fe8bb08
1 parent ef8f11a
commit fe8bb08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -21,6 +21,7 @@ trigger:
   paths:
     exclude:
     - '*.md'
+pr: none
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:

diff --git a/src/RunTests/RunVSTestTask.cs b/src/RunTests/RunVSTestTask.cs
@@ -15,11 +15,6 @@ public class RunVSTestTask : ToolTask
         private static readonly HashSet<string> NormalTestLogging = new (new[] { "n", "normal", "d", "detailed", "diag", "diagnostic" }, StringComparer.OrdinalIgnoreCase);
         private static readonly HashSet<string> QuietTestLogging = new (new[] { "q", "quiet" }, StringComparer.OrdinalIgnoreCase);
 
-        /// <summary>
-        /// Gets or Sets Full path to the test file.
-        /// </summary>
-        public string IsTestProject { get; set; }
-
         /// <summary>
         /// Gets or Sets Full path to the test file.
         /// </summary>
@@ -65,19 +60,6 @@ public class RunVSTestTask : ToolTask
         /// </summary>
         public string VSTestDiag { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Command line options for VSTest.
-        /// </summary>
-        public string[] VSTestCLIRunSettings { get; set; }
-
-        // Initialized to empty string to allow declaring as non-nullable, the property is marked as
-        // required so we can ensure that the property is set to non-null before the task is executed.
-
-        /// <summary>
-        /// Gets or Sets Path to VSTest console executable.
-        /// </summary>
-        public string VSTestConsolePath { get; set; } = string.Empty;
-
         /// <summary>
         /// Gets or Sets Directory where VSTest results are saved.
         /// </summary>
@@ -148,12 +130,6 @@ public class RunVSTestTask : ToolTask
         /// </summary>
         public string VSTestSessionCorrelationId { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Runner version of VSTest.
-        /// </summary>
-        [Required]
-        public string VSTestRunnerVersion { get; set; }
-
         protected override string ToolName => "vstest.console.exe";
 
         protected override MessageImportance StandardOutputLoggingImportance => MessageImportance.High;

diff --git a/src/RunTests/build/Microsoft.Build.RunVSTest.targets b/src/RunTests/build/Microsoft.Build.RunVSTest.targets
@@ -8,14 +8,15 @@
 	<UsingTask TaskName="Microsoft.Build.RunVSTestTask" AssemblyFile="$(MSBuildThisFileDirectory)netstandard2.0\Microsoft.Build.RunVSTest.dll"  Condition="'$(MSBuildRuntime)' != 'Core'"/>
 	<Target Name="RunVSTest" AfterTargets="Test" Condition="'$(MSBuildRuntime)' != 'Core'">
 		<RunVSTestTask
-				  VSTestRunnerVersion="$(VSTestRunnerVersion)"
 				  TestFileFullPath="$(TargetPath)"
 				  VSTestSetting="$(VSTestSetting)"
 				  VSTestTestAdapterPath="$(VSTestTestAdapterPath)"
 				  VSTestFramework="$(VSTestFramework)"
 				  VSTestPlatform="$(VSTestPlatform)"
 				  VSTestTestCaseFilter="$(VSTestTestCaseFilter)"
 				  VSTestLogger="$(VSTestLogger)"
+				  VSTestListTests="$(VSTestListTests)"
+				  VSTestDiag="$(VSTestDiag)"
 				  VSTestResultsDirectory="$(VSTestResultsDirectory)"
 				  VSTestVerbosity="$(VSTestVerbosity)"
 				  VSTestCollect="$(VSTestCollect)"
@@ -25,6 +26,7 @@
 				  VSTestBlameCrashCollectAlways="$(VSTestBlameCrashCollectAlways)"
 				  VSTestBlameHang="$(VSTestBlameHang)"
 				  VSTestBlameHangDumpType="$(VSTestBlameHangDumpType)"
+				  VSTestBlameHangTimeout="$(VSTestBlameHangTimeout)"
 				  VSTestTraceDataCollectorDirectoryPath="$(VSTestTraceDataCollectorDirectoryPath)"
 				  VSTestNoLogo="$(VSTestNoLogo)"
 				  VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"