Skip to content

Commit 9a5fb76

Browse files
nagilsonnagilson
authored
Merge branch 'main' into darc-main-fd855f3f-fe0a-4c31-a8f0-78a4ed8db755
2 parents 87dc018 + b6c4b38 commit 9a5fb76

File tree

8 files changed

+155
-178
lines changed

8 files changed

+155
-178
lines changed

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -87,44 +87,44 @@
8787
</PropertyGroup>
8888
<PropertyGroup>
8989
<!-- Dependencies from https://github.com/dotnet/runtime -->
90-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.2.25111.15</MicrosoftNETCoreAppRefPackageVersion>
91-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25111.15</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
92-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.2.25111.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
93-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-preview.2.25111.15</MicrosoftExtensionsDependencyModelPackageVersion>
94-
<MicrosoftNETHostModelVersion>10.0.0-preview.2.25111.15</MicrosoftNETHostModelVersion>
95-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-preview.2.25111.15</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
96-
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.2.25111.15</MicrosoftExtensionsLoggingAbstractionsVersion>
97-
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.2.25111.15</MicrosoftExtensionsLoggingConsoleVersion>
98-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.2.25111.15</MicrosoftExtensionsLoggingVersion>
99-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.2.25111.15</MicrosoftNETILLinkTasksPackageVersion>
100-
<MicrosoftExtensionsConfigurationIniVersion>10.0.0-preview.2.25111.15</MicrosoftExtensionsConfigurationIniVersion>
101-
<SystemServiceProcessServiceControllerVersion>10.0.0-preview.2.25111.15</SystemServiceProcessServiceControllerVersion>
90+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.2.25112.7</MicrosoftNETCoreAppRefPackageVersion>
91+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25112.7</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
92+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.2.25112.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
93+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-preview.2.25112.7</MicrosoftExtensionsDependencyModelPackageVersion>
94+
<MicrosoftNETHostModelVersion>10.0.0-preview.2.25112.7</MicrosoftNETHostModelVersion>
95+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-preview.2.25112.7</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
96+
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.2.25112.7</MicrosoftExtensionsLoggingAbstractionsVersion>
97+
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.2.25112.7</MicrosoftExtensionsLoggingConsoleVersion>
98+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.2.25112.7</MicrosoftExtensionsLoggingVersion>
99+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.2.25112.7</MicrosoftNETILLinkTasksPackageVersion>
100+
<MicrosoftExtensionsConfigurationIniVersion>10.0.0-preview.2.25112.7</MicrosoftExtensionsConfigurationIniVersion>
101+
<SystemServiceProcessServiceControllerVersion>10.0.0-preview.2.25112.7</SystemServiceProcessServiceControllerVersion>
102102
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
103-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.2.25111.15</MicrosoftNETCorePlatformsPackageVersion>
104-
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-preview.2.25111.15</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
105-
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-preview.2.25111.15</MicrosoftNETCoreAppHostwinx64PackageVersion>
106-
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-preview.2.25111.15</MicrosoftBclAsyncInterfacesPackageVersion>
107-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-preview.2.25111.15</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
108-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.2.25111.15</MicrosoftWin32SystemEventsPackageVersion>
103+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.2.25112.7</MicrosoftNETCorePlatformsPackageVersion>
104+
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-preview.2.25112.7</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
105+
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-preview.2.25112.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
106+
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-preview.2.25112.7</MicrosoftBclAsyncInterfacesPackageVersion>
107+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-preview.2.25112.7</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
108+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.2.25112.7</MicrosoftWin32SystemEventsPackageVersion>
109109
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
110-
<SystemCodeDomPackageVersion>10.0.0-preview.2.25111.15</SystemCodeDomPackageVersion>
111-
<SystemCompositionAttributedModelPackageVersion>10.0.0-preview.2.25111.15</SystemCompositionAttributedModelPackageVersion>
112-
<SystemCompositionConventionPackageVersion>10.0.0-preview.2.25111.15</SystemCompositionConventionPackageVersion>
113-
<SystemCompositionHostingPackageVersion>10.0.0-preview.2.25111.15</SystemCompositionHostingPackageVersion>
114-
<SystemCompositionRuntimePackageVersion>10.0.0-preview.2.25111.15</SystemCompositionRuntimePackageVersion>
115-
<SystemCompositionTypedPartsPackageVersion>10.0.0-preview.2.25111.15</SystemCompositionTypedPartsPackageVersion>
116-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.2.25111.15</SystemConfigurationConfigurationManagerPackageVersion>
117-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.2.25111.15</SystemReflectionMetadataLoadContextVersion>
118-
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.2.25111.15</SystemResourcesExtensionsPackageVersion>
119-
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-preview.2.25111.15</SystemSecurityCryptographyPkcsPackageVersion>
120-
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-preview.2.25111.15</SystemSecurityCryptographyProtectedDataPackageVersion>
121-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.2.25111.15</SystemSecurityCryptographyXmlPackageVersion>
122-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.2.25111.15</SystemSecurityPermissionsPackageVersion>
123-
<SystemTextEncodingCodePagesPackageVersion>10.0.0-preview.2.25111.15</SystemTextEncodingCodePagesPackageVersion>
124-
<SystemTextJsonPackageVersion>10.0.0-preview.2.25111.15</SystemTextJsonPackageVersion>
125-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.2.25111.15</SystemWindowsExtensionsPackageVersion>
126-
<SystemIOHashingPackageVersion>10.0.0-preview.2.25111.15</SystemIOHashingPackageVersion>
127-
<SystemFormatsAsn1Version>10.0.0-preview.2.25111.15</SystemFormatsAsn1Version>
110+
<SystemCodeDomPackageVersion>10.0.0-preview.2.25112.7</SystemCodeDomPackageVersion>
111+
<SystemCompositionAttributedModelPackageVersion>10.0.0-preview.2.25112.7</SystemCompositionAttributedModelPackageVersion>
112+
<SystemCompositionConventionPackageVersion>10.0.0-preview.2.25112.7</SystemCompositionConventionPackageVersion>
113+
<SystemCompositionHostingPackageVersion>10.0.0-preview.2.25112.7</SystemCompositionHostingPackageVersion>
114+
<SystemCompositionRuntimePackageVersion>10.0.0-preview.2.25112.7</SystemCompositionRuntimePackageVersion>
115+
<SystemCompositionTypedPartsPackageVersion>10.0.0-preview.2.25112.7</SystemCompositionTypedPartsPackageVersion>
116+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.2.25112.7</SystemConfigurationConfigurationManagerPackageVersion>
117+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.2.25112.7</SystemReflectionMetadataLoadContextVersion>
118+
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.2.25112.7</SystemResourcesExtensionsPackageVersion>
119+
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-preview.2.25112.7</SystemSecurityCryptographyPkcsPackageVersion>
120+
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-preview.2.25112.7</SystemSecurityCryptographyProtectedDataPackageVersion>
121+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.2.25112.7</SystemSecurityCryptographyXmlPackageVersion>
122+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.2.25112.7</SystemSecurityPermissionsPackageVersion>
123+
<SystemTextEncodingCodePagesPackageVersion>10.0.0-preview.2.25112.7</SystemTextEncodingCodePagesPackageVersion>
124+
<SystemTextJsonPackageVersion>10.0.0-preview.2.25112.7</SystemTextJsonPackageVersion>
125+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.2.25112.7</SystemWindowsExtensionsPackageVersion>
126+
<SystemIOHashingPackageVersion>10.0.0-preview.2.25112.7</SystemIOHashingPackageVersion>
127+
<SystemFormatsAsn1Version>10.0.0-preview.2.25112.7</SystemFormatsAsn1Version>
128128
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
129129
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
130130
<MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
@@ -140,9 +140,9 @@
140140
</PropertyGroup>
141141
<PropertyGroup>
142142
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
143-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25112.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
144-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25112.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
145-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25112.1</MicrosoftWindowsDesktopAppRefPackageVersion>
143+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25112.7</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
144+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25112.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
145+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25112.7</MicrosoftWindowsDesktopAppRefPackageVersion>
146146
</PropertyGroup>
147147
<PropertyGroup>
148148
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -193,8 +193,8 @@
193193
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
194194
195195
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
196-
<MicrosoftBuildVersion>17.14.0-preview-25111-16</MicrosoftBuildVersion>
197-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25111-16</MicrosoftBuildLocalizationVersion>
196+
<MicrosoftBuildVersion>17.14.0-preview-25112-08</MicrosoftBuildVersion>
197+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25112-08</MicrosoftBuildLocalizationVersion>
198198
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
199199
<MinimumVSVersion>17.13</MinimumVSVersion>
200200
</PropertyGroup>
@@ -267,10 +267,10 @@
267267
</PropertyGroup>
268268
<PropertyGroup>
269269
<!-- Dependencies from https://github.com/dotnet/arcade -->
270-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25110.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
271-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25110.3</MicrosoftDotNetSignToolVersion>
272-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25110.3</MicrosoftDotNetXliffTasksVersion>
273-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25110.3</MicrosoftDotNetXUnitExtensionsVersion>
270+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25112.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
271+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25112.2</MicrosoftDotNetSignToolVersion>
272+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25112.2</MicrosoftDotNetXliffTasksVersion>
273+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25112.2</MicrosoftDotNetXUnitExtensionsVersion>
274274
</PropertyGroup>
275275
<PropertyGroup>
276276
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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.25110.3",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25110.3",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25112.2",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25112.2",
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ internal static class CliConstants
77
{
88
public const string DotnetRunCommand = "dotnet run";
99
public const string HelpOptionKey = "--help";
10+
public const string ShortHelpOptionKey = "-h";
1011
public const string ServerOptionKey = "--server";
1112
public const string DotNetTestPipeOptionKey = "--dotnet-test-pipe";
1213
public const string FrameworkOptionKey = "--framework";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private static BuildOptions GetBuildOptions(ParseResult parseResult, int degreeO
204204
msbuildArgs);
205205
}
206206

207-
private static bool ContainsHelpOption(IEnumerable<string> args) => args.Contains(CliConstants.HelpOptionKey) || args.Contains(CliConstants.HelpOptionKey.Substring(0, 2));
207+
private static bool ContainsHelpOption(IEnumerable<string> args) => args.Contains(CliConstants.HelpOptionKey) || args.Contains(CliConstants.ShortHelpOptionKey);
208208

209209
private void CompleteRun()
210210
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ internal static class TestingPlatformOptions
4646
Arity = ArgumentArity.ExactlyOne
4747
};
4848

49-
public static readonly CliOption<string> ListTestsOption = new("--list-tests")
49+
public static readonly CliOption<string> ListTestsOption = new("--list-tests", "-t")
5050
{
5151
Description = LocalizableStrings.CmdListTestsDescription,
5252
Arity = ArgumentArity.Zero

‎src/SourceBuild/patches/runtime/0003-dont-build-host-tools.patch

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

‎test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsHelp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void RunHelpOnMultipleTestProjects_ShouldReturnZeroAsExitCode(string conf
4545
CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
4646
.WithWorkingDirectory(testInstance.Path)
4747
.WithEnableTestingPlatform()
48-
.Execute(CliConstants.HelpOptionKey, TestingPlatformOptions.ConfigurationOption.Name, configuration);
48+
.Execute(CliConstants.ShortHelpOptionKey, TestingPlatformOptions.ConfigurationOption.Name, configuration);
4949

5050
if (!TestContext.IsLocalized())
5151
{

0 commit comments

Comments
 (0)