From 2468cf2c5dd964a0746a9a01cf6ae48a1275888c Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 30 Nov 2022 05:55:45 -0800 Subject: [PATCH] Delete DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER workarounds This workaround is no longer needed with .NET SDK 7 GA --- eng/common/tools.sh | 6 ------ eng/pipelines/coreclr/templates/run-performance-job.yml | 1 - eng/testing/performance/microbenchmarks.proj | 3 +-- eng/testing/tests.wasm.targets | 4 ---- src/installer/tests/TestUtils/DotNetCli.cs | 1 - src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs | 6 ------ src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs | 2 -- src/mono/wasm/Wasm.Build.Tests/RunCommand.cs | 2 -- 8 files changed, 1 insertion(+), 24 deletions(-) diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6586eab458e55..174f20f8b13ef 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -416,12 +416,6 @@ function MSBuild { export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20" - - # https://github.com/dotnet/arcade/issues/11369 - disable new MSBuild server feature on linux - # This feature is new and can result in build failures from connection timeout errors. - export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1 - Write-PipelineSetVariable -name "DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER" -value "1" - fi local toolset_dir="${_InitializeToolset%/*}" diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index ada5747efd79a..40b19c0bed1e4 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -90,7 +90,6 @@ jobs: sudo apt-get update && sudo apt -y install curl dirmngr apt-transport-https lsb-release ca-certificates && $(HelixPreCommandsWasmOnLinux) && - export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1 && export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)" || export PERF_PREREQS_INSTALL_FAILED=1; test "x$PERF_PREREQS_INSTALL_FAILED" = "x1" && echo "** Error: Failed to install prerequites **" diff --git a/eng/testing/performance/microbenchmarks.proj b/eng/testing/performance/microbenchmarks.proj index 3b93a143ab4d9..394aa992d41d2 100644 --- a/eng/testing/performance/microbenchmarks.proj +++ b/eng/testing/performance/microbenchmarks.proj @@ -34,8 +34,7 @@ python3 $(BaseDirectory)/Core_Root/corerun $(BaseDirectory)/Baseline_Core_Root/corerun - - $(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh;export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1 + $(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh $HELIX_WORKITEM_ROOT/artifacts/BenchmarkDotNet.Artifacts $HELIX_WORKITEM_ROOT/artifacts/BenchmarkDotNet.Artifacts_Baseline $(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index f045e427a4607..ebe58971b1e27 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -74,16 +74,12 @@ - - - - diff --git a/src/installer/tests/TestUtils/DotNetCli.cs b/src/installer/tests/TestUtils/DotNetCli.cs index d7fcdabeb8a17..08e40aaf25e6c 100644 --- a/src/installer/tests/TestUtils/DotNetCli.cs +++ b/src/installer/tests/TestUtils/DotNetCli.cs @@ -53,7 +53,6 @@ public Command Exec(string command, params string[] args) newArgs.Insert(0, command); return Command.Create(DotnetExecutablePath, newArgs) - .EnvironmentVariable("DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER", "1") // https://github.com/dotnet/runtime/issues/74328 .EnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1") .EnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0"); // Avoid looking at machine state by default } diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs index cbc8d72673e71..ca8189ecf91c9 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs @@ -113,12 +113,6 @@ public BuildEnvironment() // helps with debugging EnvVars["WasmNativeStrip"] = "false"; - // Works around an issue in msbuild due to which - // second, and subsequent builds fail without any details - // in the logs - EnvVars["DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER"] = "1"; - DefaultBuildArgs += " /nr:false"; - DotNet = Path.Combine(sdkForWorkloadPath!, "dotnet"); if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) DotNet += ".exe"; diff --git a/src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs b/src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs index 44f58f5cc45e0..84ccf2fa23ab1 100644 --- a/src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs @@ -16,8 +16,6 @@ public DotNetCommand(BuildEnvironment buildEnv, ITestOutputHelper _testOutput, b _useDefaultArgs = useDefaultArgs; if (useDefaultArgs) WithEnvironmentVariables(buildEnv.EnvVars); - // workaround msbuild issue - https://github.com/dotnet/runtime/issues/74328 - WithEnvironmentVariable("DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER", "1"); } protected override string GetFullArgs(params string[] args) diff --git a/src/mono/wasm/Wasm.Build.Tests/RunCommand.cs b/src/mono/wasm/Wasm.Build.Tests/RunCommand.cs index d7baa51e2c113..b13b6011de265 100644 --- a/src/mono/wasm/Wasm.Build.Tests/RunCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/RunCommand.cs @@ -15,7 +15,5 @@ public RunCommand(BuildEnvironment buildEnv, ITestOutputHelper _testOutput, stri WithEnvironmentVariable("DOTNET_INSTALL_DIR", Path.GetDirectoryName(buildEnv.DotNet)!); WithEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0"); WithEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1"); - // workaround msbuild issue - https://github.com/dotnet/runtime/issues/74328 - WithEnvironmentVariable("DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER", "1"); } }