Skip to content

Commit 19feefa

Browse files
nagilsonnagilson
authored
Merge branch 'main' into darc-main-c7390912-c8aa-4209-b33d-5c77d7918ab0
2 parents a5b8645 + 67b96df commit 19feefa

26 files changed

+343
-85
lines changed

‎eng/Version.Details.xml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -93,43 +93,43 @@
9393
<Sha>02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24372.10">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24372.18">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
98+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24372.10">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24372.18">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
103+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-1.24372.10">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-1.24372.18">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
108+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-1.24372.10">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-1.24372.18">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
112+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24372.10">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24372.18">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
116+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-1.24372.10">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-1.24372.18">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
120+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24372.10">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24372.18">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
124+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24372.10">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24372.18">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
128+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24372.10">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24372.18">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>9d7489b84a998578f62fadb382550bf71c078397</Sha>
132+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.7.24372.2">
135135
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -246,26 +246,26 @@
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247247
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24372.3">
249+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24373.2">
250250
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
251-
<Sha>1981249eb4fadbef75c39a2a4fc44625bb5d3523</Sha>
251+
<Sha>c2ed504f22cca7f468822acb14189f38132942f0</Sha>
252252
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
253253
</Dependency>
254-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24372.3">
254+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24373.2">
255255
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
256-
<Sha>1981249eb4fadbef75c39a2a4fc44625bb5d3523</Sha>
256+
<Sha>c2ed504f22cca7f468822acb14189f38132942f0</Sha>
257257
</Dependency>
258-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24372.3">
258+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24373.2">
259259
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
260-
<Sha>1981249eb4fadbef75c39a2a4fc44625bb5d3523</Sha>
260+
<Sha>c2ed504f22cca7f468822acb14189f38132942f0</Sha>
261261
</Dependency>
262-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24372.3">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24373.2">
263263
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
264-
<Sha>1981249eb4fadbef75c39a2a4fc44625bb5d3523</Sha>
264+
<Sha>c2ed504f22cca7f468822acb14189f38132942f0</Sha>
265265
</Dependency>
266-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-rc.1.24372.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
266+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-rc.1.24373.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
267267
<Uri>https://github.com/dotnet/wpf</Uri>
268-
<Sha>7fd871003234210323d4cff099494380eaf65d33</Sha>
268+
<Sha>e84c5673cf74d328094d3a60c0130eb3b430822b</Sha>
269269
</Dependency>
270270
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.7.24372.2">
271271
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -382,13 +382,13 @@
382382
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
383383
</Dependency>
384384
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
385-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24371.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
385+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24372.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
386386
<Uri>https://github.com/dotnet/winforms</Uri>
387-
<Sha>d89527ce140a396301fec098e85b34bca9d2f694</Sha>
387+
<Sha>c0318e50e536510286bc513d6ada25c10065ac83</Sha>
388388
</Dependency>
389-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-rc.1.24372.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
389+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-rc.1.24373.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
390390
<Uri>https://github.com/dotnet/wpf</Uri>
391-
<Sha>7fd871003234210323d4cff099494380eaf65d33</Sha>
391+
<Sha>e84c5673cf74d328094d3a60c0130eb3b430822b</Sha>
392392
</Dependency>
393393
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24317.2">
394394
<Uri>https://github.com/dotnet/xdt</Uri>
@@ -443,9 +443,9 @@
443443
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
444444
</Dependency>
445445
<!-- Intermediate is necessary for source build. -->
446-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24365.1">
446+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24372.2">
447447
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
448-
<Sha>4d5ba7206ed1d56612b36560334494652ed486b2</Sha>
448+
<Sha>97ffbaec397634584a11218e5a29e82601764226</Sha>
449449
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
450450
</Dependency>
451451
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24368.1">

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</PropertyGroup>
111111
<PropertyGroup>
112112
<!-- Dependency from https://github.com/dotnet/winforms -->
113-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24371.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
113+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24372.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
114114
</PropertyGroup>
115115
<PropertyGroup>
116116
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -161,10 +161,10 @@
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
164-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24372.3</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24372.3</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24372.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24372.3</MicrosoftWindowsDesktopAppRefPackageVersion>
164+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24373.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24373.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24373.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24373.2</MicrosoftWindowsDesktopAppRefPackageVersion>
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -230,14 +230,14 @@
230230
</PropertyGroup>
231231
<PropertyGroup>
232232
<!-- Dependencies from https://github.com/dotnet/roslyn -->
233-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24372.10</MicrosoftNetCompilersToolsetVersion>
234-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24372.10</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24372.10</MicrosoftCodeAnalysisPackageVersion>
236-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24372.10</MicrosoftCodeAnalysisCSharpPackageVersion>
237-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24372.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24372.10</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24372.10</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24372.10</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
233+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24372.18</MicrosoftNetCompilersToolsetVersion>
234+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24372.18</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisPackageVersion>
236+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpPackageVersion>
237+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -263,8 +263,8 @@
263263
</PropertyGroup>
264264
<PropertyGroup>
265265
<!-- Dependencies from https://github.com/dotnet/wpf -->
266-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rc.1.24372.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
267-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rc.1.24372.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
266+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rc.1.24373.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
267+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rc.1.24373.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
268268
</PropertyGroup>
269269
<PropertyGroup Label="Runtime and Apphost aliases">
270270
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->

‎src/Cli/dotnet/commands/dotnet-test/IPC/Models/UnknownMessage.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
namespace Microsoft.DotNet.Tools.Test;
5+
6+
internal sealed record class UnknownMessage(int SerializerId) : IRequest;

‎src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeBase.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,27 @@ public void RegisterSerializer(INamedPipeSerializer namedPipeSerializer, Type ty
2020
_idSerializer.Add(namedPipeSerializer.Id, namedPipeSerializer);
2121
}
2222

23-
protected INamedPipeSerializer GetSerializer(int id)
24-
=> _idSerializer.TryGetValue(id, out object serializer)
25-
? (INamedPipeSerializer)serializer
26-
: throw new ArgumentException((string.Format(
23+
protected INamedPipeSerializer GetSerializer(int id, bool skipUnknownMessages = false)
24+
{
25+
if (_idSerializer.TryGetValue(id, out object serializer))
26+
{
27+
return (INamedPipeSerializer)serializer;
28+
}
29+
else
30+
{
31+
return skipUnknownMessages
32+
? new UnknownMessageSerializer(id)
33+
: throw new ArgumentException((string.Format(
2734
CultureInfo.InvariantCulture,
2835
#if dotnet
2936
LocalizableStrings.NoSerializerRegisteredWithIdErrorMessage,
3037
#else
3138
"No serializer registered with ID '{0}'",
3239
#endif
3340
id)));
41+
}
42+
}
43+
3444

3545
protected INamedPipeSerializer GetSerializer(Type type)
3646
=> _typeSerializer.TryGetValue(type, out object serializer)

‎src/Cli/dotnet/commands/dotnet-test/IPC/NamedPipeServer.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ internal sealed class NamedPipeServer : NamedPipeBase, IServer
1919
private readonly MemoryStream _serializationBuffer = new();
2020
private readonly MemoryStream _messageBuffer = new();
2121
private readonly byte[] _readBuffer = new byte[250000];
22+
private readonly bool _skipUnknownMessages;
2223
private Task _loopTask;
2324
private bool _disposed;
2425

@@ -44,11 +45,24 @@ public NamedPipeServer(
4445
int maxNumberOfServerInstances,
4546
CancellationToken cancellationToken)
4647
{
47-
_namedPipeServerStream = new((PipeName = pipeNameDescription).Name, PipeDirection.InOut, maxNumberOfServerInstances);
48+
_namedPipeServerStream = new((PipeName = pipeNameDescription).Name, PipeDirection.InOut, maxNumberOfServerInstances, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
4849
_callback = callback;
4950
_cancellationToken = cancellationToken;
5051
}
5152

53+
public NamedPipeServer(
54+
PipeNameDescription pipeNameDescription,
55+
Func<IRequest, Task<IResponse>> callback,
56+
int maxNumberOfServerInstances,
57+
CancellationToken cancellationToken,
58+
bool skipUnknownMessages)
59+
{
60+
_namedPipeServerStream = new((PipeName = pipeNameDescription).Name, PipeDirection.InOut, maxNumberOfServerInstances, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
61+
_callback = callback;
62+
_cancellationToken = cancellationToken;
63+
_skipUnknownMessages = skipUnknownMessages;
64+
}
65+
5266
public PipeNameDescription PipeName { get; private set; }
5367

5468
public bool WasConnected { get; private set; }
@@ -135,7 +149,7 @@ private async Task InternalLoopAsync(CancellationToken cancellationToken)
135149
int serializerId = BitConverter.ToInt32(_messageBuffer.GetBuffer(), 0);
136150

137151
// Get the serializer
138-
INamedPipeSerializer requestNamedPipeSerializer = GetSerializer(serializerId);
152+
INamedPipeSerializer requestNamedPipeSerializer = GetSerializer(serializerId, _skipUnknownMessages);
139153

140154
// Deserialize the message
141155
_messageBuffer.Position += sizeof(int); // Skip the serializer id

‎src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/UnknownMessageSerializer.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
namespace Microsoft.DotNet.Tools.Test;
5+
6+
internal sealed class UnknownMessageSerializer : BaseSerializer, INamedPipeSerializer
7+
{
8+
public int Id { get; }
9+
10+
public UnknownMessageSerializer(int SerializerId) => Id = SerializerId;
11+
12+
public object Deserialize(Stream _)
13+
{
14+
return new UnknownMessage(Id);
15+
}
16+
17+
public void Serialize(object _, Stream stream)
18+
{
19+
WriteInt(stream, Id);
20+
}
21+
}

‎src/Cli/dotnet/commands/dotnet-test/LocalizableStrings.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,4 +291,10 @@ Examples:
291291
<data name="NoSerializerRegisteredWithTypeErrorMessage" xml:space="preserve">
292292
<value>No serializer registered with type '{0}'</value>
293293
</data>
294+
<data name="CmdMaxParallelTestModulesDescription" xml:space="preserve">
295+
<value>The max number of test modules that can run in parallel.</value>
296+
</data>
297+
<data name="CmdAdditionalMSBuildParametersDescription" xml:space="preserve">
298+
<value>The additional msbuild parameters to pass.</value>
299+
</data>
294300
</root>

‎src/Cli/dotnet/commands/dotnet-test/TestApplication.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ public async Task RunAsync()
4040
Arguments = BuildArgs(isDll)
4141
};
4242

43-
VSTestTrace.SafeWriteTrace(() => $"Updated args: {processStartInfo.Arguments}");
43+
if (VSTestTrace.TraceEnabled)
44+
{
45+
VSTestTrace.SafeWriteTrace(() => $"Updated args: {processStartInfo.Arguments}");
46+
}
4447

4548
await Process.Start(processStartInfo).WaitForExitAsync();
4649
}
@@ -61,7 +64,10 @@ public async Task RunHelpAsync()
6164
Arguments = BuildHelpArgs(isDll)
6265
};
6366

64-
VSTestTrace.SafeWriteTrace(() => $"Updated args: {processStartInfo.Arguments}");
67+
if (VSTestTrace.TraceEnabled)
68+
{
69+
VSTestTrace.SafeWriteTrace(() => $"Updated args: {processStartInfo.Arguments}");
70+
}
6571

6672
await Process.Start(processStartInfo).WaitForExitAsync();
6773
}

0 commit comments

Comments
 (0)