Skip to content

Commit 414eb0a

Browse files
authored
Merge branch 'release/10.0.1xx' into update-man-page-2025-09-01
2 parents 16411a0 + c0df0ff commit 414eb0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+326
-710
lines changed

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ This file should be imported by eng/Versions.props
140140
<!-- dotnet/core-setup dependencies -->
141141
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
142142
<!-- microsoft/testfx dependencies -->
143-
<MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25430.5</MicrosoftTestingPlatformPackageVersion>
144-
<MSTestPackageVersion>3.11.0-preview.25430.5</MSTestPackageVersion>
143+
<MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25451.2</MicrosoftTestingPlatformPackageVersion>
144+
<MSTestPackageVersion>3.11.0-preview.25451.2</MSTestPackageVersion>
145145
</PropertyGroup>
146146
<!--Property group for alternate package version names-->
147147
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,13 +553,13 @@
553553
<Uri>https://github.com/dotnet/dotnet</Uri>
554554
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
555555
</Dependency>
556-
<Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25430.5">
556+
<Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25451.2">
557557
<Uri>https://github.com/microsoft/testfx</Uri>
558-
<Sha>9d2e740bc8be46f45c6d69b33be1f5a913bf6231</Sha>
558+
<Sha>8d29291af97543579834e9109768c5ee89f63638</Sha>
559559
</Dependency>
560-
<Dependency Name="MSTest" Version="3.11.0-preview.25430.5">
560+
<Dependency Name="MSTest" Version="3.11.0-preview.25451.2">
561561
<Uri>https://github.com/microsoft/testfx</Uri>
562-
<Sha>9d2e740bc8be46f45c6d69b33be1f5a913bf6231</Sha>
562+
<Sha>8d29291af97543579834e9109768c5ee89f63638</Sha>
563563
</Dependency>
564564
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rc.2.25420.109">
565565
<Uri>https://github.com/dotnet/dotnet</Uri>

src/Cli/dotnet/Commands/CliCommandStrings.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2645,4 +2645,7 @@ Proceed?</value>
26452645
<data name="PackCmdVersion" xml:space="preserve">
26462646
<value>VERSION</value>
26472647
</data>
2648+
<data name="CmdMinimumExpectedTestsDescription" xml:space="preserve">
2649+
<value>Specifies the minimum number of tests that are expected to run.</value>
2650+
</data>
26482651
</root>

src/Cli/dotnet/Commands/Test/ExitCode.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ internal static class ExitCode
1414
public const int Success = 0;
1515
public const int GenericFailure = 1;
1616
public const int ZeroTests = 8;
17+
public const int MinimumExpectedTestsPolicyViolation = 9;
1718
}

src/Cli/dotnet/Commands/Test/IPC/IClient.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/Cli/dotnet/Commands/Test/IPC/IServer.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Cli/dotnet/Commands/Test/IPC/NamedPipeBase.cs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
#nullable disable
55

6-
#pragma warning disable IDE0240 // Remove redundant nullable directive
7-
#nullable disable
8-
#pragma warning restore IDE0240 // Remove redundant nullable directive
9-
106
using System.Globalization;
117
using Microsoft.DotNet.Cli.Commands.Test.IPC.Serializers;
128

@@ -34,13 +30,9 @@ protected INamedPipeSerializer GetSerializer(int id, bool skipUnknownMessages =
3430
return skipUnknownMessages
3531
? new UnknownMessageSerializer(id)
3632
: throw new ArgumentException((string.Format(
37-
CultureInfo.InvariantCulture,
38-
#if dotnet
39-
LocalizableStrings.NoSerializerRegisteredWithIdErrorMessage,
40-
#else
41-
"No serializer registered with ID '{0}'",
42-
#endif
43-
id)));
33+
CultureInfo.InvariantCulture,
34+
CliCommandStrings.NoSerializerRegisteredWithIdErrorMessage,
35+
id)));
4436
}
4537
}
4638

@@ -50,10 +42,6 @@ protected INamedPipeSerializer GetSerializer(Type type)
5042
? serializer
5143
: throw new ArgumentException(string.Format(
5244
CultureInfo.InvariantCulture,
53-
#if dotnet
54-
LocalizableStrings.NoSerializerRegisteredWithTypeErrorMessage,
55-
#else
56-
"No serializer registered with type '{0}'",
57-
#endif
45+
CliCommandStrings.NoSerializerRegisteredWithTypeErrorMessage,
5846
type));
5947
}

src/Cli/dotnet/Commands/Test/IPC/NamedPipeClient.cs

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)