From a1e24400feb6b00337c75f7ee0b50bd72146891f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jun 2022 12:11:32 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/runtime build 20220614.11 Microsoft.Internal.Runtime.WindowsDesktop.Transport , Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.ILAsm , Microsoft.NETCore.ILDAsm , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry.AccessControl , Microsoft.Win32.SystemEvents , Microsoft.Windows.Compatibility , runtime.win-x64.Microsoft.NETCore.ILAsm , runtime.win-x86.Microsoft.NETCore.ILAsm , System.CodeDom , System.Configuration.ConfigurationManager , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices , System.Drawing.Common , System.IO.Packaging , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.6.22313.8 -> To Version 7.0.0-preview.6.22314.11 --- eng/Version.Details.xml | 120 ++++++++++++++++++++-------------------- eng/Versions.props | 56 +++++++++---------- global.json | 2 +- 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc402ff23f5..69819811f1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,125 +7,125 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 - + https://github.com/dotnet/runtime - 367193d0854a75e258ff57f913b8f640c8dbb751 + eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7 diff --git a/eng/Versions.props b/eng/Versions.props index 4c32916bf9c..7c4be3ec8eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,34 +13,34 @@ - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 5.0.0-preview.7.20320.5 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 - 7.0.0-preview.6.22313.8 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 + 7.0.0-preview.6.22314.11 @@ -72,7 +72,7 @@ 1.0.7 17.0.15-alpha - 7.0.0-preview.6.22313.8 + 7.0.0-preview.6.22314.11 4.10.0 14.2.0 diff --git a/global.json b/global.json index be572aa7ea5..0a55de66ad5 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22313.1", "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22313.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22313.8" + "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22314.11" }, "native-tools": { "cmake": "3.21.0" From 564f1c14c355352c598fbec2c63d1fbf25c457f4 Mon Sep 17 00:00:00 2001 From: Devendar Reddy Adulla Date: Wed, 15 Jun 2022 13:23:38 -0700 Subject: [PATCH 2/2] Supress obsolete warnings. --- .../src/System/Drawing/Design/ToolboxItem.cs | 2 ++ .../tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs | 2 ++ .../src/System/Resources/AssemblyNamesTypeResolutionService.cs | 2 ++ .../src/System/Windows/Forms/ThreadExceptionDialog.cs | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs index c0f61d09631..89747cd1847 100644 --- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs +++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs @@ -633,6 +633,7 @@ protected virtual Type GetType(IDesignerHost host, AssemblyName assemblyName, st { } +#pragma warning disable SYSLIB0044 // Type or member is obsolete. Ref https://github.com/dotnet/winforms/issues/7308 if (a is null && !string.IsNullOrEmpty(assemblyName.CodeBase)) { try @@ -649,6 +650,7 @@ protected virtual Type GetType(IDesignerHost host, AssemblyName assemblyName, st { } } +#pragma warning restore SYSLIB0044 // Type or member is obsolete if (a != null) { diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs index c22af866c08..3a2a2c6c0f5 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs @@ -1205,6 +1205,7 @@ public static IEnumerable GetType_TestData() yield return new object[] { null, new AssemblyName(typeof(ToolboxItemTests).Assembly.FullName), "NoSuchType", false, null }; yield return new object[] { null, null, string.Empty, false, null }; +#pragma warning disable SYSLIB0044 // Type or member is obsolete var validNameWithCodeBase = new AssemblyName(typeof(int).Assembly.FullName) { CodeBase = "System.Windows.Forms.Design.Tests.dll" @@ -1249,6 +1250,7 @@ public static IEnumerable GetType_TestData() { CodeBase = "ThrowIOException" }; +#pragma warning restore SYSLIB0044 // Type or member is obsolete yield return new object[] { null, ioFormatExceptionCodeBase, "System.Int32", false, typeof(int) }; } diff --git a/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs b/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs index 12b103e4f2e..25e60b0906f 100644 --- a/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs +++ b/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs @@ -81,7 +81,9 @@ public Assembly GetAssembly(AssemblyName name, bool throwOnError) [UnconditionalSuppressMessage("SingleFile", "IL3002", Justification = "Returns null if in a single file")] public string GetPathOfAssembly(AssemblyName name) { +#pragma warning disable SYSLIB0044 // Type or member is obsolete. Ref https://github.com/dotnet/winforms/issues/7308 return name.CodeBase; +#pragma warning restore SYSLIB0044 // Type or member is obsolete } public Type GetType(string name) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs index b8a87efde33..385309fa5d3 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ThreadExceptionDialog.cs @@ -184,6 +184,7 @@ public ThreadExceptionDialog(Exception t) detailsTextBuilder.Append(newline); detailsTextBuilder.Append(string.Format(CultureInfo.CurrentCulture, sectionseparator, SR.ExDlgMsgLoadedAssembliesSection)); +#pragma warning disable SYSLIB0044 // Type or member is obsolete. Ref https://github.com/dotnet/winforms/issues/7308. foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) { AssemblyName name = asm.GetName(); @@ -207,6 +208,7 @@ public ThreadExceptionDialog(Exception t) detailsTextBuilder.Append(string.Format(SR.ExDlgMsgLoadedAssembliesEntry, name.Name, name.Version, fileVer, name.EscapedCodeBase)); detailsTextBuilder.Append(separator); } +#pragma warning restore SYSLIB0044 // Type or member is obsolete detailsTextBuilder.Append(string.Format(CultureInfo.CurrentCulture, sectionseparator, SR.ExDlgMsgJITDebuggingSection)); if (Application.CustomThreadExceptionHandlerAttached)