Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sourcegen #3880

Draft
wants to merge 27 commits into
base: main
Choose a base branch
from
Draft

Update sourcegen #3880

wants to merge 27 commits into from

Conversation

nohwnd
Copy link
Member

@nohwnd nohwnd commented Sep 30, 2024

No description provided.

eng/Version.Details.xml Outdated Show resolved Hide resolved
@@ -20,6 +20,7 @@ public class NativeAotTests : AcceptanceTestBase
<UseAppHost>true</UseAppHost>
<LangVersion>preview</LangVersion>
<PublishAot>true</PublishAot>
<NoWarn>$(NoWarn);IL2104;IL2026;IL3053</NoWarn>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder to self: This should be removed before we can merge.

@@ -3,14 +3,14 @@
<!-- MSTest version -->
<VersionPrefix>3.7.0</VersionPrefix>
<!-- Testing Platform version -->
<TestingPlatformVersionPrefix>1.5.0</TestingPlatformVersionPrefix>
<TestingPlatformVersionPrefix>1.6.0</TestingPlatformVersionPrefix>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be reset

Suggested change
<TestingPlatformVersionPrefix>1.6.0</TestingPlatformVersionPrefix>
<TestingPlatformVersionPrefix>1.5.0</TestingPlatformVersionPrefix>

@@ -21,9 +21,9 @@
<Uri>https://github.com/microsoft/testanywhere</Uri>
<Sha>4d80102c4530845265843db1454a4abda4128ba2</Sha>
</Dependency>
<Dependency Name="MSTest.Engine" Version="1.0.0-alpha.24473.2">
<Dependency Name="MSTest.SourceGeneration" Version="1.0.0-alpha.24555.1">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's sync versions:

Suggested change
<Dependency Name="MSTest.SourceGeneration" Version="1.0.0-alpha.24555.1">
<Dependency Name="MSTest.SourceGeneration" Version="1.0.0-alpha.24554.7">

<Uri>https://github.com/microsoft/testanywhere</Uri>
<Sha>aa2fcc8616d988b234bc1d218465b20c56d0b82f</Sha>
<Sha>3c99c34d0f99de8dacfe909073722bd8ba45f2d8</Sha>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<Sha>3c99c34d0f99de8dacfe909073722bd8ba45f2d8</Sha>
<Sha>4d80102c4530845265843db1454a4abda4128ba2</Sha>

<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup Label="MSTest prod dependencies - darc updated">
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.24554.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>17.13.0-preview.24555.1</MicrosoftTestingExtensionsCodeCoverageVersion>
<!-- comment to facilitate merge conflicts -->
<MicrosoftTestingInternalFrameworkVersion>1.5.0-preview.24554.7</MicrosoftTestingInternalFrameworkVersion>
<MSTestEngineVersion>1.0.0-alpha.24473.2</MSTestEngineVersion>
<MSTestSourceGenerationVersion>1.0.0-alpha.24555.1</MSTestSourceGenerationVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Syncing versions

Suggested change
<MSTestSourceGenerationVersion>1.0.0-alpha.24555.1</MSTestSourceGenerationVersion>
<MSTestSourceGenerationVersion>1.0.0-alpha.24554.7</MSTestSourceGenerationVersion>

private static void AddFixtureTests(TestMethodInfo testMethodInfo, List<UnitTestElement> tests, HashSet<string> fixtureTests)
{
#if NET8_0_OR_GREATER
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be NETCOREAPP or NET7_0_OR_GREATER if we want to link it specifically to native aot.

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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be NETCOREAPP or NET7_0_OR_GREATER if we want to link it specifically to native aot.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC it did not build with just netcoreapp, and net7 is out of life and rest of the platform used net8 so I used net8

Comment on lines +6 to +9
<PropertyGroup Condition=" '$(IsTestApplication)' == 'true' ">
<EnableMSTestRunner>true</EnableMSTestRunner>
</PropertyGroup>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: Combine the tests in a single project so that we do the dotnet publish only once.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants