From bfc2d3b8cb3f97d4e949ea2354c6cd39f383f0dc Mon Sep 17 00:00:00 2001 From: Jason Malinowski Date: Thu, 22 Feb 2024 16:40:43 -0800 Subject: [PATCH] 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 https://github.com/dotnet/roslyn/issues/49486 --- eng/build.ps1 | 9 --------- src/Tools/PrepareTests/MinimizeUtil.cs | 8 -------- 2 files changed, 17 deletions(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index 51658070c7a7f..8cbdab3685ee4 100644 --- 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 index 1f1d866af7586..c2024c297defe 100644 --- 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)