Revert source build (#4637)

microsoft · Jan 14, 2025 · 2f59819 · 2f59819
1 parent dd6ade2
commit 2f59819
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 158 deletions.
diff --git 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
@@ -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
@@ -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
@@ -7,8 +7,7 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
-  <!-- Source build requires that everything needed for build is source-buildable, so we don't use analyzers for source build. -->
-  <ItemGroup Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
+  <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" Condition="'$(IsSourceProject)' == 'true'" />
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="all" />
 

diff --git a/eng/Build.props b/eng/Build.props
@@ -4,47 +4,38 @@
     <ProductsToBuild Condition=" '$(ProductsToBuild)' == '' ">all</ProductsToBuild>
   </PropertyGroup>
 
-  <Choose>
-    <When Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
-      <!-- When building for source build we only want to build the DotnetTestClient, this is the only component shared to dotnet/sdk. -->
-      <ItemGroup>
-        <ProjectToBuild Include="$(RepoRoot)src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <!-- When building all products on windows OS -->
-      <ItemGroup Condition=" '$(ProductsToBuild)' == 'all' AND '$(OS)' == 'Windows_NT' ">
-        <ProjectToBuild Include="$(RepoRoot)TestFx.sln" />
-      </ItemGroup>
+  <!-- When building all products on windows OS -->
+  <ItemGroup Condition=" '$(ProductsToBuild)' == 'all' AND '$(OS)' == 'Windows_NT' ">
+    <ProjectToBuild  Include="$(RepoRoot)TestFx.sln" />
+  </ItemGroup>
 
-      <!-- When building all products on non-windows OSes -->
-      <ItemGroup Condition=" '$(ProductsToBuild)' == 'all' AND '$(OS)' != 'Windows_NT' ">
-        <ProjectToBuild Include="$(RepoRoot)src/**/*.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)test/UnitTests/Microsoft.Testing.*/Microsoft.Testing.*.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MSTest.Acceptance.IntegrationTests.csproj" />
-      </ItemGroup>
+  <!-- When building all products on non-windows OSes -->
+  <ItemGroup Condition=" '$(ProductsToBuild)' == 'all' AND '$(OS)' != 'Windows_NT' ">
+    <ProjectToBuild Include="$(RepoRoot)src/**/*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/UnitTests/Microsoft.Testing.*/Microsoft.Testing.*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MSTest.Acceptance.IntegrationTests.csproj" />
+  </ItemGroup>
 
-      <!-- When building MSTest only on windows OS -->
-      <ItemGroup Condition=" '$(ProductsToBuild)' == 'mstest' AND '$(OS)' == 'Windows_NT' ">
-        <ProjectToBuild Include="$(RepoRoot)MSTest.slnf" />
-      </ItemGroup>
+  <!-- When building MSTest only on windows OS -->
+  <ItemGroup Condition=" '$(ProductsToBuild)' == 'mstest' AND '$(OS)' == 'Windows_NT' ">
+    <ProjectToBuild Include="$(RepoRoot)MSTest.slnf" />
+  </ItemGroup>
 
-      <!-- When building MSTest only on non-windows OSes -->
-      <ItemGroup Condition=" '$(ProductsToBuild)' == 'mstest' AND '$(OS)' != 'Windows_NT' ">
-        <ProjectToBuild Include="$(RepoRoot)src/Adapter/**/*.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)src/Analyzers/**/*.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)src/Package/**/*.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)src/TestFramework/**/*.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj" />
-        <ProjectToBuild Include="$(RepoRoot)test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MSTest.Acceptance.IntegrationTests.csproj" />
-      </ItemGroup>
+  <!-- When building MSTest only on non-windows OSes -->
+  <ItemGroup Condition=" '$(ProductsToBuild)' == 'mstest' AND '$(OS)' != 'Windows_NT' ">
+    <ProjectToBuild Include="$(RepoRoot)src/Adapter/**/*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)src/Analyzers/**/*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)src/Package/**/*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)src/TestFramework/**/*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MSTest.Acceptance.IntegrationTests.csproj" />
+  </ItemGroup>
+
+  <!-- When building Microsoft.Testing.Platform only -->
+  <ItemGroup Condition=" '$(ProductsToBuild)' == 'testing-platform' ">
+    <ProjectToBuild Include="$(RepoRoot)Microsoft.Testing.Platform.slnf" />
+  </ItemGroup>
 
-      <!-- When building Microsoft.Testing.Platform only -->
-      <ItemGroup Condition=" '$(ProductsToBuild)' == 'testing-platform' ">
-        <ProjectToBuild Include="$(RepoRoot)Microsoft.Testing.Platform.slnf" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
 </Project>
diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -21,29 +21,5 @@
       <Uri>https://github.com/microsoft/testanywhere</Uri>
       <Sha>28cec7968849d310294a8ad1f1ecc4f9355fa32e</Sha>
     </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.diagnostics" Version="9.0.0-preview.24566.1">
-      <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>8c505ca6921b5f7e9b8acc234cc8f15035537ee4</Sha>
-      <SourceBuild RepoName="diagnostics" ManagedOnly="true" />
-    </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24175.1">
-      <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>4df883d781a4290873b3b968afc0ff0df7132507</Sha>
-      <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
-    </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.563001">
-      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>80f1e84b2077a7208943db050067d86c94ace837</Sha>
-      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
-    </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24606.6">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
-      <SourceBuild RepoName="arcade" ManagedOnly="true" />
-    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git 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/...soft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj b/...soft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj
diff --git a/src/Package/Microsoft.Testing.Platform.DotNetTestClient/PACKAGE.md b/src/Package/Microsoft.Testing.Platform.DotNetTestClient/PACKAGE.md
diff --git 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
   <!-- end netstandard2.0 polyfill -->
 
   <ItemGroup>
+    <InternalsVisibleTo Include="dotnet" Key="$(MicrosoftAspNetCorePublicKey)" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.CrashDump" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.Experimental" Key="$(VsPublicKey)" />

diff --git a/...Mode/DotnetTest/DotnetTestDataConsumer.cs → .../DotnetTest/IPC/DotnetTestDataConsumer.cs b/...Mode/DotnetTest/DotnetTestDataConsumer.cs → .../DotnetTest/IPC/DotnetTestDataConsumer.cs