diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7dace23a96d..16eef91637f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 11f89f03a41eefcc60e278d0fc96b63b175e4527 - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 11f89f03a41eefcc60e278d0fc96b63b175e4527 - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 11f89f03a41eefcc60e278d0fc96b63b175e4527 https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 11f89f03a41eefcc60e278d0fc96b63b175e4527 https://github.com/dotnet/sourcelink diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 4f0546dce12..ab2b13f63fb 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 80f9130b150..95ccdf82e4b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 - $defaultXCopyMSBuildVersion = '17.12.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 + $defaultXCopyMSBuildVersion = '17.13.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 04ae0b82528..58029347f24 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.25077.2", + "dotnet": "10.0.100-preview.2.25118.3", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)" @@ -11,12 +11,12 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25119.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25119.2", "Microsoft.Build.NoTargets": "3.7.56" }, "sdk": { - "version": "10.0.100-alpha.1.25077.2" + "version": "10.0.100-preview.2.25118.3" }, "native-tools": { "strawberry-perl": "5.38.0.1", diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/WindowsBase.Tests/System/ComponentModel/SortDescriptionTests.cs b/src/Microsoft.DotNet.Wpf/tests/UnitTests/WindowsBase.Tests/System/ComponentModel/SortDescriptionTests.cs index f009510a1fe..3b7f121e9e0 100644 --- a/src/Microsoft.DotNet.Wpf/tests/UnitTests/WindowsBase.Tests/System/ComponentModel/SortDescriptionTests.cs +++ b/src/Microsoft.DotNet.Wpf/tests/UnitTests/WindowsBase.Tests/System/ComponentModel/SortDescriptionTests.cs @@ -88,6 +88,7 @@ public void PropertyName_Set_GetReturnsExpected(string? value) // Set same. description.PropertyName = value; + Assert.Equal(value, description.PropertyName); } [Theory]