Skip to content

Commit 5d468ab

Browse files
MiYanniMiYanni
committed
Merge branch 'main' into merge/release/9.0.3xx-to-main
# Conflicts: # src/Layout/pkg/osx/resources/cs.lproj/conclusion.html # src/Layout/pkg/osx/resources/de.lproj/conclusion.html # src/Layout/pkg/osx/resources/es.lproj/conclusion.html # src/Layout/pkg/osx/resources/fr.lproj/conclusion.html # src/Layout/pkg/osx/resources/it.lproj/conclusion.html # src/Layout/pkg/osx/resources/ja.lproj/conclusion.html # src/Layout/pkg/osx/resources/ko.lproj/conclusion.html # src/Layout/pkg/osx/resources/pl.lproj/conclusion.html # src/Layout/pkg/osx/resources/pt-br.lproj/conclusion.html # src/Layout/pkg/osx/resources/ru.lproj/conclusion.html # src/Layout/pkg/osx/resources/zh-hans.lproj/conclusion.html # src/Layout/pkg/osx/resources/zh-hant.lproj/conclusion.html
2 parents ecf7b63 + 113a5d6 commit 5d468ab

File tree

310 files changed

+9276
-9240
lines changed

Some content is hidden

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

310 files changed

+9276
-9240
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25312.2",
6+
"version": "1.1.0-beta.25317.2",
77
"commands": [
88
"darc"
99
]

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,13 +538,13 @@
538538
<Uri>https://github.com/dotnet/dotnet</Uri>
539539
<Sha>20343176cfd35b56036dc4ca9d9ddd2a201a4e92</Sha>
540540
</Dependency>
541-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25312.2">
541+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25317.2">
542542
<Uri>https://github.com/dotnet/arcade-services</Uri>
543-
<Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</Sha>
543+
<Sha>ae710fac68a8b1eb7ddf3f3579b0c372e2e01feb</Sha>
544544
</Dependency>
545-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25312.2">
545+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25317.2">
546546
<Uri>https://github.com/dotnet/arcade-services</Uri>
547-
<Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</Sha>
547+
<Sha>ae710fac68a8b1eb7ddf3f3579b0c372e2e01feb</Sha>
548548
</Dependency>
549549
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25316.7">
550550
<Uri>https://github.com/microsoft/testfx</Uri>

‎eng/Versions.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
2323
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
2424
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
25-
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">6</PreReleaseVersionIteration>
25+
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">7</PreReleaseVersionIteration>
2626
<!-- In source-build the version of the compiler must be same or newer than the version of the
2727
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
2828
in that build mode analyzer assemblies always target the live compiler API. -->
@@ -39,8 +39,8 @@
3939
<VersionFeature60>36</VersionFeature60>
4040
<VersionFeature70>20</VersionFeature70>
4141
<!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
42-
<VersionFeature80>15</VersionFeature80>
43-
<VersionFeature90>4</VersionFeature90>
42+
<VersionFeature80>16</VersionFeature80>
43+
<VersionFeature90>5</VersionFeature90>
4444
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4545
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4646
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependency from https://github.com/dotnet/arcade-services -->
92-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25312.2</MicrosoftDotNetDarcLibVersion>
92+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25317.2</MicrosoftDotNetDarcLibVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependency from https://github.com/dotnet/aspire -->
@@ -329,13 +329,13 @@
329329
<PropertyGroup Label="Workload manifest package versions">
330330
<AspireFeatureBand>8.0.100</AspireFeatureBand>
331331
<MicrosoftNETSdkAspireManifest80100PackageVersion>8.2.2</MicrosoftNETSdkAspireManifest80100PackageVersion>
332-
<MauiFeatureBand>10.0.100-preview.3</MauiFeatureBand>
333-
<MauiWorkloadManifestVersion>10.0.0-preview.3.25208.1</MauiWorkloadManifestVersion>
334-
<XamarinAndroidWorkloadManifestVersion>36.0.0-preview.3.22</XamarinAndroidWorkloadManifestVersion>
335-
<XamarinIOSWorkloadManifestVersion>18.2.10695-net10-p3</XamarinIOSWorkloadManifestVersion>
336-
<XamarinMacCatalystWorkloadManifestVersion>18.2.10695-net10-p3</XamarinMacCatalystWorkloadManifestVersion>
337-
<XamarinMacOSWorkloadManifestVersion>15.2.10695-net10-p3</XamarinMacOSWorkloadManifestVersion>
338-
<XamarinTvOSWorkloadManifestVersion>18.2.10695-net10-p3</XamarinTvOSWorkloadManifestVersion>
332+
<MauiFeatureBand>10.0.100-preview.5</MauiFeatureBand>
333+
<MauiWorkloadManifestVersion>10.0.0-preview.5.25306.5</MauiWorkloadManifestVersion>
334+
<XamarinAndroidWorkloadManifestVersion>36.0.0-preview.5.116</XamarinAndroidWorkloadManifestVersion>
335+
<XamarinIOSWorkloadManifestVersion>18.4.10622-net10-p5</XamarinIOSWorkloadManifestVersion>
336+
<XamarinMacCatalystWorkloadManifestVersion>18.4.10622-net10-p5</XamarinMacCatalystWorkloadManifestVersion>
337+
<XamarinMacOSWorkloadManifestVersion>15.4.10622-net10-p5</XamarinMacOSWorkloadManifestVersion>
338+
<XamarinTvOSWorkloadManifestVersion>18.4.10622-net10-p5</XamarinTvOSWorkloadManifestVersion>
339339
</PropertyGroup>
340340
<PropertyGroup Label="Pinned dependency">
341341
<!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

‎eng/pipelines/templates/jobs/sdk-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
templateContext:
5959
sdl:
6060
binskim:
61-
analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;
61+
analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;
6262

6363
steps:
6464
############## PREP ###############

‎src/Cli/Microsoft.TemplateEngine.Cli/Help/HelpBuilder.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public virtual void Write(HelpContext context)
4343
throw new ArgumentNullException(nameof(context));
4444
}
4545

46-
if (context.Command.Hidden)
47-
{
48-
return;
49-
}
50-
5146
foreach (var writeSection in GetLayout(context))
5247
{
5348
if (writeSection(context))

‎src/Cli/dotnet/Commands/Dnx/DnxCommandParser.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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+
using System.CommandLine;
5+
using Microsoft.DotNet.Cli.Commands.Tool;
6+
using Microsoft.DotNet.Cli.Commands.Tool.Execute;
7+
8+
namespace Microsoft.DotNet.Cli.Commands.Dnx;
9+
10+
internal static class DnxCommandParser
11+
{
12+
public static readonly Command Command = ConstructCommand();
13+
public static Command GetCommand()
14+
{
15+
return Command;
16+
}
17+
18+
private static Command ConstructCommand()
19+
{
20+
Command command = new("dnx", CliCommandStrings.ToolExecuteCommandDescription);
21+
command.Hidden = true;
22+
23+
foreach (var argument in ToolExecuteCommandParser.Command.Arguments)
24+
{
25+
command.Arguments.Add(argument);
26+
}
27+
28+
foreach (var option in ToolExecuteCommandParser.Command.Options)
29+
{
30+
command.Options.Add(option);
31+
}
32+
33+
command.SetAction((parseResult) => new ToolExecuteCommand(parseResult).Execute());
34+
35+
return command;
36+
}
37+
}

‎src/Cli/dotnet/Commands/Test/Terminal/TerminalTestReporter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,9 @@ private bool GetShowPassedTests()
553553

554554
TerminalColor color = outcome switch
555555
{
556-
TestOutcome.Error or TestOutcome.Fail or TestOutcome.Canceled or TestOutcome.Timeout => TerminalColor.Red,
557-
TestOutcome.Skipped => TerminalColor.Yellow,
558-
TestOutcome.Passed => TerminalColor.Green,
556+
TestOutcome.Error or TestOutcome.Fail or TestOutcome.Canceled or TestOutcome.Timeout => TerminalColor.DarkRed,
557+
TestOutcome.Skipped => TerminalColor.DarkYellow,
558+
TestOutcome.Passed => TerminalColor.DarkGreen,
559559
_ => throw new NotSupportedException(),
560560
};
561561
string outcomeText = outcome switch

‎src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cli/dotnet/Parser.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Microsoft.DotNet.Cli.Commands.Build;
1111
using Microsoft.DotNet.Cli.Commands.BuildServer;
1212
using Microsoft.DotNet.Cli.Commands.Clean;
13+
using Microsoft.DotNet.Cli.Commands.Dnx;
1314
using Microsoft.DotNet.Cli.Commands.Format;
1415
using Microsoft.DotNet.Cli.Commands.Fsi;
1516
using Microsoft.DotNet.Cli.Commands.Help;
@@ -66,6 +67,7 @@ public static class Parser
6667
BuildCommandParser.GetCommand(),
6768
BuildServerCommandParser.GetCommand(),
6869
CleanCommandParser.GetCommand(),
70+
DnxCommandParser.GetCommand(),
6971
FormatCommandParser.GetCommand(),
7072
CompleteCommandParser.GetCommand(),
7173
FsiCommandParser.GetCommand(),
@@ -313,12 +315,15 @@ public override void Write(HelpContext context)
313315
{
314316
var command = context.Command;
315317
var helpArgs = new string[] { "--help" };
318+
319+
// custom help overrides
316320
if (command.Equals(RootCommand))
317321
{
318322
Console.Out.WriteLine(CliUsage.HelpText);
319323
return;
320324
}
321325

326+
// argument/option cleanups specific to help
322327
foreach (var option in command.Options)
323328
{
324329
option.EnsureHelpName();

0 commit comments

Comments
 (0)