Skip to content

Commit 7ddfe10

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into merge/release/9.0.3xx-to-main
2 parents 8de4a9f + 9badd70 commit 7ddfe10

File tree

71 files changed

+125
-197
lines changed

Some content is hidden

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

71 files changed

+125
-197
lines changed

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,13 +579,13 @@
579579
<Uri>https://github.com/dotnet/arcade-services</Uri>
580580
<Sha>bd2309670213218bc0e2073379e4985b346600c7</Sha>
581581
</Dependency>
582-
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25257.2">
582+
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25262.2">
583583
<Uri>https://github.com/microsoft/testfx</Uri>
584-
<Sha>2b3a9fd44e2cbb1c52362a211b025b9eddbd8ec1</Sha>
584+
<Sha>9a016c071b017918233cbf99e1d21144fb9ce5f3</Sha>
585585
</Dependency>
586-
<Dependency Name="MSTest" Version="3.10.0-preview.25257.2">
586+
<Dependency Name="MSTest" Version="3.10.0-preview.25262.2">
587587
<Uri>https://github.com/microsoft/testfx</Uri>
588-
<Sha>2b3a9fd44e2cbb1c52362a211b025b9eddbd8ec1</Sha>
588+
<Sha>9a016c071b017918233cbf99e1d21144fb9ce5f3</Sha>
589589
</Dependency>
590590
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.5.25260.104">
591591
<Uri>https://github.com/dotnet/dotnet</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<UsingToolVSSDK>true</UsingToolVSSDK>
3131
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
3232
<!-- This property is only used in the dotnet test integration tests. -->
33-
<MicrosoftTestingPlatformVersion>1.8.0-preview.25257.2</MicrosoftTestingPlatformVersion>
33+
<MicrosoftTestingPlatformVersion>1.8.0-preview.25262.2</MicrosoftTestingPlatformVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Servicing version information">
3636
<VersionFeature21>30</VersionFeature21>
@@ -328,7 +328,7 @@
328328
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
329329
<AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
330330
<MoqPackageVersion>4.18.4</MoqPackageVersion>
331-
<MSTestVersion>3.10.0-preview.25257.2</MSTestVersion>
331+
<MSTestVersion>3.10.0-preview.25262.2</MSTestVersion>
332332
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
333333
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
334334
</PropertyGroup>

‎src/Cli/dotnet/CommandFactory/CommandSpec.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable warnings
5-
64
using Microsoft.DotNet.Cli.CommandFactory.CommandResolution;
75

86
namespace Microsoft.DotNet.Cli.CommandFactory;
97

108
public class CommandSpec(
11-
string? path,
9+
string path,
1210
string? args,
13-
Dictionary<string, string> environmentVariables = null)
11+
Dictionary<string, string>? environmentVariables = null)
1412
{
1513
public string Path { get; } = path;
1614

17-
public string Args { get; } = args;
15+
public string? Args { get; } = args;
1816

1917
public Dictionary<string, string> EnvironmentVariables { get; } = environmentVariables ?? [];
2018

‎src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private static Command ConstructCommand()
4343
}
4444
else
4545
{
46-
return new PackageAddCommand(parseResult, parseResult.GetValue(AddCommandParser.ProjectArgument)).Execute();
46+
return new PackageAddCommand(parseResult, parseResult.GetValue(AddCommandParser.ProjectArgument) ?? Directory.GetCurrentDirectory()).Execute();
4747
}
4848
});
4949

‎src/Cli/dotnet/Commands/New/DotnetCommandCallbacks.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable warnings
5-
64
using Microsoft.DotNet.Cli.Commands.Hidden.Add;
75
using Microsoft.DotNet.Cli.Commands.Package.Add;
86
using Microsoft.DotNet.Cli.Commands.Reference.Add;

‎src/Cli/dotnet/Commands/New/MSBuildEvaluation/CapabilityExpressionEvaluator.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable warnings
5-
64
namespace Microsoft.DotNet.Cli.Commands.New.MSBuildEvaluation;
75

86
/// <remarks>

‎src/Cli/dotnet/Commands/New/MSBuildEvaluation/MSBuildEvaluationResult.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable warnings
5-
64
using MSBuildProject = Microsoft.Build.Evaluation.Project;
75

86
namespace Microsoft.DotNet.Cli.Commands.New.MSBuildEvaluation;

‎src/Cli/dotnet/Commands/New/MSBuildEvaluation/MSBuildEvaluator.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable warnings
5-
64
using System.Diagnostics;
75
using Microsoft.Build.Evaluation;
86
using Microsoft.DotNet.Cli.Utils;
@@ -197,7 +195,7 @@ private MSBuildEvaluationResult EvaluateProjectInternal(IEngineEnvironmentSettin
197195
targetFrameworksString = Sha256Hasher.HashWithNormalizedCasing(targetFramework);
198196
}
199197

200-
Dictionary<string, string> properties = new()
198+
Dictionary<string, string?> properties = new()
201199
{
202200
{ "ProjectPath", Sha256Hasher.HashWithNormalizedCasing(projectPath)},
203201
{ "SdkStyleProject", IsSdkStyleProject.ToString() },

‎src/Cli/dotnet/Commands/New/MSBuildEvaluation/MultiTargetEvaluationResult.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable warnings
5-
64
using MSBuildProject = Microsoft.Build.Evaluation.Project;
75

86
namespace Microsoft.DotNet.Cli.Commands.New.MSBuildEvaluation;

‎src/Cli/dotnet/Commands/New/MSBuildEvaluation/NonSDKStyleEvaluationResult.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable warnings
5-
64
using MSBuildProject = Microsoft.Build.Evaluation.Project;
75

86
namespace Microsoft.DotNet.Cli.Commands.New.MSBuildEvaluation;

0 commit comments

Comments
 (0)