Point MSTest.Sdk back to the classic sourcegen + engine wiring

Restore the MSTestEngineVersion token and re-add the MSTest.Engine package reference in the NativeAOT engine, referencing both MSTest.Engine and MSTest.SourceGeneration at that version (as in 4.2.3), while keeping the 4.3 packaging/CPM/SDK-layering improvements and report extensions.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: Evangelink

src/Package/MSTest.Sdk/MSTest.Sdk.csproj

@@ -46,6 +46,11 @@
   <Target Name="GenerateTemplates" AfterTargets="PrepareForBuild">
     <PropertyGroup>
       <!-- https://github.com/dotnet/arcade/blob/cb9979d0e7061c2252f4a3057c20eb72f503cff7/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L111-L114 -->
+      <!--
+        The computed source-generation package version is flowed to the SDK templates under the
+        legacy 'MSTestEngineVersion' token. MSTest.Sdk references both the MSTest.Engine and
+        MSTest.SourceGeneration packages at this single version (see NativeAOT.targets).
+      -->
       <_MSTestSourceGenerationPreReleaseVersionLabel>$(MSTestSourceGenerationPreReleaseVersionLabel)</_MSTestSourceGenerationPreReleaseVersionLabel>
       <_MSTestSourceGenerationPreReleaseVersionLabel Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OfficialBuild)' != 'true'">ci</_MSTestSourceGenerationPreReleaseVersionLabel>
       <_MSTestSourceGenerationPreReleaseVersionLabel Condition="'$(ContinuousIntegrationBuild)' != 'true' and '$(OfficialBuild)' != 'true'">dev</_MSTestSourceGenerationPreReleaseVersionLabel>
@@ -81,7 +86,7 @@
       <_MicrosoftTestingExtensionsOpenTelemetryVersion>$(MicrosoftTestingExtensionsOpenTelemetryVersionPrefix)</_MicrosoftTestingExtensionsOpenTelemetryVersion>
       <_MicrosoftTestingExtensionsOpenTelemetryVersion Condition="'$(_MicrosoftTestingExtensionsOpenTelemetryVersionSuffix)' != ''">$(_MicrosoftTestingExtensionsOpenTelemetryVersion)-$(_MicrosoftTestingExtensionsOpenTelemetryVersionSuffix)</_MicrosoftTestingExtensionsOpenTelemetryVersion>
 
-      <_TemplateProperties>MSTestSourceGenerationVersion=$(_MSTestSourceGenerationVersion);MSTestVersion=$(Version);MicrosoftTestingPlatformVersion=$(Version.Replace('$(VersionPrefix)', '$(TestingPlatformVersionPrefix)'));MicrosoftNETTestSdkVersion=$(MicrosoftNETTestSdkVersion);MicrosoftTestingExtensionsCodeCoverageVersion=$(MicrosoftTestingExtensionsCodeCoverageVersion);MicrosoftPlaywrightVersion=$(MicrosoftPlaywrightVersion);AspireHostingTestingVersion=$(AspireHostingTestingVersion);MicrosoftTestingExtensionsFakesVersion=$(MicrosoftTestingExtensionsFakesVersion);MicrosoftTestingExtensionsCtrfReportVersion=$(_MicrosoftTestingExtensionsCtrfReportVersion);MicrosoftTestingExtensionsJUnitReportVersion=$(_MicrosoftTestingExtensionsJUnitReportVersion);MicrosoftTestingExtensionsGitHubActionsReportVersion=$(_MicrosoftTestingExtensionsGitHubActionsReportVersion);MicrosoftTestingExtensionsOpenTelemetryVersion=$(_MicrosoftTestingExtensionsOpenTelemetryVersion)</_TemplateProperties>
+      <_TemplateProperties>MSTestEngineVersion=$(_MSTestSourceGenerationVersion);MSTestVersion=$(Version);MicrosoftTestingPlatformVersion=$(Version.Replace('$(VersionPrefix)', '$(TestingPlatformVersionPrefix)'));MicrosoftNETTestSdkVersion=$(MicrosoftNETTestSdkVersion);MicrosoftTestingExtensionsCodeCoverageVersion=$(MicrosoftTestingExtensionsCodeCoverageVersion);MicrosoftPlaywrightVersion=$(MicrosoftPlaywrightVersion);AspireHostingTestingVersion=$(AspireHostingTestingVersion);MicrosoftTestingExtensionsFakesVersion=$(MicrosoftTestingExtensionsFakesVersion);MicrosoftTestingExtensionsCtrfReportVersion=$(_MicrosoftTestingExtensionsCtrfReportVersion);MicrosoftTestingExtensionsJUnitReportVersion=$(_MicrosoftTestingExtensionsJUnitReportVersion);MicrosoftTestingExtensionsGitHubActionsReportVersion=$(_MicrosoftTestingExtensionsGitHubActionsReportVersion);MicrosoftTestingExtensionsOpenTelemetryVersion=$(_MicrosoftTestingExtensionsOpenTelemetryVersion)</_TemplateProperties>
     </PropertyGroup>
 
     <!--

src/Package/MSTest.Sdk/Sdk/Runner/NativeAOT.targets

@@ -43,10 +43,16 @@
     <PackageVersion Include="MSTest.TestFramework" Version="$(MSTestVersion)"
                     Condition=" '$(ManagePackageVersionsCentrally)' == 'true' " />
 
+    <PackageReference Include="MSTest.Engine" Sdk="MSTest">
+      <Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">$(MSTestEngineVersion)</Version>
+    </PackageReference>
+    <PackageVersion Include="MSTest.Engine" Version="$(MSTestEngineVersion)"
+                    Condition=" '$(ManagePackageVersionsCentrally)' == 'true' " />
+
     <PackageReference Include="MSTest.SourceGeneration" Sdk="MSTest">
-      <Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">$(MSTestSourceGenerationVersion)</Version>
+      <Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">$(MSTestEngineVersion)</Version>
     </PackageReference>
-    <PackageVersion Include="MSTest.SourceGeneration" Version="$(MSTestSourceGenerationVersion)"
+    <PackageVersion Include="MSTest.SourceGeneration" Version="$(MSTestEngineVersion)"
                     Condition=" '$(ManagePackageVersionsCentrally)' == 'true' " />
   </ItemGroup>
 

src/Package/MSTest.Sdk/Sdk/Sdk.props.template

@@ -51,7 +51,7 @@
     <MicrosoftTestingExtensionsJUnitReportVersion Condition=" '$(MicrosoftTestingExtensionsJUnitReportVersion)' == '' " >${MicrosoftTestingExtensionsJUnitReportVersion}</MicrosoftTestingExtensionsJUnitReportVersion>
     <MicrosoftTestingExtensionsOpenTelemetryVersion Condition=" '$(MicrosoftTestingExtensionsOpenTelemetryVersion)' == '' " >${MicrosoftTestingExtensionsOpenTelemetryVersion}</MicrosoftTestingExtensionsOpenTelemetryVersion>
     <MicrosoftTestingPlatformVersion Condition=" '$(MicrosoftTestingPlatformVersion)' == '' " >${MicrosoftTestingPlatformVersion}</MicrosoftTestingPlatformVersion>
-    <MSTestSourceGenerationVersion Condition=" '$(MSTestSourceGenerationVersion)' == '' ">${MSTestSourceGenerationVersion}</MSTestSourceGenerationVersion>
+    <MSTestEngineVersion Condition=" '$(MSTestEngineVersion)' == '' ">${MSTestEngineVersion}</MSTestEngineVersion>
     <MSTestVersion Condition=" '$(MSTestVersion)' == '' ">${MSTestVersion}</MSTestVersion>
   </PropertyGroup>