Skip to content

Commit afb2f20

Browse files
MiYanniMiYanni
authored
[release/10.0.1xx-preview7] Source code updates from dotnet/dotnet (#49905)
2 parents c1e8b6f + cbe26b6 commit afb2f20

File tree

143 files changed

+1182
-1095
lines changed

Some content is hidden

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

143 files changed

+1182
-1095
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
numbers of the shared frameworks. -->
104104
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
105105
<MicrosoftWindowsDesktopAppRefPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRefPackageVersion>
106-
<MicrosoftNETSdkWindowsDesktopPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETSdkWindowsDesktopPackageVersion>
107106
<MicrosoftWindowsDesktopAppInternalPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftWindowsDesktopAppInternalPackageVersion>
108107

109108
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>

‎eng/Packages.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<!-- Packages must be set to their package version property if it exists (ex. BenchmarkDotNetVersion) since source-build uses
55
these properties to override package versions if necessary. -->
66
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
7-
<PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
8-
<PackageVersion Update="Verify.DiffPlex" Condition="'$(VerifyDiffPlexVersion)' != ''" Version="$(VerifyDiffPlexVersion)" />
7+
<PackageVersion Update="DiffPlex" Condition="'$(DiffPlexVersion)' != ''" Version="$(DiffPlexVersion)" />
98
<PackageVersion Update="FakeItEasy" Condition="'$(FakeItEasyVersion)' != ''" Version="$(FakeItEasyVersion)" />
9+
<PackageVersion Update="Verify.DiffPlex" Condition="'$(VerifyDiffPlexVersion)' != ''" Version="$(VerifyDiffPlexVersion)" />
10+
<PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
1011
<PackageVersion Update="Wcwidth.Sources" Condition="'$(WcwidthSourcesVersion)' != ''" Version="$(WcwidthSourcesVersion)" />
1112
</ItemGroup>
1213
</Project>

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

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

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
414414

415415
# Locate Visual Studio installation or download x-copy msbuild.
416416
$vsInfo = LocateVisualStudio $vsRequirements
417-
if ($vsInfo -ne $null) {
417+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
418418
# Ensure vsInstallDir has a trailing slash
419419
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
420420
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎eng/dependabot/Packages.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
<ItemGroup>
66
<!--Test dependencies-->
7-
<PackageVersion Include="Verify.Xunit" Version="28.7.0" />
8-
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
7+
<PackageVersion Include="DiffPlex" Version="1.8.0" />
98
<PackageVersion Include="FakeItEasy" Version="8.0.0" />
9+
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
10+
<PackageVersion Include="Verify.Xunit" Version="28.7.0" />
1011
<PackageVersion Include="Wcwidth.Sources" Version="2.0.0" />
1112
</ItemGroup>
1213
</Project>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
88
},
99
"tools": {
10-
"dotnet": "10.0.100-preview.7.25322.101",
10+
"dotnet": "10.0.100-preview.7.25367.101",
1111
"runtimes": {
1212
"dotnet": [
1313
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25359.101",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25359.101",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25373.105",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25373.105",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0"
2828
}

‎sdk.slnx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj" />
5151
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj" />
5252
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj" />
53+
<Project Path="src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
5354
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj" />
5455
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj" />
55-
<Project Path="src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
5656
</Folder>
5757
<Folder Name="/src/Cli/">
5858
<Project Path="src/Cli/dotnet/dotnet.csproj" />

‎src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,18 @@ public static FormatOptions ParseVerbosityOption(this ParseResult parseResult, F
164164

165165
public static FormatOptions ParseCommonOptions(this ParseResult parseResult, FormatOptions formatOptions, ILogger logger)
166166
{
167-
if (parseResult.GetResult(NoRestoreOption) is not null)
167+
if (parseResult.GetValue(NoRestoreOption))
168168
{
169169
formatOptions = formatOptions with { NoRestore = true };
170170
}
171171

172-
if (parseResult.GetResult(VerifyNoChanges) is not null)
172+
if (parseResult.GetValue(VerifyNoChanges))
173173
{
174174
formatOptions = formatOptions with { ChangesAreErrors = true };
175175
formatOptions = formatOptions with { SaveFormattedFiles = false };
176176
}
177177

178-
if (parseResult.GetResult(IncludeGeneratedOption) is not null)
178+
if (parseResult.GetValue(IncludeGeneratedOption))
179179
{
180180
formatOptions = formatOptions with { IncludeGeneratedFiles = true };
181181
}
@@ -300,7 +300,7 @@ public static FormatOptions ParseWorkspaceOptions(this ParseResult parseResult,
300300

301301
if (parseResult.GetValue<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
302302
{
303-
if (parseResult.GetResult(FolderOption) is not null)
303+
if (parseResult.GetValue(FolderOption))
304304
{
305305
formatOptions = formatOptions with { WorkspaceFilePath = slnOrProject };
306306
formatOptions = formatOptions with { WorkspaceType = WorkspaceType.Folder };

‎src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ internal static Command GetCommand()
2828
internal static void EnsureFolderNotSpecifiedWithNoRestore(CommandResult symbolResult)
2929
{
3030
var folder = symbolResult.GetValue(FolderOption);
31-
var noRestore = symbolResult.GetResult(NoRestoreOption);
32-
if (folder && noRestore != null)
31+
var noRestore = symbolResult.GetValue(NoRestoreOption);
32+
if (folder && noRestore)
3333
{
3434
symbolResult.AddError(Resources.Cannot_specify_the_folder_option_with_no_restore);
3535
}

0 commit comments

Comments
 (0)