Update sourcegen

eng/Version.Details.xml

@@ -21,9 +21,9 @@
       <Uri>https://github.com/microsoft/testanywhere</Uri>
       <Sha>c13e51348015685e1ec9a71377c6e7a2ef52cfd2</Sha>
     </Dependency>
-    <Dependency Name="MSTest.Engine" Version="1.0.0-alpha.24473.2">
+    <Dependency Name="MSTest.SourceGeneration" Version="1.0.0-alpha.24501.1">
       <Uri>https://github.com/microsoft/testanywhere</Uri>
-      <Sha>aa2fcc8616d988b234bc1d218465b20c56d0b82f</Sha>
+      <Sha>aef1b181cc47377cf9c381f650be704b5a8dfc44</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -1,16 +1,16 @@
 <Project>
   <PropertyGroup Label="Version settings">
     <!-- MSTest version -->
-    <VersionPrefix>3.7.0</VersionPrefix>
+    <VersionPrefix>3.8.0</VersionPrefix>
     <!-- Testing Platform version -->
-    <TestingPlatformVersionPrefix>1.5.0</TestingPlatformVersionPrefix>
+    <TestingPlatformVersionPrefix>1.6.0</TestingPlatformVersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup Label="MSTest prod dependencies - darc updated">
     <MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
     <MicrosoftTestingExtensionsCodeCoverageVersion>17.12.5-preview.24477.4</MicrosoftTestingExtensionsCodeCoverageVersion>
     <!-- comment to facilitate merge conflicts -->
     <MicrosoftTestingInternalFrameworkVersion>1.5.0-preview.24477.3</MicrosoftTestingInternalFrameworkVersion>
-    <MSTestEngineVersion>1.0.0-alpha.24473.2</MSTestEngineVersion>
+    <MSTestSourceGenerationVersion>1.0.0-alpha.24501.1</MSTestSourceGenerationVersion>
   </PropertyGroup>
 </Project>

samples/Playground/Program.cs

@@ -25,7 +25,7 @@ public static async Task<int> Main(string[] args)
         if (Environment.GetEnvironmentVariable("TESTSERVERMODE") != "1")
         {
             // To attach to the children
-            Microsoft.Testing.TestInfrastructure.DebuggerUtility.AttachCurrentProcessToParentVSProcess();
+            // Microsoft.Testing.TestInfrastructure.DebuggerUtility.AttachCurrentProcessToParentVSProcess();
             ITestApplicationBuilder testApplicationBuilder = await TestApplication.CreateBuilderAsync(args);
             testApplicationBuilder.AddMSTest(() => [Assembly.GetEntryAssembly()!]);
 

src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs

@@ -11,6 +11,9 @@
 using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
 using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
 using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
+#if NET8_0_OR_GREATER
+using Microsoft.VisualStudio.TestPlatform.MSTestAdapter;
+#endif
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;
@@ -300,8 +303,13 @@ private static bool DynamicDataAttached(UnitTestElement test, Lazy<TestMethodInf
         return testMethodInfo.Value != null && TryProcessTestDataSourceTests(test, testMethodInfo.Value, tests);
     }
 
+    [UnconditionalSuppressMessage("Aot", "IL3000:DoNotUseLocation", Justification = "Fixture tests are not supported in NativeAOT mode.")]
+
     private static void AddFixtureTests(TestMethodInfo testMethodInfo, List<UnitTestElement> tests, HashSet<string> fixtureTests)
     {
+#if NET8_0_OR_GREATER
+        ApplicationStateGuard.Ensure(System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported, "Fixture tests are not supported in NativeAOT mode.");
+#endif
         string assemblyName = testMethodInfo.Parent.Parent.Assembly.GetName().Name!;
         string assemblyLocation = testMethodInfo.Parent.Parent.Assembly.Location;
         string className = testMethodInfo.Parent.ClassType.Name;

src/Adapter/MSTest.TestAdapter/Execution/TypeCache.cs

@@ -257,6 +257,7 @@ private static bool TryGetUnescapedManagedTypeName(TestMethod testMethod, [NotNu
     /// <param name="classType"> The class Type. </param>
     /// <param name="testMethod"> The test Method. </param>
     /// <returns> The <see cref="TestClassInfo"/>. </returns>
+    [UnconditionalSuppressMessage("Aot", "IL2070:DoNotUseGetConstructor", Justification = "We access all the types we need in metadata, so this is preserved and works.")]
     private TestClassInfo CreateClassInfo(Type classType, TestMethod testMethod)
     {
         IEnumerable<ConstructorInfo> constructors = PlatformServiceProvider.Instance.ReflectionOperations.GetDeclaredConstructors(classType);

src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj

@@ -12,7 +12,7 @@
 
   <PropertyGroup>
     <!-- Enable AOT analyzer warnings to make sure we don't call APIs that would fail when we use source generator mode together with NativeAOT. -->
-    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">$(EnableIotAnalyzers)</IsAotCompatible>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
   </PropertyGroup>
 
   <PropertyGroup>

src/Adapter/MSTest.TestAdapter/TestMethodFilter.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
@@ -118,6 +119,7 @@ internal TestProperty PropertyProvider(string propertyName)
     /// <param name="context">Discovery context.</param>
     /// <param name="logger">The logger to log exception messages too.</param>
     /// <returns>Filter expression.</returns>
+    [UnconditionalSuppressMessage("Aot", "IL2072:DoNotUseDynamicMembers", Justification = "Tested it, it works.")]
     private ITestCaseFilterExpression? GetTestCaseFilterFromDiscoveryContext(IDiscoveryContext context, IMessageLogger logger)
     {
         try

src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/TestingPlatformBuilderHook.cs

@@ -11,6 +11,17 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 public static class TestingPlatformBuilderHook
 {
 #pragma warning disable IDE0060 // Remove unused parameter
-    public static void AddExtensions(ITestApplicationBuilder testApplicationBuilder, string[] arguments) => testApplicationBuilder.AddMSTest(() => [Assembly.GetEntryAssembly()!]);
+    public static void AddExtensions(ITestApplicationBuilder testApplicationBuilder, string[] arguments)
+    {
+#if NET8_0_OR_GREATER
+        if (!System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported)
+        {
+            // We don't have a reliable way to get reference to the entry dll when compiled as NativeAOT. So instead we do the same registration
+            // in source generator.
+            return;
+        }
+#endif
+        testApplicationBuilder.AddMSTest(() => [Assembly.GetEntryAssembly()!]);
+    }
 }
 #endif

src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs

@@ -3,6 +3,7 @@
 
 #if NETFRAMEWORK || NET
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 #if NETFRAMEWORK
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -291,16 +292,14 @@ private static
 #endif
     bool DoesFileExist(string filePath) => File.Exists(filePath);
 
+    [UnconditionalSuppressMessage("Aot", "IL2026:DoNotUseGetDefinedTypes", Justification = "The whole class is not used in source generator mode.")]
+
 #if NETFRAMEWORK
     protected virtual
 #else
     private static
 #endif
-
-    // This whole class is not used in source generator mode.
-#pragma warning disable IL2026 // Members attributed with RequiresUnreferencedCode may break when trimming
     Assembly LoadAssemblyFrom(string path) => Assembly.LoadFrom(path);
-#pragma warning restore IL2026 // Members attributed with RequiresUnreferencedCode may break when trimming
 
 #if NETFRAMEWORK
     protected virtual Assembly ReflectionOnlyLoadAssemblyFrom(string path) => Assembly.ReflectionOnlyLoadFrom(path);

src/Adapter/MSTestAdapter.PlatformServices/Services/FileOperations.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 #if WIN_UI
@@ -81,12 +82,10 @@ public Assembly LoadAssembly(string assemblyName, bool isReflectionOnly)
     /// </summary>
     /// <param name="assembly">The assembly.</param>
     /// <returns>Path to the .DLL of the assembly.</returns>
+    [UnconditionalSuppressMessage("Aot", "IL3000:DoNotUseLocation", Justification = "This method will never be called in source generator mode, we are providing a different provider for file operations.")]
     public string? GetAssemblyPath(Assembly assembly)
 #if NETSTANDARD || NETCOREAPP || NETFRAMEWORK
-        // This method will never be called in source generator mode, we are providing a different provider for file operations.
-#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
         => assembly.Location;
-#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
 #elif WINDOWS_UWP
         => null; // TODO: what are the options here?
 #endif

src/Adapter/MSTestAdapter.PlatformServices/Services/ReflectionOperations2.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
@@ -38,6 +39,8 @@ public IEnumerable<PropertyInfo> GetDeclaredProperties(Type type)
     public PropertyInfo? GetDeclaredProperty(Type type, string propertyName)
         => type.GetTypeInfo().GetDeclaredProperty(propertyName);
 
+    [UnconditionalSuppressMessage("Aot", "IL2026:DoNotUseGetDefinedTypes", Justification = "We access all the types we need in metadata, so this is preserved and works.")]
+
     public Type[] GetDefinedTypes(Assembly assembly)
         => assembly.DefinedTypes.ToArray();
 
@@ -50,9 +53,11 @@ public IEnumerable<MethodInfo> GetRuntimeMethods(Type type)
     public PropertyInfo? GetRuntimeProperty(Type classType, string testContextPropertyName)
         => classType.GetProperty(testContextPropertyName);
 
+    [UnconditionalSuppressMessage("Aot", "IL2026:DoNotUseGetDefinedTypes", Justification = "We access all the types we need in metadata, so this is preserved and works.")]
     public Type? GetType(string typeName)
         => Type.GetType(typeName);
 
+    [UnconditionalSuppressMessage("Aot", "IL2026:DoNotUseGetDefinedTypes", Justification = "We access all the types we need in metadata, so this is preserved and works.")]
     public Type? GetType(Assembly assembly, string typeName)
         => assembly.GetType(typeName);
 

src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs

@@ -360,6 +360,7 @@ internal virtual string GetTargetFrameworkVersionString(string sourceFileName)
     /// <returns>
     /// A list of path.
     /// </returns>
+    [UnconditionalSuppressMessage("Aot", "IL3000:DoNotUseLocation", Justification = " We check for the empty path, and in single file mode, or on source gen mode we allow loading dependencies only from the current folder, which is what the default loader handles by itself.")]
     internal virtual List<string> GetResolutionPaths(string sourceFileName, bool isPortableMode)
     {
         List<string> resolutionPaths =
@@ -388,9 +389,6 @@ internal virtual List<string> GetResolutionPaths(string sourceFileName, bool isP
 #endif
         }
 
-        // We check for the empty path, and in single file mode, or on source gen mode we don't allow
-        // loading dependencies than from the current folder, which is what the default loader handles by itself.
-#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
         if (!string.IsNullOrEmpty(typeof(TestSourceHost).Assembly.Location))
         {
             // Adding adapter folder to resolution paths
@@ -408,7 +406,6 @@ internal virtual List<string> GetResolutionPaths(string sourceFileName, bool isP
                 resolutionPaths.Add(Path.GetDirectoryName(typeof(AssemblyHelper).Assembly.Location)!);
             }
         }
-#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
 
         return resolutionPaths;
     }

src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtilityBase.cs

@@ -126,6 +126,7 @@ public static string GetTestResultsDirectory(IRunContext? runContext) => !String
     /// <param name="deploymentDirectory">The deployment directory.</param>
     /// <param name="resultsDirectory">Root results directory.</param>
     /// <returns>Returns a list of deployment warnings.</returns>
+    [UnconditionalSuppressMessage("Aot", "IL3000:DoNotUseLocation", Justification = "Deployment feature is not available in native.")]
     protected IEnumerable<string> Deploy(IList<DeploymentItem> deploymentItems, string testSource, string deploymentDirectory, string resultsDirectory)
     {
         Guard.NotNullOrWhiteSpace(deploymentDirectory);
@@ -186,10 +187,7 @@ protected IEnumerable<string> Deploy(IList<DeploymentItem> deploymentItems, stri
 
                     // Ignore the test platform files.
                     string tempFile = Path.GetFileName(fileToDeploy);
-                    // We throw when we run in source gen mode.
-#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
                     string assemblyName = Path.GetFileName(GetType().Assembly.Location);
-#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
                     if (tempFile.Equals(assemblyName, StringComparison.OrdinalIgnoreCase))
                     {
                         continue;

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

@@ -35,7 +35,7 @@
   </ItemGroup>
   <Target Name="GenerateTemplates" AfterTargets="PrepareForBuild">
     <PropertyGroup>
-      <_TemplateProperties>MSTestEngineVersion=$(MSTestEngineVersion);MSTestVersion=$(Version);MicrosoftTestingPlatformVersion=$(Version.Replace('$(VersionPrefix)', '$(TestingPlatformVersionPrefix)'));MicrosoftTestingEntrepriseExtensionsVersion=$(MicrosoftTestingInternalFrameworkVersion);MicrosoftNETTestSdkVersion=$(MicrosoftNETTestSdkVersion);MicrosoftTestingExtensionsCodeCoverageVersion=$(MicrosoftTestingExtensionsCodeCoverageVersion);MicrosoftPlaywrightVersion=$(MicrosoftPlaywrightVersion);AspireHostingTestingVersion=$(AspireHostingTestingVersion)</_TemplateProperties>
+      <_TemplateProperties>MSTestSourceGenerationVersion=$(MSTestSourceGenerationVersion);MSTestVersion=$(Version);MicrosoftTestingPlatformVersion=$(Version.Replace('$(VersionPrefix)', '$(TestingPlatformVersionPrefix)'));MicrosoftTestingEntrepriseExtensionsVersion=$(MicrosoftTestingInternalFrameworkVersion);MicrosoftNETTestSdkVersion=$(MicrosoftNETTestSdkVersion);MicrosoftTestingExtensionsCodeCoverageVersion=$(MicrosoftTestingExtensionsCodeCoverageVersion);MicrosoftPlaywrightVersion=$(MicrosoftPlaywrightVersion);AspireHostingTestingVersion=$(AspireHostingTestingVersion)</_TemplateProperties>
     </PropertyGroup>
 
     <!--

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

@@ -3,6 +3,10 @@
 
   <Import Project="$(MSBuildThisFileDirectory)Common.targets"/>
 
+  <PropertyGroup Condition=" '$(IsTestApplication)' == 'true' ">
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+  </PropertyGroup>
+
   <Target Name="_MSTestSDKValidateFeatures" BeforeTargets="Build">
     <Error Condition=" '$(EnableAspireTesting)' == 'true' " Text="Aspire MSTest currently doesn't support NativeAOT mode." />
     <Error Condition=" '$(EnablePlaywright)' == 'true' " Text="Playwright MSTest currently doesn't support NativeAOT mode." />
@@ -15,14 +19,12 @@
 
   <!-- Core -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Testing.Platform.MSBuild" Sdk="MSTest"
-                      Version="$(MicrosoftTestingPlatformVersion)" VersionOverride="$(MicrosoftTestingPlatformVersion)" />
     <PackageReference Include="MSTest.TestFramework" Sdk="MSTest"
                       Version="$(MSTestVersion)" VersionOverride="$(MSTestVersion)" />
-    <PackageReference Include="MSTest.Engine" Sdk="MSTest"
-                      Version="$(MSTestEngineVersion)" VersionOverride="$(MSTestEngineVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Sdk="MSTest"
+                      Version="$(MSTestVersion)" VersionOverride="$(MSTestVersion)" />
     <PackageReference Include="MSTest.SourceGeneration" Sdk="MSTest"
-                      Version="$(MSTestEngineVersion)" VersionOverride="$(MSTestEngineVersion)" />
+                      Version="$(MSTestSourceGenerationVersion)" VersionOverride="$(MSTestSourceGenerationVersion)" />
     <!--
       Most of the times this dependency is not required but we leave the opportunity to align the version of the platform being used.
       At the moment this is mainly used for our acceptance tests because the locally/CI built version ends with -dev or -ci which is

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

@@ -15,7 +15,7 @@
 
     <AspireHostingTestingVersion Condition=" '$(AspireHostingTestingVersion)' == '' ">${AspireHostingTestingVersion}</AspireHostingTestingVersion>
     <MSTestVersion Condition=" '$(MSTestVersion)' == '' ">${MSTestVersion}</MSTestVersion>
-    <MSTestEngineVersion Condition=" '$(MSTestEngineVersion)' == '' ">${MSTestEngineVersion}</MSTestEngineVersion>
+    <MSTestSourceGenerationVersion Condition=" '$(MSTestSourceGenerationVersion)' == '' ">${MSTestSourceGenerationVersion}</MSTestSourceGenerationVersion>
     <MicrosoftNETTestSdkVersion Condition=" '$(MicrosoftNETTestSdkVersion)' == '' ">${MicrosoftNETTestSdkVersion}</MicrosoftNETTestSdkVersion>
     <MicrosoftPlaywrightVersion Condition=" '$(MicrosoftPlaywrightVersion)' == '' ">${MicrosoftPlaywrightVersion}</MicrosoftPlaywrightVersion>
     <MicrosoftTestingExtensionsCodeCoverageVersion Condition=" '$(MicrosoftTestingExtensionsCodeCoverageVersion)' == '' " >${MicrosoftTestingExtensionsCodeCoverageVersion}</MicrosoftTestingExtensionsCodeCoverageVersion>

src/Platform/Microsoft.Testing.Extensions.VSTestBridge/SynchronizedSingleSessionVSTestAndTestAnywhereAdapter.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Reflection;
 
@@ -103,13 +104,12 @@ protected sealed override Task RunTestsAsync(VSTestRunTestExecutionRequest reque
     protected abstract Task SynchronizedRunTestsAsync(VSTestRunTestExecutionRequest request, IMessageBus messageBus,
         CancellationToken cancellationToken);
 
+    [UnconditionalSuppressMessage("Aot", "IL3000:DoNotUseLocation", Justification = "We are passing our own class that derives from Assembly and sets the Location.")]
     protected sealed override Task ExecuteRequestAsync(TestExecutionRequest request, IMessageBus messageBus,
         CancellationToken cancellationToken)
         => ExecuteRequestWithRequestCountGuardAsync(async () =>
         {
-#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
             string[] testAssemblyPaths = _getTestAssemblies().Select(x => x.Location).ToArray();
-#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
             switch (request)
             {
                 case DiscoverTestExecutionRequest discoverRequest:

src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataAttribute.cs

@@ -88,6 +88,7 @@ public DynamicDataAttribute(string dynamicDataSourceName, Type dynamicDataDeclar
     public IEnumerable<object[]> GetData(MethodInfo methodInfo) => DynamicDataProvider.Instance.GetData(_dynamicDataDeclaringType, _dynamicDataSourceType, _dynamicDataSourceName, methodInfo);
 
     /// <inheritdoc />
+    [UnconditionalSuppressMessage("Aot", "IL2075:DoNotUseGetDefinedMethod", Justification = "We access all the types we need in metadata, so this is preserved and works.")]
     public string? GetDisplayName(MethodInfo methodInfo, object?[]? data)
     {
         if (DynamicDataDisplayName != null)

src/TestFramework/TestFramework/TestFramework.csproj

@@ -26,7 +26,7 @@
 
   <PropertyGroup>
     <!-- Enable AOT analyzer warnings to make sure we don't call APIs that would fail when we use source generator mode together with NativeAOT. -->
-    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">$(EnableIotAnalyzers)</IsAotCompatible>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>