From 2f59819b454a939e126ce6617904df0914598cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Tue, 14 Jan 2025 12:45:01 +0100 Subject: [PATCH] Revert source build (#4637) --- TestFx.sln | 7 -- azure-pipelines-official.yml | 1 - azure-pipelines.yml | 1 - eng/Analyzers.props | 3 +- eng/Build.props | 69 ++++++++----------- eng/DotNetBuild.props | 10 --- eng/SourceBuildPrebuiltBaseline.xml | 9 --- eng/Version.Details.xml | 24 ------- eng/verify-nupkgs.ps1 | 6 +- ...t.Testing.Platform.DotNetTestClient.csproj | 54 --------------- .../PACKAGE.md | 7 -- .../Microsoft.Testing.Platform.csproj | 1 + .../{ => IPC}/DotnetTestDataConsumer.cs | 0 13 files changed, 34 insertions(+), 158 deletions(-) delete mode 100644 eng/DotNetBuild.props delete mode 100644 eng/SourceBuildPrebuiltBaseline.xml delete mode 100644 src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj delete mode 100644 src/Package/Microsoft.Testing.Platform.DotNetTestClient/PACKAGE.md rename src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/{ => IPC}/DotnetTestDataConsumer.cs (100%) diff --git a/TestFx.sln b/TestFx.sln index 3a4f8e7512..bb3a99f3ba 100644 --- a/TestFx.sln +++ b/TestFx.sln @@ -212,8 +212,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Testing.Extension EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Testing.Extensions.Retry", "src\Platform\Microsoft.Testing.Extensions.Retry\Microsoft.Testing.Extensions.Retry.csproj", "{FB4ED3AA-A12E-4192-861F-4B025876AA0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Testing.Platform.DotNetTestClient", "src\Package\Microsoft.Testing.Platform.DotNetTestClient\Microsoft.Testing.Platform.DotNetTestClient.csproj", "{4E4F965E-2EEF-471B-A5DA-A53BFA967A95}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -496,10 +494,6 @@ Global {FB4ED3AA-A12E-4192-861F-4B025876AA0F}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB4ED3AA-A12E-4192-861F-4B025876AA0F}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB4ED3AA-A12E-4192-861F-4B025876AA0F}.Release|Any CPU.Build.0 = Release|Any CPU - {4E4F965E-2EEF-471B-A5DA-A53BFA967A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E4F965E-2EEF-471B-A5DA-A53BFA967A95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E4F965E-2EEF-471B-A5DA-A53BFA967A95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E4F965E-2EEF-471B-A5DA-A53BFA967A95}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -586,7 +580,6 @@ Global {4A93E1A2-B61E-31B2-33F2-478156A9B5E7} = {E7F15C9C-3928-47AD-8462-64FD29FFCA54} {53EBA540-F6CF-0715-1F62-241A53F537EC} = {6AEE1440-FDF0-4729-8196-B24D0E333550} {FB4ED3AA-A12E-4192-861F-4B025876AA0F} = {6AEE1440-FDF0-4729-8196-B24D0E333550} - {4E4F965E-2EEF-471B-A5DA-A53BFA967A95} = {E374A3A6-C364-4890-B315-D60F5C682B6E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9} diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 56f4ea0895..92e6a3d3f8 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -92,7 +92,6 @@ extends: enablePublishBuildAssets: true enablePublishUsingPipelines: true enableTelemetry: true - enableSourceBuild: true jobs: - job: Windows timeoutInMinutes: 90 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f5d636894e..3e2b2e6720 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,7 +48,6 @@ stages: enablePublishBuildAssets: true enablePublishUsingPipelines: true enableTelemetry: true - enableSourceBuild: true jobs: - job: Windows timeoutInMinutes: 90 diff --git a/eng/Analyzers.props b/eng/Analyzers.props index 1283f82e91..8fef5a81be 100644 --- a/eng/Analyzers.props +++ b/eng/Analyzers.props @@ -7,8 +7,7 @@ true - - + diff --git a/eng/Build.props b/eng/Build.props index e04a3d62ad..57aac3a459 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -4,47 +4,38 @@ all - - - - - - - - - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + - - - - - - diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props deleted file mode 100644 index f4d2580ef8..0000000000 --- a/eng/DotNetBuild.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - testfx - true - - - diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml deleted file mode 100644 index 1b37a10db6..0000000000 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f73f921c6..cd3cf2afae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,29 +21,5 @@ https://github.com/microsoft/testanywhere 28cec7968849d310294a8ad1f1ecc4f9355fa32e - - - https://github.com/dotnet/diagnostics - 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 - - - - - https://github.com/dotnet/source-build-externals - 4df883d781a4290873b3b968afc0ff0df7132507 - - - - - https://github.com/dotnet/source-build-reference-packages - 80f1e84b2077a7208943db050067d86c94ace837 - - - - - https://github.com/dotnet/arcade - 61b8f746424762d2e3173ebfaab19346224d591c - - diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1 index b25dc46d20..4d7fe1b336 100644 --- a/eng/verify-nupkgs.ps1 +++ b/eng/verify-nupkgs.ps1 @@ -1,6 +1,6 @@ [CmdletBinding()] Param( - [Parameter(Mandatory = $true)] + [Parameter(Mandatory=$true)] [System.String] $configuration ) @@ -24,7 +24,6 @@ function Confirm-NugetPackages { "MSTest.TestAdapter" = 75 "MSTest" = 6 "MSTest.Analyzers" = 50 - "Microsoft.Testing.Platform.DotNetTestClient" = 7 } $packageDirectory = Resolve-Path "$PSScriptRoot/../artifacts/packages/$configuration" @@ -79,8 +78,7 @@ function Confirm-NugetPackages { if ($errors) { Write-Error "Validation of NuGet packages failed with $($errors.Count) errors:`n$($errors -join "`n")" - } - else { + } else { Write-Host "Successfully validated content of NuGet packages" } } diff --git a/src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj b/src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj deleted file mode 100644 index f5524c8883..0000000000 --- a/src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj +++ /dev/null @@ -1,54 +0,0 @@ - - - - $(NetCurrent) - $(TestingPlatformVersionPrefix) - - - - true - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Package/Microsoft.Testing.Platform.DotNetTestClient/PACKAGE.md b/src/Package/Microsoft.Testing.Platform.DotNetTestClient/PACKAGE.md deleted file mode 100644 index 857a8f0a35..0000000000 --- a/src/Package/Microsoft.Testing.Platform.DotNetTestClient/PACKAGE.md +++ /dev/null @@ -1,7 +0,0 @@ -# Microsoft.Testing.Platform.DotNetTestClient - -This package contains types that are required by `dotnet test` in dotnet/SDK to communicate with an Microsoft.Testing.Platform test executable. - -Supported platforms: - -- .NET 10 diff --git a/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj b/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj index 2aade9a71e..65d829e792 100644 --- a/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj +++ b/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj @@ -48,6 +48,7 @@ This package provides the core platform and the .NET implementation of the proto + diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/DotnetTestDataConsumer.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/IPC/DotnetTestDataConsumer.cs similarity index 100% rename from src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/DotnetTestDataConsumer.cs rename to src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/IPC/DotnetTestDataConsumer.cs