From f3ac12666bd4cb785570a48f8cfbb01be1520288 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2019 12:22:57 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/core-setup build 20191022.10 - Microsoft.NETCore.App - 5.0.0-alpha1.19522.10 Dependency coherency updates - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - Microsoft.Win32.Registry - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - System.CodeDom - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - System.Resources.Extensions - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Cng - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App) - Microsoft.NET.Sdk.IL - 5.0.0-alpha1.19522.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19522.3 (parent: Microsoft.NETCore.App) Fix tests to account for https://github.com/dotnet/corefx/pull/40215 --- build-local.ps1 | 4 ++ eng/Version.Details.xml | 52 +++++++++---------- eng/Versions.props | 24 ++++----- global.json | 2 +- .../Forms/Layout/TableLayoutSettingsTests.cs | 4 +- 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/build-local.ps1 b/build-local.ps1 index da9c5ae5b4a..a66c122a767 100644 --- a/build-local.ps1 +++ b/build-local.ps1 @@ -153,6 +153,10 @@ function Remove-Artifacts { [string] $Path ) + if (!(Test-Path $Path)) { + return 0; + } + $errorCount = 0; Get-ChildItem -Path $Path -Include @( 'bin', 'obj' ) -Recurse | ForEach-Object { $fullPath = $_.FullName; diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ddacba1874..3f40591f6ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,60 +10,60 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/core-setup - 4ace84dbf94128b4825c76cdd09b46dba7473478 + 57b6a955d50a983d290a5add72c244e19a56cb2a - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/corefx - a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 + 46299619e290936c495264162ede68354ced5b18 - + https://github.com/dotnet/coreclr - b415b57a15b0c6ba77e63df901823bb46b8aafda + 71fe5c4796cd01fa62e202aab2ebc180d0e4a799 5596 - + https://github.com/dotnet/coreclr - b415b57a15b0c6ba77e63df901823bb46b8aafda + 71fe5c4796cd01fa62e202aab2ebc180d0e4a799 5596 diff --git a/eng/Versions.props b/eng/Versions.props index b0efd9e5f3c..fc514440087 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,25 +10,25 @@ - 5.0.0-alpha1.19514.1 + 5.0.0-alpha1.19522.10 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 - 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 + 5.0.0-alpha1.19521.4 3.0.0-preview5-27616-73 - 5.0.0-alpha1.19513.3 + 5.0.0-alpha1.19522.3 diff --git a/global.json b/global.json index f21e13deae6..433a0030bb8 100644 --- a/global.json +++ b/global.json @@ -17,7 +17,7 @@ "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19522.8", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19522.8", - "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3" + "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19522.3" }, "native-tools": { "dotnet-api-docs_netcoreapp3.0": "0.0.0.1" diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs index c8c977131e8..d6a911fd5eb 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs @@ -6,8 +6,6 @@ using System.ComponentModel; using System.Globalization; using System.IO; -using System.Linq; -using System.Reflection; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; using Xunit; @@ -705,7 +703,7 @@ public void TableLayoutSettings_Serialize_InvalidStringConverter_DeserializeThro formatter.Serialize(stream, settings); stream.Seek(0, SeekOrigin.Begin); - Assert.Throws(() => formatter.Deserialize(stream)); + Assert.Throws(() => formatter.Deserialize(stream)); } }