Skip to content

Commit 6244454

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-9179b6ab-a537-401d-ac6d-8bfc79f6a8b0
2 parents fc5f4db + d67c76a commit 6244454

18 files changed

+301
-250
lines changed

eng/Version.Details.xml

Lines changed: 98 additions & 98 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<!-- Supported versions -->
119119
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
120120
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
121-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24419.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
121+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24421.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
122122
</PropertyGroup>
123123
<PropertyGroup>
124124
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -166,24 +166,24 @@
166166
</PropertyGroup>
167167
<PropertyGroup>
168168
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
169-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24420.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
170-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24420.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
171-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24420.1</MicrosoftWindowsDesktopAppRefPackageVersion>
169+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24421.3</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
170+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24421.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
171+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24421.3</MicrosoftWindowsDesktopAppRefPackageVersion>
172172
</PropertyGroup>
173173
<PropertyGroup>
174174
<!-- Dependencies from https://github.com/nuget/nuget.client -->
175-
<NuGetBuildTasksPackageVersion>6.12.0-preview.1.77</NuGetBuildTasksPackageVersion>
176-
<NuGetBuildTasksConsolePackageVersion>6.12.0-preview.1.77</NuGetBuildTasksConsolePackageVersion>
177-
<NuGetLocalizationPackageVersion>6.12.0-preview.1.77</NuGetLocalizationPackageVersion>
178-
<NuGetBuildTasksPackPackageVersion>6.12.0-preview.1.77</NuGetBuildTasksPackPackageVersion>
179-
<NuGetCommandLineXPlatPackageVersion>6.12.0-preview.1.77</NuGetCommandLineXPlatPackageVersion>
180-
<NuGetProjectModelPackageVersion>6.12.0-preview.1.77</NuGetProjectModelPackageVersion>
181-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.0-preview.1.77</MicrosoftBuildNuGetSdkResolverPackageVersion>
182-
<NuGetCommonPackageVersion>6.12.0-preview.1.77</NuGetCommonPackageVersion>
183-
<NuGetConfigurationPackageVersion>6.12.0-preview.1.77</NuGetConfigurationPackageVersion>
184-
<NuGetFrameworksPackageVersion>6.12.0-preview.1.77</NuGetFrameworksPackageVersion>
185-
<NuGetPackagingPackageVersion>6.12.0-preview.1.77</NuGetPackagingPackageVersion>
186-
<NuGetVersioningPackageVersion>6.12.0-preview.1.77</NuGetVersioningPackageVersion>
175+
<NuGetBuildTasksPackageVersion>6.12.0-preview.1.81</NuGetBuildTasksPackageVersion>
176+
<NuGetBuildTasksConsolePackageVersion>6.12.0-preview.1.81</NuGetBuildTasksConsolePackageVersion>
177+
<NuGetLocalizationPackageVersion>6.12.0-preview.1.81</NuGetLocalizationPackageVersion>
178+
<NuGetBuildTasksPackPackageVersion>6.12.0-preview.1.81</NuGetBuildTasksPackPackageVersion>
179+
<NuGetCommandLineXPlatPackageVersion>6.12.0-preview.1.81</NuGetCommandLineXPlatPackageVersion>
180+
<NuGetProjectModelPackageVersion>6.12.0-preview.1.81</NuGetProjectModelPackageVersion>
181+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.0-preview.1.81</MicrosoftBuildNuGetSdkResolverPackageVersion>
182+
<NuGetCommonPackageVersion>6.12.0-preview.1.81</NuGetCommonPackageVersion>
183+
<NuGetConfigurationPackageVersion>6.12.0-preview.1.81</NuGetConfigurationPackageVersion>
184+
<NuGetFrameworksPackageVersion>6.12.0-preview.1.81</NuGetFrameworksPackageVersion>
185+
<NuGetPackagingPackageVersion>6.12.0-preview.1.81</NuGetPackagingPackageVersion>
186+
<NuGetVersioningPackageVersion>6.12.0-preview.1.81</NuGetVersioningPackageVersion>
187187
</PropertyGroup>
188188
<PropertyGroup>
189189
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -217,31 +217,31 @@
217217
</PropertyGroup>
218218
<PropertyGroup>
219219
<!-- Dependencies from https://github.com/dotnet/templating -->
220-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-rc.1.24415.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
220+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.2.24421.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
221221
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
222222
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
223223
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
224224
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
225225
<!-- test dependencies -->
226-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-rc.1.24415.1</MicrosoftTemplateEngineMocksPackageVersion>
226+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.2.24421.1</MicrosoftTemplateEngineMocksPackageVersion>
227227
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
228228
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
229229
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
230230
</PropertyGroup>
231231
<PropertyGroup>
232232
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
233-
<MicrosoftFSharpCompilerPackageVersion>12.9.100-beta.24416.2</MicrosoftFSharpCompilerPackageVersion>
233+
<MicrosoftFSharpCompilerPackageVersion>12.9.100-beta.24421.4</MicrosoftFSharpCompilerPackageVersion>
234234
</PropertyGroup>
235235
<PropertyGroup>
236236
<!-- Dependencies from https://github.com/dotnet/roslyn -->
237-
<MicrosoftNetCompilersToolsetVersion>4.12.0-2.24419.4</MicrosoftNetCompilersToolsetVersion>
238-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-2.24419.4</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
239-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-2.24419.4</MicrosoftCodeAnalysisPackageVersion>
240-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-2.24419.4</MicrosoftCodeAnalysisCSharpPackageVersion>
241-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-2.24419.4</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
242-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-2.24419.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
243-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-2.24419.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
244-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-2.24419.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
237+
<MicrosoftNetCompilersToolsetVersion>4.12.0-2.24420.10</MicrosoftNetCompilersToolsetVersion>
238+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-2.24420.10</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
239+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-2.24420.10</MicrosoftCodeAnalysisPackageVersion>
240+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-2.24420.10</MicrosoftCodeAnalysisCSharpPackageVersion>
241+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-2.24420.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
242+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-2.24420.10</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
243+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-2.24420.10</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
244+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-2.24420.10</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
245245
</PropertyGroup>
246246
<PropertyGroup>
247247
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -261,9 +261,9 @@
261261
</PropertyGroup>
262262
<PropertyGroup>
263263
<!-- Dependencies from https://github.com/dotnet/razor -->
264-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24418.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
265-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24418.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
266-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24418.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
264+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24421.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
265+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24421.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
266+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24421.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
267267
</PropertyGroup>
268268
<PropertyGroup>
269269
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -319,12 +319,12 @@
319319
</PropertyGroup>
320320
<PropertyGroup>
321321
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
322-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24419.1</MicrosoftBuildTasksGitVersion>
323-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24419.1</MicrosoftSourceLinkCommonVersion>
324-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24419.1</MicrosoftSourceLinkAzureReposGitVersion>
325-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24419.1</MicrosoftSourceLinkGitHubVersion>
326-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24419.1</MicrosoftSourceLinkGitLabVersion>
327-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24419.1</MicrosoftSourceLinkBitbucketGitVersion>
322+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24420.3</MicrosoftBuildTasksGitVersion>
323+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24420.3</MicrosoftSourceLinkCommonVersion>
324+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24420.3</MicrosoftSourceLinkAzureReposGitVersion>
325+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24420.3</MicrosoftSourceLinkGitHubVersion>
326+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24420.3</MicrosoftSourceLinkGitLabVersion>
327+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24420.3</MicrosoftSourceLinkBitbucketGitVersion>
328328
</PropertyGroup>
329329
<!-- Get .NET Framework reference assemblies from NuGet packages -->
330330
<PropertyGroup>

eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ variables:
2727
- name: ubuntuArmContainer
2828
value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-arm64
2929
- name: azurelinuxX64CrossContainer
30-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-net9.0
30+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64
3131
- name: azurelinuxArmCrossContainer
32-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm-net9.0
32+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm
3333
- name: azurelinuxArm64CrossContainer
34-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm64-net9.0
34+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64
3535
- name: azurelinuxX64AlpineCrossContainer
36-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-alpine-net9.0
36+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-alpine
3737
- name: azurelinuxArmAlpineCrossContainer
38-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm-alpine-net9.0
38+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine
3939
- name: azurelinuxArm64AlpineCrossContainer
40-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm64-alpine-net9.0
40+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64-alpine
4141
- name: androidCrossContainer
42-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-android-amd64-net9.0
42+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-android-amd64
4343
- name: linuxBionicCrossContainer
44-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-android-openssl-net9.0
44+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-openssl
4545
- name: browserCrossContainer
46-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-webassembly-amd64-net9.0
46+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64
4747
- name: wasiCrossContainer
48-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-webassembly-amd64-net9.0
48+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64
4949

5050
- name: almaLinuxName
5151
value: AlmaLinux8

src/Cli/dotnet/commands/dotnet-test/CliConstants.cs

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,30 @@ internal static class CliConstants
2020

2121
internal static class TestStates
2222
{
23-
internal const string Passed = "Passed";
24-
25-
internal const string Skipped = "Skipped";
26-
27-
internal const string Failed = "Failed";
28-
29-
internal const string Error = "Error";
30-
31-
internal const string Timeout = "Timeout";
32-
33-
internal const string Cancelled = "Cancelled";
23+
internal const byte Passed = 0;
24+
internal const byte Skipped = 1;
25+
internal const byte Failed = 2;
26+
internal const byte Error = 3;
27+
internal const byte Timeout = 4;
28+
internal const byte Cancelled = 5;
3429
}
3530

3631
internal static class SessionEventTypes
3732
{
38-
internal const string TestSessionStart = "TestSessionStart";
39-
internal const string TestSessionEnd = "TestSessionEnd";
33+
internal const byte TestSessionStart = 0;
34+
internal const byte TestSessionEnd = 1;
4035
}
4136

4237
internal static class HandshakeInfoPropertyNames
4338
{
44-
internal const string PID = "PID";
45-
internal const string Architecture = "Architecture";
46-
internal const string Framework = "Framework";
47-
internal const string OS = "OS";
48-
internal const string ProtocolVersion = "ProtocolVersion";
49-
internal const string HostType = "HostType";
50-
internal const string ModulePath = "ModulePath";
39+
internal const byte PID = 0;
40+
internal const byte Architecture = 1;
41+
internal const byte Framework = 2;
42+
internal const byte OS = 3;
43+
internal const byte ProtocolVersion = 4;
44+
internal const byte HostType = 5;
45+
internal const byte ModulePath = 6;
46+
internal const byte ExecutionId = 7;
5147
}
5248

5349
internal static class ProtocolConstants

src/Cli/dotnet/commands/dotnet-test/CustomEventArgs.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@ internal class TestProcessExitEventArgs : EventArgs
4646
public List<string> ErrorData { get; set; }
4747
public int ExitCode { get; set; }
4848
}
49+
50+
internal class ExecutionEventArgs : EventArgs
51+
{
52+
public string ModulePath { get; set; }
53+
public string ExecutionId { get; set; }
54+
}
4955
}

src/Cli/dotnet/commands/dotnet-test/IPC/Models/FileArtifactInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
namespace Microsoft.DotNet.Tools.Test
77
{
8-
internal sealed record FileArtifactInfo(string? FullPath, string? DisplayName, string? Description, string? TestUid, string? TestDisplayName, string? SessionUid, string? ModulePath) : IRequest;
8+
internal sealed record FileArtifactInfo(string? FullPath, string? DisplayName, string? Description, string? TestUid, string? TestDisplayName, string? SessionUid, string? ExecutionId) : IRequest;
99
}

src/Cli/dotnet/commands/dotnet-test/IPC/Models/HandshakeInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
namespace Microsoft.DotNet.Tools.Test
77
{
8-
internal sealed record HandshakeInfo(Dictionary<string, string>? Properties) : IRequest, IResponse;
8+
internal sealed record HandshakeInfo(Dictionary<byte, string>? Properties) : IRequest, IResponse;
99
}

src/Cli/dotnet/commands/dotnet-test/IPC/Models/TestResultMessage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace Microsoft.DotNet.Tools.Test
77
{
8-
internal sealed record SuccessfulTestResultMessage(string? Uid, string? DisplayName, string? State, string? Reason, string? SessionUid, string? ModulePath) : IRequest;
8+
internal sealed record SuccessfulTestResultMessage(string? Uid, string? DisplayName, byte? State, string? Reason, string? SessionUid, string? ExecutionId) : IRequest;
99

10-
internal sealed record FailedTestResultMessage(string? Uid, string? DisplayName, string? State, string? Reason, string? ErrorMessage, string? ErrorStackTrace, string? SessionUid, string? ModulePath) : IRequest;
10+
internal sealed record FailedTestResultMessage(string? Uid, string? DisplayName, byte? State, string? Reason, string? ErrorMessage, string? ErrorStackTrace, string? SessionUid, string? ExecutionId) : IRequest;
1111
}

src/Cli/dotnet/commands/dotnet-test/IPC/Models/TestSessionEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
namespace Microsoft.DotNet.Tools.Test
77
{
8-
internal sealed record TestSessionEvent(string? SessionType, string? SessionUid, string? ModulePath) : IRequest;
8+
internal sealed record TestSessionEvent(byte? SessionType, string? SessionUid, string? ExecutionId) : IRequest;
99
}

src/Cli/dotnet/commands/dotnet-test/IPC/ObjectFieldIds.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ internal static class SuccessfulTestResultMessageFieldsId
2828
internal const int State = 3;
2929
internal const int Reason = 4;
3030
internal const int SessionUid = 5;
31-
internal const int ModulePath = 6;
31+
internal const int ExecutionId = 6;
3232
}
3333

3434
internal static class FailedTestResultMessageFieldsId
@@ -40,7 +40,7 @@ internal static class FailedTestResultMessageFieldsId
4040
internal const int ErrorMessage = 5;
4141
internal const int ErrorStackTrace = 6;
4242
internal const int SessionUid = 7;
43-
internal const int ModulePath = 8;
43+
internal const int ExecutionId = 8;
4444
}
4545

4646
internal static class FileArtifactInfoFieldsId
@@ -51,13 +51,13 @@ internal static class FileArtifactInfoFieldsId
5151
internal const int TestUid = 4;
5252
internal const int TestDisplayName = 5;
5353
internal const int SessionUid = 6;
54-
internal const int ModulePath = 7;
54+
internal const int ExecutionId = 7;
5555
}
5656

5757
internal static class TestSessionEventFieldsId
5858
{
5959
internal const int SessionType = 1;
6060
internal const int SessionUid = 2;
61-
internal const int ModulePath = 3;
61+
internal const int ExecutionId = 3;
6262
}
6363
}

0 commit comments

Comments
 (0)