Revert "Update tf.exe (#4955)" (#4985)

aleksandrlevochkin · web-flow · commit 363ba84dd490 · 2024-09-10T17:32:44.000+02:00
This reverts commit 39c297f. Co-authored-by: v-levockina <undefined>
diff --git a/src/Agent.Plugins/TFCliManager.cs b/src/Agent.Plugins/TFCliManager.cs
@@ -12,7 +12,6 @@
 using System.Xml;
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.VisualStudio.Services.Agent.Util;
-using Agent.Sdk.Knob;
 
 namespace Agent.Plugins.Repository
 {
@@ -38,15 +37,11 @@ public override TfsVCFeatures Features
 
         public static readonly int RetriesOnFailure = 3;
 
-        private string TfPath => AgentKnobs.InstallLegacyTfExe.GetValue(ExecutionContext).AsBoolean()
-            ? Path.Combine(ExecutionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf-legacy")
-            : Path.Combine(ExecutionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf");
+        public string FilePath => Path.Combine(ExecutionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf", "tf.exe");
 
-        public string FilePath => Path.Combine(TfPath, "tf.exe");
+        private string AppConfigFile => Path.Combine(ExecutionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf", "tf.exe.config");
 
-        private string AppConfigFile => Path.Combine(TfPath, "tf.exe.config");
-
-        private string AppConfigRestoreFile => Path.Combine(TfPath, "tf.exe.config.restore");
+        private string AppConfigRestoreFile => Path.Combine(ExecutionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf", "tf.exe.config.restore");
 
         // TODO: Remove AddAsync after last-saved-checkin-metadata problem is fixed properly.
         public async Task AddAsync(string localPath)
diff --git a/src/Agent.Plugins/TfsVCSourceProvider.cs b/src/Agent.Plugins/TfsVCSourceProvider.cs
@@ -101,8 +101,7 @@ public async Task GetSourceAsync(
             if (PlatformUtil.RunningOnWindows)
             {
                 // Set TFVC_BUILDAGENT_POLICYPATH
-                string tfDirectoryName = AgentKnobs.InstallLegacyTfExe.GetValue(executionContext).AsBoolean() ? "tf-legacy" : "tf";
-                string policyDllPath = Path.Combine(executionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", tfDirectoryName, "Microsoft.TeamFoundation.VersionControl.Controls.dll");
+                string policyDllPath = Path.Combine(executionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf", "Microsoft.TeamFoundation.VersionControl.Controls.dll");
                 ArgUtil.File(policyDllPath, nameof(policyDllPath));
                 const string policyPathEnvKey = "TFVC_BUILDAGENT_POLICYPATH";
                 executionContext.Output(StringUtil.Loc("SetEnvVar", policyPathEnvKey));
diff --git a/src/Agent.Sdk/Knob/AgentKnobs.cs b/src/Agent.Sdk/Knob/AgentKnobs.cs
@@ -758,12 +758,5 @@ public class AgentKnobs
             "Use PowerShell script wrapper to handle PowerShell ConstrainedLanguage mode.",
             new PipelineFeatureSource("UsePSScriptWrapper"),
             new BuiltInDefaultKnobSource("false"));
-
-        public static readonly Knob InstallLegacyTfExe = new Knob(
-            nameof(InstallLegacyTfExe),
-            "If true, agent will install the previous version of TF.exe in the tf-legacy and vstsom-legacy directories",
-            new RuntimeKnobSource("AGENT_INSTALL_LEGACY_TF_EXE"),
-            new EnvironmentKnobSource("AGENT_INSTALL_LEGACY_TF_EXE"),
-            new BuiltInDefaultKnobSource("false"));
     }
 }
diff --git a/src/Agent.Worker/Build/TFCommandManager.cs b/src/Agent.Worker/Build/TFCommandManager.cs
@@ -11,7 +11,6 @@
 using System.Text;
 using System.Xml;
 using System.Security.Cryptography.X509Certificates;
-using Agent.Sdk.Knob;
 
 namespace Microsoft.VisualStudio.Services.Agent.Worker.Build
 {
@@ -35,15 +34,11 @@ public override TfsVCFeatures Features
 
         protected override string Switch => "/";
 
-        private string TfPath => AgentKnobs.InstallLegacyTfExe.GetValue(ExecutionContext).AsBoolean()
-            ? HostContext.GetDirectory(WellKnownDirectory.TfLegacy)
-            : HostContext.GetDirectory(WellKnownDirectory.Tf);
+        public override string FilePath => Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Tf), "tf.exe");
 
-        public override string FilePath => Path.Combine(TfPath, "tf.exe");
+        private string AppConfigFile => Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Tf), "tf.exe.config");
 
-        private string AppConfigFile => Path.Combine(TfPath, "tf.exe.config");
-
-        private string AppConfigRestoreFile => Path.Combine(TfPath, "tf.exe.config.restore");
+        private string AppConfigRestoreFile => Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Tf), "tf.exe.config.restore");
 
         // TODO: Remove AddAsync after last-saved-checkin-metadata problem is fixed properly.
         public async Task AddAsync(string localPath)
diff --git a/src/Agent.Worker/Build/TfsVCSourceProvider.cs b/src/Agent.Worker/Build/TfsVCSourceProvider.cs
@@ -17,7 +17,6 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Agent.Sdk.Knob;
 
 namespace Microsoft.VisualStudio.Services.Agent.Worker.Build
 {
@@ -89,11 +88,7 @@ public async Task GetSourceAsync(
             if (PlatformUtil.RunningOnWindows)
             {
                 // Set TFVC_BUILDAGENT_POLICYPATH
-                string vstsomPath = AgentKnobs.InstallLegacyTfExe.GetValue(executionContext).AsBoolean()
-                    ? HostContext.GetDirectory(WellKnownDirectory.ServerOMLegacy)
-                    : HostContext.GetDirectory(WellKnownDirectory.ServerOM);
-
-                string policyDllPath = Path.Combine(vstsomPath, "Microsoft.TeamFoundation.VersionControl.Controls.dll");
+                string policyDllPath = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.ServerOM), "Microsoft.TeamFoundation.VersionControl.Controls.dll");
                 ArgUtil.File(policyDllPath, nameof(policyDllPath));
                 const string policyPathEnvKey = "TFVC_BUILDAGENT_POLICYPATH";
                 executionContext.Output(StringUtil.Loc("SetEnvVar", policyPathEnvKey));
diff --git a/src/Agent.Worker/Handlers/LegacyPowerShellHandler.cs b/src/Agent.Worker/Handlers/LegacyPowerShellHandler.cs
@@ -12,7 +12,6 @@
 using Microsoft.VisualStudio.Services.WebApi;
 using System.Xml;
 using Microsoft.TeamFoundation.DistributedTask.Pipelines;
-using Agent.Sdk.Knob;
 
 namespace Microsoft.VisualStudio.Services.Agent.Worker.Handlers
 {
@@ -206,13 +205,8 @@ public async Task RunAsync()
 
             // Copy the OM binaries into the legacy host folder.
             ExecutionContext.Output(StringUtil.Loc("PrepareTaskExecutionHandler"));
-
-            string sourceDirectory = AgentKnobs.InstallLegacyTfExe.GetValue(ExecutionContext).AsBoolean()
-                ? HostContext.GetDirectory(WellKnownDirectory.ServerOMLegacy)
-                : HostContext.GetDirectory(WellKnownDirectory.ServerOM);
-
             IOUtil.CopyDirectory(
-                source: sourceDirectory,
+                source: HostContext.GetDirectory(WellKnownDirectory.ServerOM),
                 target: HostContext.GetDirectory(WellKnownDirectory.LegacyPSHost),
                 cancellationToken: ExecutionContext.CancellationToken);
             Trace.Info("Finished copying files.");
diff --git a/src/Agent.Worker/JobExtension.cs b/src/Agent.Worker/JobExtension.cs
@@ -269,11 +269,6 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel
                         }
                     }
 
-                    if (AgentKnobs.InstallLegacyTfExe.GetValue(jobContext).AsBoolean())
-                    {
-                        await TfManager.DownloadLegacyTfToolsAsync(context);
-                    }
-
                     // build up 3 lists of steps, pre-job, job, post-job
                     Stack<IStep> postJobStepsBuilder = new Stack<IStep>();
                     Dictionary<Guid, Variables> taskVariablesMapping = new Dictionary<Guid, Variables>();
diff --git a/src/Agent.Worker/JobRunner.cs b/src/Agent.Worker/JobRunner.cs
@@ -177,11 +177,7 @@ public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message,
                 jobContext.SetVariable(Constants.Variables.Agent.RootDirectory, HostContext.GetDirectory(WellKnownDirectory.Work), isFilePath: true);
                 if (PlatformUtil.RunningOnWindows)
                 {
-                    string serverOMDirectoryVariable = AgentKnobs.InstallLegacyTfExe.GetValue(jobContext).AsBoolean()
-                        ? HostContext.GetDirectory(WellKnownDirectory.ServerOMLegacy)
-                        : HostContext.GetDirectory(WellKnownDirectory.ServerOM);
-
-                    jobContext.SetVariable(Constants.Variables.Agent.ServerOMDirectory, serverOMDirectoryVariable, isFilePath: true);
+                    jobContext.SetVariable(Constants.Variables.Agent.ServerOMDirectory, HostContext.GetDirectory(WellKnownDirectory.ServerOM), isFilePath: true);
                 }
                 if (!PlatformUtil.RunningOnWindows)
                 {
diff --git a/src/Agent.Worker/Release/ReleaseJobExtension.cs b/src/Agent.Worker/Release/ReleaseJobExtension.cs
@@ -229,11 +229,6 @@ private async Task DownloadArtifacts(IExecutionContext executionContext,
                 await teeUtil.DownloadTeeIfAbsent();
             }
 
-            if (AgentKnobs.InstallLegacyTfExe.GetValue(executionContext).AsBoolean())
-            {
-                await TfManager.DownloadLegacyTfToolsAsync(executionContext);
-            }
-
             try
             {
                 foreach (AgentArtifactDefinition agentArtifactDefinition in agentArtifactDefinitions)
diff --git a/src/Agent.Worker/TfManager.cs b/src/Agent.Worker/TfManager.cs
diff --git a/src/Microsoft.VisualStudio.Services.Agent/Constants.cs b/src/Microsoft.VisualStudio.Services.Agent/Constants.cs
@@ -22,8 +22,6 @@ public enum WellKnownDirectory
         Tools,
         Update,
         Work,
-        TfLegacy,
-        ServerOMLegacy
     }
 
     public enum WellKnownConfigFile
@@ -315,11 +313,9 @@ public static class Path
             public static readonly string ExternalsDirectory = "externals";
             public static readonly string LegacyPSHostDirectory = "vstshost";
             public static readonly string ServerOMDirectory = "vstsom";
-            public static readonly string ServerOMLegacyDirectory = "vstsom-legacy";
             public static readonly string TempDirectory = "_temp";
             public static readonly string TeeDirectory = "tee";
             public static readonly string TfDirectory = "tf";
-            public static readonly string TfLegacyDirectory = "tf-legacy";
             public static readonly string ToolDirectory = "_tool";
             public static readonly string TaskJsonFile = "task.json";
             public static readonly string TasksDirectory = "_tasks";
diff --git a/src/Microsoft.VisualStudio.Services.Agent/HostContext.cs b/src/Microsoft.VisualStudio.Services.Agent/HostContext.cs
@@ -206,24 +206,12 @@ public virtual string GetDirectory(WellKnownDirectory directory)
                         Constants.Path.ServerOMDirectory);
                     break;
 
-                case WellKnownDirectory.ServerOMLegacy:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Externals),
-                        Constants.Path.ServerOMLegacyDirectory);
-                    break;
-
                 case WellKnownDirectory.Tf:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Externals),
                         Constants.Path.TfDirectory);
                     break;
 
-                case WellKnownDirectory.TfLegacy:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Externals),
-                        Constants.Path.TfLegacyDirectory);
-                    break;
-
                 case WellKnownDirectory.Tee:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Externals),
diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh
@@ -164,14 +164,14 @@ if [[ "$PACKAGERUNTIME" == "win-x"* ]]; then
 
         acquireExternalTool "$CONTAINER_URL/azcopy/1/azcopy.zip" azcopy
         acquireExternalTool "$CONTAINER_URL/vstshost/m122_887c6659/vstshost.zip" vstshost
-        acquireExternalTool "$CONTAINER_URL/vstsom/m153_47c0856d_adhoc/vstsom.zip" vstsom
+        acquireExternalTool "$CONTAINER_URL/vstsom/m122_887c6659/vstsom.zip" vstsom
     fi
 
     acquireExternalTool "$CONTAINER_URL/mingit/${MINGIT_VERSION}/MinGit-${MINGIT_VERSION}-${BIT}-bit.zip" git
     acquireExternalTool "$CONTAINER_URL/git-lfs/${LFS_VERSION}/x${BIT}/git-lfs.exe" "git/mingw${BIT}/bin"
     acquireExternalTool "$CONTAINER_URL/pdbstr/1/pdbstr.zip" pdbstr
     acquireExternalTool "$CONTAINER_URL/symstore/1/symstore.zip" symstore
-    acquireExternalTool "$CONTAINER_URL/vstsom/m153_47c0856d_adhoc/vstsom.zip" tf
+    acquireExternalTool "$CONTAINER_URL/vstsom/m153_47c0856d/vstsom.zip" tf
     acquireExternalTool "$CONTAINER_URL/vswhere/2_8_4/vswhere.zip" vswhere
     acquireExternalTool "https://dist.nuget.org/win-x86-commandline/v3.4.4/nuget.exe" nuget
 
diff --git a/src/Test/L0/ServiceInterfacesL0.cs b/src/Test/L0/ServiceInterfacesL0.cs
@@ -99,8 +99,7 @@ public void WorkerInterfacesSpecifyDefaultImplementation()
                 typeof(IResultReader),
                 typeof(INUnitResultsXmlReader),
                 typeof(IWorkerCommand),
-                typeof(ITaskRestrictionsChecker),
-                typeof(IRetryOptions)
+                typeof(ITaskRestrictionsChecker)
             };
             Validate(
                 assembly: typeof(IStepsRunner).GetTypeInfo().Assembly,
diff --git a/src/Test/L0/TestHostContext.cs b/src/Test/L0/TestHostContext.cs
@@ -211,24 +211,12 @@ public string GetDirectory(WellKnownDirectory directory)
                         Constants.Path.ServerOMDirectory);
                     break;
 
-                case WellKnownDirectory.ServerOMLegacy:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Externals),
-                        Constants.Path.ServerOMLegacyDirectory);
-                    break;
-
                 case WellKnownDirectory.Tf:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Externals),
                         Constants.Path.TfDirectory);
                     break;
 
-                case WellKnownDirectory.TfLegacy:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Externals),
-                        Constants.Path.TfLegacyDirectory);
-                    break;
-
                 case WellKnownDirectory.Tee:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Externals),
diff --git a/src/Test/L0/Worker/TfManagerL0.cs b/src/Test/L0/Worker/TfManagerL0.cs

Original file line number	Diff line number	Diff line change
`@@ -758,12 +758,5 @@ public class AgentKnobs`
`758`	`758`	`"Use PowerShell script wrapper to handle PowerShell ConstrainedLanguage mode.",`
`759`	`759`	`new PipelineFeatureSource("UsePSScriptWrapper"),`
`760`	`760`	`new BuiltInDefaultKnobSource("false"));`
`761`		`-`
`762`		`- public static readonly Knob InstallLegacyTfExe = new Knob(`
`763`		`- nameof(InstallLegacyTfExe),`
`764`		`- "If true, agent will install the previous version of TF.exe in the tf-legacy and vstsom-legacy directories",`
`765`		`- new RuntimeKnobSource("AGENT_INSTALL_LEGACY_TF_EXE"),`
`766`		`- new EnvironmentKnobSource("AGENT_INSTALL_LEGACY_TF_EXE"),`
`767`		`- new BuiltInDefaultKnobSource("false"));`
`768`	`761`	`}`
`769`	`762`	`}`
Original file line number	Diff line number	Diff line change
`@@ -269,11 +269,6 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`
`272`		`- if (AgentKnobs.InstallLegacyTfExe.GetValue(jobContext).AsBoolean())`
`273`		`- {`
`274`		`- await TfManager.DownloadLegacyTfToolsAsync(context);`
`275`		`- }`
`276`		`-`
`277`	`272`	`// build up 3 lists of steps, pre-job, job, post-job`
`278`	`273`	`Stack<IStep> postJobStepsBuilder = new Stack<IStep>();`
`279`	`274`	`Dictionary<Guid, Variables> taskVariablesMapping = new Dictionary<Guid, Variables>();`
Original file line number	Diff line number	Diff line change
`@@ -177,11 +177,7 @@ public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message,`
`177`	`177`	`jobContext.SetVariable(Constants.Variables.Agent.RootDirectory, HostContext.GetDirectory(WellKnownDirectory.Work), isFilePath: true);`
`178`	`178`	`if (PlatformUtil.RunningOnWindows)`
`179`	`179`	`{`
`180`		`- string serverOMDirectoryVariable = AgentKnobs.InstallLegacyTfExe.GetValue(jobContext).AsBoolean()`
`181`		`- ? HostContext.GetDirectory(WellKnownDirectory.ServerOMLegacy)`
`182`		`- : HostContext.GetDirectory(WellKnownDirectory.ServerOM);`
`183`		`-`
`184`		`- jobContext.SetVariable(Constants.Variables.Agent.ServerOMDirectory, serverOMDirectoryVariable, isFilePath: true);`
	`180`	`+ jobContext.SetVariable(Constants.Variables.Agent.ServerOMDirectory, HostContext.GetDirectory(WellKnownDirectory.ServerOM), isFilePath: true);`
`185`	`181`	`}`
`186`	`182`	`if (!PlatformUtil.RunningOnWindows)`
`187`	`183`	`{`
Original file line number	Diff line number	Diff line change
`@@ -229,11 +229,6 @@ private async Task DownloadArtifacts(IExecutionContext executionContext,`
`229`	`229`	`await teeUtil.DownloadTeeIfAbsent();`
`230`	`230`	`}`
`231`	`231`
`232`		`- if (AgentKnobs.InstallLegacyTfExe.GetValue(executionContext).AsBoolean())`
`233`		`- {`
`234`		`- await TfManager.DownloadLegacyTfToolsAsync(executionContext);`
`235`		`- }`
`236`		`-`
`237`	`232`	`try`
`238`	`233`	`{`
`239`	`234`	`foreach (AgentArtifactDefinition agentArtifactDefinition in agentArtifactDefinitions)`