Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,11 @@ This file should be imported by eng/Versions.props
<SystemTextEncodingCodePagesPackageVersion>11.0.0-preview.7.26363.117</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.7.26363.117</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.7.26363.117</SystemWindowsExtensionsPackageVersion>
<!-- microsoft-testfx dependencies.
KEEP IN SYNC: MSTestPackageVersion (MSTest framework/adapter), MicrosoftTestingPlatformPackageVersion,
and the "MSTest.Sdk" entry under msbuild-sdks in global.json must all come from the SAME testfx build.
The MSTest.Sdk source generator emits test registrations against the MSTest.TestFramework runtime, so a
version skew breaks the NativeAOT CLI test build (e.g. CS0234 / "Zero tests ran"). See
https://github.com/dotnet/sdk/pull/55302. These flow together via darc (Version.Details.xml); do not bump
one without the others. -->
<MicrosoftTestingPlatformPackageVersion>2.4.0-preview.26367.7</MicrosoftTestingPlatformPackageVersion>
<!-- microsoft-testfx dependencies -->
<MicrosoftTestingPlatformPackageVersion>2.4.0-preview.26372.14</MicrosoftTestingPlatformPackageVersion>
<MicrosoftTestingPlatformInternalDotnetTestPackageVersion>2.3.0-preview.26330.8</MicrosoftTestingPlatformInternalDotnetTestPackageVersion>
<MSTestPackageVersion>4.4.0-preview.26367.7</MSTestPackageVersion>
<MSTestSdkPackageVersion>4.4.0-preview.26367.7</MSTestSdkPackageVersion>
<MSTestPackageVersion>4.4.0-preview.26372.14</MSTestPackageVersion>
<MSTestSdkPackageVersion>4.4.0-preview.26372.14</MSTestSdkPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -544,18 +544,18 @@
<!-- KEEP IN SYNC: the following testfx packages (Microsoft.Testing.Platform, MSTest, MSTest.Sdk) must
stay on the SAME testfx build/Sha. The MSTest.Sdk source generator emits registrations against the
MSTest.TestFramework runtime, so a version skew breaks the NativeAOT CLI test build. See #55302. -->
<Dependency Name="Microsoft.Testing.Platform" Version="2.4.0-preview.26367.7">
<Dependency Name="Microsoft.Testing.Platform" Version="2.4.0-preview.26372.14">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>fd744761254d82f054ebba7f8479af01f3822c5a</Sha>
<Sha>e40436111b52795981c425a49b4c8c2e9a70d9d8</Sha>
</Dependency>
<Dependency Name="MSTest" Version="4.4.0-preview.26367.7">
<Dependency Name="MSTest" Version="4.4.0-preview.26372.14">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>fd744761254d82f054ebba7f8479af01f3822c5a</Sha>
<Sha>e40436111b52795981c425a49b4c8c2e9a70d9d8</Sha>
</Dependency>
<!-- MSTest.Sdk is consumed from global.json's msbuild-sdks (not as a PackageReference). -->
<Dependency Name="MSTest.Sdk" Version="4.4.0-preview.26367.7">
<Dependency Name="MSTest.Sdk" Version="4.4.0-preview.26372.14">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>fd744761254d82f054ebba7f8479af01f3822c5a</Sha>
<Sha>e40436111b52795981c425a49b4c8c2e9a70d9d8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="11.0.0-preview.7.26363.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"Microsoft.Build.NoTargets": "3.7.134",
"Microsoft.Build.Traversal": "4.1.82",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6",
"MSTest.Sdk": "4.4.0-preview.26367.7"
"MSTest.Sdk": "4.4.0-preview.26372.14"
}
}
12 changes: 12 additions & 0 deletions src/Cli/dotnet/Commands/CliCommandStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -2669,6 +2669,18 @@ Proceed?</value>
<value>The test host reported execution mode '{0}', but 'dotnet test' expected '{1}'. This typically happens when an option such as '--help', '-?' or '--list-tests' was injected into the test host through a non-CLI channel (e.g. the 'TestingPlatformCommandLineArguments' or 'RunArguments' MSBuild properties, or 'launchSettings.json' commandLineArgs). Pass these options directly to 'dotnet test' instead.</value>
<comment>{Locked="dotnet test"}{Locked="--help"}{Locked="-?"}{Locked="--list-tests"}{Locked="TestingPlatformCommandLineArguments"}{Locked="RunArguments"}{Locked="launchSettings.json"}{Locked="commandLineArgs"}</comment>
</data>
<data name="MismatchingHandshakeHostType" xml:space="preserve">
<value>The test host reported host type '{0}', but 'dotnet test' expected '{1}'.</value>
<comment>{Locked="dotnet test"}</comment>
</data>
<data name="ArtifactPostProcessingFailed" xml:space="preserve">
<value>Artifact post-processing with '{0}' failed: {1} Original artifacts will be reported.</value>
<comment>{0} is the test application path. {1} is the failure reason.</comment>
</data>
<data name="ArtifactPostProcessingProcessFailed" xml:space="preserve">
<value>Artifact post-processing with '{0}' exited with code {1}. Any artifacts that were not merged will be reported individually.</value>
<comment>{0} is the test application path. {1} is the process exit code.</comment>
</data>
<data name="UnexpectedMessageInHelpMode" xml:space="preserve">
<value>A message of type '{0}' was received in help mode, which is not expected.</value>
</data>
Expand Down
16 changes: 16 additions & 0 deletions src/Cli/dotnet/Commands/Test/CliConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ internal static class CliConstants
public const string DotNetTestPipeOptionKey = "--dotnet-test-pipe";

public const string ServerOptionValue = "dotnettestcli";
public const string ArtifactPostProcessingToolName = "internal-merge-artifacts";
public const string ArtifactPostProcessingManifestOptionKey = "--manifest";

public const string SemiColon = ";";

Expand Down Expand Up @@ -77,6 +79,11 @@ internal static class HandshakeMessagePropertyNames
// can belong to the same attempt. Older hosts omit it, so the SDK retains instance-based
// retry inference as a compatibility fallback.
internal const byte AttemptNumber = 13;

// Semicolon-separated reverse-DNS artifact kinds and lowercase file extensions
// supported by post-processors registered in the test application.
internal const byte SupportedPostProcessorKinds = 14;
internal const byte SupportedPostProcessorExtensionsLegacy = 15;
}

internal static class HandshakeMessageExecutionModes
Expand All @@ -89,6 +96,15 @@ internal static class HandshakeMessageExecutionModes

// The test host is going to discover tests (e.g. --list-tests).
internal const string Discover = "discover";

// The host is running a non-test tool.
internal const string Tool = "tool";
}

internal static class HandshakeMessageHostTypes
{
internal const string TestHost = "TestHost";
internal const string ArtifactPostProcessor = "ArtifactPostProcessor";
}

internal static class ProtocolConstants
Expand Down
Loading
Loading