Skip to content

Commit 0304a38

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'main' into merge/release/9.0.2xx-to-main
2 parents d22c0dc + d66dc53 commit 0304a38

File tree

94 files changed

+4858
-1367
lines changed

Some content is hidden

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

94 files changed

+4858
-1367
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6868
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
6969
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
70-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.9" />
70+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.23" />
7171
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7272
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7373
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
7575
<SystemCommandLineVersion>2.0.0-beta4.24528.1</SystemCommandLineVersion>
7676
<SystemCommandLineRenderingVersion>0.4.0-alpha.24528.1</SystemCommandLineRenderingVersion>
77-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24562.1</MicrosoftDeploymentDotNetReleasesVersion>
78-
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24527.1</MicrosoftDiaSymReaderVersion>
77+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24572.3</MicrosoftDeploymentDotNetReleasesVersion>
78+
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24574.1</MicrosoftDiaSymReaderVersion>
7979
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
8080
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
8181
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
@@ -94,12 +94,12 @@
9494
</PropertyGroup>
9595
<PropertyGroup>
9696
<!-- Dependency from https://github.com/dotnet/winforms -->
97-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24569.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
97+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24573.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
9898
</PropertyGroup>
9999
<PropertyGroup>
100100
<!-- Dependency from https://github.com/dotnet/test-templates -->
101101
<!-- Supported versions -->
102-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24570.2</MicrosoftDotNetTestProjectTemplates90PackageVersion>
102+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24576.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
103103
</PropertyGroup>
104104
<PropertyGroup>
105105
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -152,24 +152,24 @@
152152
</PropertyGroup>
153153
<PropertyGroup>
154154
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
155-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24570.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
156-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24570.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
157-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24570.2</MicrosoftWindowsDesktopAppRefPackageVersion>
155+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24575.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
156+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24575.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
157+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24575.1</MicrosoftWindowsDesktopAppRefPackageVersion>
158158
</PropertyGroup>
159159
<PropertyGroup>
160160
<!-- Dependencies from https://github.com/nuget/nuget.client -->
161-
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.62</NuGetBuildTasksPackageVersion>
162-
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.62</NuGetBuildTasksConsolePackageVersion>
163-
<NuGetLocalizationPackageVersion>6.13.0-preview.1.62</NuGetLocalizationPackageVersion>
164-
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.62</NuGetBuildTasksPackPackageVersion>
165-
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.62</NuGetCommandLineXPlatPackageVersion>
166-
<NuGetProjectModelPackageVersion>6.13.0-preview.1.62</NuGetProjectModelPackageVersion>
167-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.62</MicrosoftBuildNuGetSdkResolverPackageVersion>
168-
<NuGetCommonPackageVersion>6.13.0-preview.1.62</NuGetCommonPackageVersion>
169-
<NuGetConfigurationPackageVersion>6.13.0-preview.1.62</NuGetConfigurationPackageVersion>
170-
<NuGetFrameworksPackageVersion>6.13.0-preview.1.62</NuGetFrameworksPackageVersion>
171-
<NuGetPackagingPackageVersion>6.13.0-preview.1.62</NuGetPackagingPackageVersion>
172-
<NuGetVersioningPackageVersion>6.13.0-preview.1.62</NuGetVersioningPackageVersion>
161+
<NuGetBuildTasksPackageVersion>6.13.0-preview.1.71</NuGetBuildTasksPackageVersion>
162+
<NuGetBuildTasksConsolePackageVersion>6.13.0-preview.1.71</NuGetBuildTasksConsolePackageVersion>
163+
<NuGetLocalizationPackageVersion>6.13.0-preview.1.71</NuGetLocalizationPackageVersion>
164+
<NuGetBuildTasksPackPackageVersion>6.13.0-preview.1.71</NuGetBuildTasksPackPackageVersion>
165+
<NuGetCommandLineXPlatPackageVersion>6.13.0-preview.1.71</NuGetCommandLineXPlatPackageVersion>
166+
<NuGetProjectModelPackageVersion>6.13.0-preview.1.71</NuGetProjectModelPackageVersion>
167+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-preview.1.71</MicrosoftBuildNuGetSdkResolverPackageVersion>
168+
<NuGetCommonPackageVersion>6.13.0-preview.1.71</NuGetCommonPackageVersion>
169+
<NuGetConfigurationPackageVersion>6.13.0-preview.1.71</NuGetConfigurationPackageVersion>
170+
<NuGetFrameworksPackageVersion>6.13.0-preview.1.71</NuGetFrameworksPackageVersion>
171+
<NuGetPackagingPackageVersion>6.13.0-preview.1.71</NuGetPackagingPackageVersion>
172+
<NuGetVersioningPackageVersion>6.13.0-preview.1.71</NuGetVersioningPackageVersion>
173173
</PropertyGroup>
174174
<PropertyGroup>
175175
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -179,8 +179,8 @@
179179
</PropertyGroup>
180180
<PropertyGroup>
181181
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
182-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24559.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
183-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24559.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
182+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24574.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
183+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24574.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
184184
</PropertyGroup>
185185
<PropertyGroup>
186186
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -206,13 +206,13 @@
206206
</PropertyGroup>
207207
<PropertyGroup>
208208
<!-- Dependencies from https://github.com/dotnet/templating -->
209-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24571.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
209+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.24574.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
210210
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
211211
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
212212
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
213213
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
214214
<!-- test dependencies -->
215-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24571.1</MicrosoftTemplateEngineMocksPackageVersion>
215+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.24574.2</MicrosoftTemplateEngineMocksPackageVersion>
216216
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
217217
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
218218
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -234,30 +234,30 @@
234234
</PropertyGroup>
235235
<PropertyGroup>
236236
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
237-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreAppRefPackageVersion>
238-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
239-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
240-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
242-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
243-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreTestHostPackageVersion>
244-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
245-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24571.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
246-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24571.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
247-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24571.1</dotnetdevcertsPackageVersion>
248-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24571.1</dotnetuserjwtsPackageVersion>
249-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24571.1</dotnetusersecretsPackageVersion>
237+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAppRefPackageVersion>
238+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
239+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
240+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
242+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAnalyzersPackageVersion>
243+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreTestHostPackageVersion>
244+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
245+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24575.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
246+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24575.5</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
247+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24575.5</dotnetdevcertsPackageVersion>
248+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24575.5</dotnetuserjwtsPackageVersion>
249+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24575.5</dotnetusersecretsPackageVersion>
250250
</PropertyGroup>
251251
<PropertyGroup>
252252
<!-- Dependencies from https://github.com/dotnet/razor -->
253-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24571.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
254-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24571.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
255-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24571.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
253+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24575.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
254+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24575.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
255+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24575.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
256256
</PropertyGroup>
257257
<PropertyGroup>
258258
<!-- Dependencies from https://github.com/dotnet/wpf -->
259-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24570.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
260-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24570.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
259+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24574.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
260+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24574.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
261261
</PropertyGroup>
262262
<PropertyGroup Label="Template versions">
263263
<!-- 10.0 Template versions -->
@@ -268,7 +268,7 @@
268268
<PropertyGroup Label="Infrastructure and test only dependencies">
269269
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
270270
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
271-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>10.0.0-preview.24568.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
271+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>10.0.0-preview.24575.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
272272
</PropertyGroup>
273273
<PropertyGroup Label="Manually updated">
274274
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -277,19 +277,19 @@
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/arcade -->
280-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
281-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24570.4</MicrosoftDotNetSignToolVersion>
282-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24570.4</MicrosoftDotNetXliffTasksVersion>
283-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24570.4</MicrosoftDotNetXUnitExtensionsVersion>
280+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24572.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
281+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24572.3</MicrosoftDotNetSignToolVersion>
282+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24572.3</MicrosoftDotNetXliffTasksVersion>
283+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24572.3</MicrosoftDotNetXUnitExtensionsVersion>
284284
</PropertyGroup>
285285
<PropertyGroup>
286286
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
287-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24569.2</MicrosoftBuildTasksGitVersion>
288-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkCommonVersion>
289-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkAzureReposGitVersion>
290-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkGitHubVersion>
291-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkGitLabVersion>
292-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24569.2</MicrosoftSourceLinkBitbucketGitVersion>
287+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24574.1</MicrosoftBuildTasksGitVersion>
288+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkCommonVersion>
289+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkAzureReposGitVersion>
290+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkGitHubVersion>
291+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkGitLabVersion>
292+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24574.1</MicrosoftSourceLinkBitbucketGitVersion>
293293
</PropertyGroup>
294294
<!-- Get .NET Framework reference assemblies from NuGet packages -->
295295
<PropertyGroup>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24572.3",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ internal static class CliConstants
99
public const string HelpOptionKey = "--help";
1010
public const string ServerOptionKey = "--server";
1111
public const string DotNetTestPipeOptionKey = "--dotnet-test-pipe";
12-
public const string ProjectOptionKey = "--project";
1312
public const string FrameworkOptionKey = "--framework";
1413

1514
public const string ServerOptionValue = "dotnettestcli";

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

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

66
namespace Microsoft.DotNet.Tools.Test;
77

8-
internal sealed record ModuleMessage(string? DLLPath, string? ProjectPath, string? TargetFramework, string? RunSettingsFilePath) : IRequest;
8+
internal sealed record ModuleMessage(string? DllOrExePath, string? ProjectPath, string? TargetFramework, string? RunSettingsFilePath, string IsTestingPlatformApplication) : IRequest;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ public object Deserialize(Stream stream)
1313
string projectPath = ReadString(stream);
1414
string targetFramework = ReadString(stream);
1515
string runSettingsFilePath = ReadString(stream);
16-
return new ModuleMessage(modulePath.Trim(), projectPath.Trim(), targetFramework.Trim(), runSettingsFilePath.Trim());
16+
string isTestingPlatformApplication = ReadString(stream);
17+
return new ModuleMessage(modulePath.Trim(), projectPath.Trim(), targetFramework.Trim(), runSettingsFilePath.Trim(), isTestingPlatformApplication.Trim());
1718
}
1819

1920
public void Serialize(object objectToSerialize, Stream stream)
2021
{
21-
WriteString(stream, ((ModuleMessage)objectToSerialize).DLLPath);
22+
WriteString(stream, ((ModuleMessage)objectToSerialize).DllOrExePath);
2223
WriteString(stream, ((ModuleMessage)objectToSerialize).ProjectPath);
2324
WriteString(stream, ((ModuleMessage)objectToSerialize).TargetFramework);
2425
WriteString(stream, ((ModuleMessage)objectToSerialize).RunSettingsFilePath);
26+
WriteString(stream, ((ModuleMessage)objectToSerialize).IsTestingPlatformApplication);
2527
}
2628
}
2729
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,4 +315,15 @@ Examples:
315315
<data name="CmdTestModulesRootDirectoryDescription" xml:space="preserve">
316316
<value>The test modules have the specified root directory.</value>
317317
</data>
318+
<data name="CmdUnsupportedMessageRequestTypeException" xml:space="preserve">
319+
<value>Message Request type '{0}' is unsupported.</value>
320+
<comment>{0} - message request type</comment>
321+
</data>
322+
<data name="CmdInvalidTestMessageStateException" xml:space="preserve">
323+
<value>Invalid test message state '{0}'</value>
324+
<comment>{0} - test message state</comment>
325+
</data>
326+
<data name="CmdUnsupportedVSTestTestApplicationsDescription" xml:space="preserve">
327+
<value>Test application(s) that support VSTest are not supported.</value>
328+
</data>
318329
</root>

0 commit comments

Comments
 (0)