Remove test setup that's happening in the CI setup scripts

The tests that need to set things up like this should just be ensuring this state directly, since there's no guarantee that this would have ran before many types of tests run. Fixes dotnet#49486
jasonmalinowski · Feb 23, 2024 · bfc2d3b · bfc2d3b
1 parent f98be49
commit bfc2d3b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/eng/build.ps1 b/eng/build.ps1
@@ -700,14 +700,6 @@ function Setup-IntegrationTestRun() {
   $env:ROSLYN_LSPEDITOR = "$lspEditor"
 }
 
-function Prepare-TempDir() {
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\global.json") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\Directory.Build.props") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\Directory.Build.targets") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\Directory.Build.rsp") $TempDir
-  Copy-Item (Join-Path $RepoRoot "src\Workspaces\MSBuildTest\Resources\NuGet.Config") $TempDir
-}
-
 function List-Processes() {
   Write-Host "Listing running build processes..."
   Get-Process -Name "msbuild" -ErrorAction SilentlyContinue | Out-Host
@@ -736,7 +728,6 @@ try {
 
   if ($ci) {
     List-Processes
-    Prepare-TempDir
     EnablePreviewSdks
     if ($testVsi) {
       Setup-IntegrationTestRun

diff --git a/src/Tools/PrepareTests/MinimizeUtil.cs b/src/Tools/PrepareTests/MinimizeUtil.cs
@@ -22,18 +22,10 @@ internal static void Run(string sourceDirectory, string destinationDirectory, bo
         var duplicateDirectory = Path.Combine(destinationDirectory, duplicateDirectoryName);
         Directory.CreateDirectory(duplicateDirectory);
 
-        // https://github.com/dotnet/roslyn/issues/49486
-        // we should avoid copying the files under Resources.
-        Directory.CreateDirectory(Path.Combine(destinationDirectory, "src/Workspaces/MSBuildTest/Resources"));
         var individualFiles = new[]
         {
             "global.json",
             "NuGet.config",
-            "src/Workspaces/MSBuildTest/Resources/global.json",
-            "src/Workspaces/MSBuildTest/Resources/Directory.Build.props",
-            "src/Workspaces/MSBuildTest/Resources/Directory.Build.targets",
-            "src/Workspaces/MSBuildTest/Resources/Directory.Build.rsp",
-            "src/Workspaces/MSBuildTest/Resources/NuGet.Config",
         };
 
         foreach (var individualFile in individualFiles)