From 7789745f86240482e825f39df908c3d4dcc9d688 Mon Sep 17 00:00:00 2001 From: dreddy-work Date: Tue, 2 Jul 2019 13:06:15 -0700 Subject: [PATCH 1/2] Removing "Framework" instances. Also, cleaning code on config switches. --- .../WinFormsApplication-CSharp/Form1.resx | 61 +-- .../Form1.resx | 61 +-- .../src/Misc/ConfigurationOptions.cs | 2 +- .../src/Misc/DpiHelper.cs | 384 +----------------- .../src/Resources/BorderSidesEditor.resx | 63 +-- .../src/Resources/SR.resx | 59 --- .../src/Resources/ShortcutKeysEditor.resx | 58 --- .../System/Drawing/Design/IToolboxService.cs | 8 +- .../src/Resources/SR.resx | 8 +- .../Windows/Forms/PrintPreviewDialog.resx | 63 +-- .../System/Windows/Forms/mdiwindowdialog.resx | 61 +-- .../src/Resources/xlf/SR.cs.xlf | 18 +- .../src/Resources/xlf/SR.de.xlf | 18 +- .../src/Resources/xlf/SR.es.xlf | 18 +- .../src/Resources/xlf/SR.fr.xlf | 18 +- .../src/Resources/xlf/SR.it.xlf | 18 +- .../src/Resources/xlf/SR.ja.xlf | 18 +- .../src/Resources/xlf/SR.ko.xlf | 18 +- .../src/Resources/xlf/SR.pl.xlf | 18 +- .../src/Resources/xlf/SR.pt-BR.xlf | 18 +- .../src/Resources/xlf/SR.ru.xlf | 18 +- .../src/Resources/xlf/SR.tr.xlf | 18 +- .../src/Resources/xlf/SR.zh-Hans.xlf | 18 +- .../src/Resources/xlf/SR.zh-Hant.xlf | 18 +- .../src/System/Resources/ResXDataNode.cs | 5 +- .../System/Resources/ResXResourceWriter.cs | 13 - .../src/System/Windows/Forms/Control.cs | 5 +- .../src/System/Windows/Forms/ControlPaint.cs | 6 +- .../Windows/Forms/DataGridViewComboBoxCell.cs | 2 - .../Windows/Forms/DataGridViewTextBoxCell.cs | 2 - .../src/System/Windows/Forms/LinkLabel.cs | 2 +- .../src/System/Windows/Forms/ListView.cs | 4 +- .../src/System/Windows/Forms/MaskedTextBox.cs | 4 +- .../src/System/Windows/Forms/NativeWindow.cs | 2 +- .../src/System/Windows/Forms/ProgressBar.cs | 2 - .../PropertyDescriptorGridEntry.cs | 4 +- .../PropertyGridInternal/PropertyGridView.cs | 2 - .../src/System/Windows/Forms/TextBox.cs | 8 +- .../Windows/Forms/ToolStripStatusLabel.cs | 4 - .../WinformsControlsTest/Buttons.resx | 61 +-- .../WinformsControlsTest/Calendar.resx | 61 +-- .../WinformsControlsTest/ComboBoxes.resx | 61 +-- .../DataGridViewHeaders.resx | 61 +-- .../DesignTimeAligned.resx | 61 +-- .../WinformsControlsTest/ListViewTest.resx | 61 +-- .../WinformsControlsTest/MDIParent.resx | 61 +-- .../WinformsControlsTest/MainForm.resx | 61 +-- .../WinformsControlsTest/MdiChild.resx | 61 +-- .../MenuStripAndCheckedListBox.resx | 61 +-- .../MultipleControls.resx | 61 +-- .../WinformsControlsTest/Panels.resx | 61 +-- .../WinformsControlsTest/PropertyGrid.resx | 61 +-- .../ScalingBeforeChanges.resx | 61 +-- .../WinformsControlsTest/Splitter.resx | 61 +-- .../WinformsControlsTest/TreeViewTest.resx | 61 +-- 55 files changed, 168 insertions(+), 1935 deletions(-) diff --git a/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-CSharp/Form1.resx b/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-CSharp/Form1.resx index 1af7de150c9..667ea1506c8 100644 --- a/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-CSharp/Form1.resx +++ b/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-CSharp/Form1.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-VisualBasic/Form1.resx b/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-VisualBasic/Form1.resx index 1af7de150c9..667ea1506c8 100644 --- a/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-VisualBasic/Form1.resx +++ b/pkg/Microsoft.Dotnet.WinForms.ProjectTemplates/content/WinFormsApplication-VisualBasic/Form1.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms.Design.Editors/src/Misc/ConfigurationOptions.cs b/src/System.Windows.Forms.Design.Editors/src/Misc/ConfigurationOptions.cs index e1d7f09c28f..07c634875e1 100644 --- a/src/System.Windows.Forms.Design.Editors/src/Misc/ConfigurationOptions.cs +++ b/src/System.Windows.Forms.Design.Editors/src/Misc/ConfigurationOptions.cs @@ -68,7 +68,7 @@ public static Version NetFrameworkVersion } catch (Exception e) { - Debug.WriteLine("Exception while reading Framework version : " + e.ToString()); + Debug.WriteLine("Exception while reading .NET version : " + e.ToString()); } } diff --git a/src/System.Windows.Forms.Design.Editors/src/Misc/DpiHelper.cs b/src/System.Windows.Forms.Design.Editors/src/Misc/DpiHelper.cs index 063ece29512..7545718ebe8 100644 --- a/src/System.Windows.Forms.Design.Editors/src/Misc/DpiHelper.cs +++ b/src/System.Windows.Forms.Design.Editors/src/Misc/DpiHelper.cs @@ -2,20 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Configuration; using System.Drawing; using System.Drawing.Drawing2D; using System.Runtime.InteropServices; - -#if DRAWING_DESIGN_NAMESPACE -using System.Windows.Forms.Internal; -using CAPS = System.Windows.Forms.NativeMethods; -#elif DRAWING_NAMESPACE -using CAPS = System.Drawing.SafeNativeMethods; -#else using System.Windows.Forms.Design; using CAPS = System.Windows.Forms.Design.NativeMethods; -#endif namespace System.Windows.Forms { @@ -32,27 +23,8 @@ internal static partial class DpiHelper /// private static double deviceDpi = LogicalDpi; private static double logicalToDeviceUnitsScalingFactor = 0.0; - private static bool enableHighDpi = false; - private static string dpiAwarenessValue = null; private static InterpolationMode interpolationMode = InterpolationMode.Invalid; - // Following quirks are not used in System.Drawing. Making sure they light up only in the required binaries. -#if (!DRAWING_NAMESPACE) - private static bool isDpiHelperQuirksInitialized = false; - private static bool enableToolStripHighDpiImprovements = false; - private static bool enableDpiChangedMessageHandling = false; - private static bool enableCheckedListBoxHighDpiImprovements = false; - private static bool enableThreadExceptionDialogHighDpiImprovements = false; - private static bool enableDataGridViewControlHighDpiImprovements = false; - private static bool enableSinglePassScalingOfDpiForms = false; - private static bool enableAnchorLayoutHighDpiImprovements = false; - private static bool enableMonthCalendarHighDpiImprovements = false; - - // 'enableDpiChangedHighDpiImprovements' flag default behaviour is different from the flags defined above. - // Explicit opt-in is required if application is not targetting the minimum required framework version. - private static bool enableDpiChangedHighDpiImprovements = false; - private static readonly Version dpiChangedMessageHighDpiImprovementsMinimumFrameworkVersion = new Version(4, 8); -#endif private static void Initialize() { if (isInitialized) @@ -60,321 +32,15 @@ private static void Initialize() return; } - if (IsDpiAwarenessValueSet()) - { - enableHighDpi = true; - } - else - { - try - { - // For legacy users who define this constant in app settings. But we read it only when we do not see a valid dpiawareness value in the winforms section - string value = ConfigurationManager.AppSettings.Get(ConfigurationStringConstants.EnableWindowsFormsHighDpiAutoResizingKeyName); - if (!string.IsNullOrEmpty(value) && string.Equals(value, "true", StringComparison.InvariantCultureIgnoreCase)) - { - enableHighDpi = true; - } - } - catch - { - } - } - - if (enableHighDpi) - { -#if DRAWING_DESIGN_NAMESPACE - try - { - if (!DpiHelper.SetWinformsApplicationDpiAwareness()) - { - System.Diagnostics.Debug.WriteLine("Failed to set Application DPI awareness"); - } - } - catch (Exception ex) - { - System.Diagnostics.Debug.WriteLine("Failed to set Application DPI awareness " + ex.ToString()); - } -#endif - - IntPtr hDC = UnsafeNativeMethods.GetDC(NativeMethods.NullHandleRef); - if (hDC != IntPtr.Zero) - { - deviceDpi = UnsafeNativeMethods.GetDeviceCaps(new HandleRef(null, hDC), CAPS.LOGPIXELSX); - - UnsafeNativeMethods.ReleaseDC(NativeMethods.NullHandleRef, new HandleRef(null, hDC)); - } - } - isInitialized = true; - } - - internal static bool IsDpiAwarenessValueSet() - { - bool dpiAwarenessValueSet = false; - try - { - if (string.IsNullOrEmpty(dpiAwarenessValue)) - { - dpiAwarenessValue = ConfigurationOptions.GetConfigSettingValue(ConfigurationStringConstants.DpiAwarenessKeyName); - } - } - catch - { - } - - string dpiAwareness = (dpiAwarenessValue ?? string.Empty).ToLowerInvariant(); - switch (dpiAwareness) - { - case "true": - case "system": - case "true/pm": - case "permonitor": - case "permonitorv2": - dpiAwarenessValueSet = true; - break; - case "false": - System.Diagnostics.Debug.WriteLine(" 'DpiAwarenessValue' is set to 'false', value = " + dpiAwareness.ToString()); - break; - default: - System.Diagnostics.Debug.WriteLine("Either 'DpiAwarenessValue' is not set or 'DpiAwarenessValue' set is invalid in app.config, value set = " + dpiAwareness.ToString()); - break; - } - return dpiAwarenessValueSet; - } - - // Following quirks and public properties are not used in System.Drawing. Making sure they light up only in the required binaries. -#if (!DRAWING_NAMESPACE) - internal static void InitializeDpiHelperForWinforms() - { - // initialize shared fields - Initialize(); - InitializeDpiHelperQuirks(); - } - - internal static void InitializeDpiHelperQuirks() - { - if (isDpiHelperQuirksInitialized) - { - return; - } - try - { - // Redstone 2 or greater, where all APIs required by this feature are available - if ((Environment.OSVersion.Version.CompareTo(ConfigurationOptions.RS2Version) >= 0) && - (IsExpectedConfigValue(ConfigurationStringConstants.DisableDpiChangedMessageHandlingKeyName, false)) && - (IsDpiAwarenessValueSet()) && - // The dynamic scaling features are implemented only in comclt32 v6, no point to - // activate it otherwise. - (Application.RenderWithVisualStyles)) - { - // user had not opted out from dynamic scaling level changes but the primary screen DPI might be 96 - enableDpiChangedMessageHandling = true; - } - - // IsScalingRequired returns true if the current resolution is not 96DPI on the primary monitor. - // However PerMonitor DPI aware applicaitons need dynamic scaling initialized properly even if the - // the current DPI is 96 because they handle DPI change. - if ((DpiHelper.IsScalingRequired || enableDpiChangedMessageHandling) && IsDpiAwarenessValueSet()) - { - if (IsExpectedConfigValue(ConfigurationStringConstants.CheckedListBoxDisableHighDpiImprovementsKeyName, false)) - { - enableCheckedListBoxHighDpiImprovements = true; - } - - if (IsExpectedConfigValue(ConfigurationStringConstants.ToolStripDisableHighDpiImprovementsKeyName, false)) - { - enableToolStripHighDpiImprovements = true; - } - - if (IsExpectedConfigValue(ConfigurationStringConstants.FormDisableSinglePassScalingOfDpiFormsKeyName, false)) - { - enableSinglePassScalingOfDpiForms = true; - } - - if (IsExpectedConfigValue(ConfigurationStringConstants.DataGridViewControlDisableHighDpiImprovements, false)) - { - enableDataGridViewControlHighDpiImprovements = true; - } - - if (IsExpectedConfigValue(ConfigurationStringConstants.AnchorLayoutDisableHighDpiImprovementsKeyName, false)) - { - enableAnchorLayoutHighDpiImprovements = true; - } - - if (IsExpectedConfigValue(ConfigurationStringConstants.MonthCalendarDisableHighDpiImprovementsKeyName, false)) - { - enableMonthCalendarHighDpiImprovements = true; - } - - if (ConfigurationOptions.GetConfigSettingValue(ConfigurationStringConstants.DisableDpiChangedHighDpiImprovementsKeyName) == null) - { - if (ConfigurationOptions.NetFrameworkVersion.CompareTo(dpiChangedMessageHighDpiImprovementsMinimumFrameworkVersion) >= 0) - { - enableDpiChangedHighDpiImprovements = true; - } - } - else - { - if (IsExpectedConfigValue(ConfigurationStringConstants.DisableDpiChangedHighDpiImprovementsKeyName, false)) - { - enableDpiChangedHighDpiImprovements = true; - } - } - - // no opt-out switch at the moment - enableThreadExceptionDialogHighDpiImprovements = true; - } - } - catch - { - } - - isDpiHelperQuirksInitialized = true; - } - - /// - /// Checks if configuration setting is set to expected value - /// - /// Configuration setting name - /// Expected value - /// true/false - internal static bool IsExpectedConfigValue(string configurationSettingName, bool expectedValue) - { - string value = ConfigurationOptions.GetConfigSettingValue(configurationSettingName); - if (!bool.TryParse(value, out bool valueAsBool)) - { - // neither 'true' nor 'false' - implies 'false' - valueAsBool = false; - } - - return valueAsBool == expectedValue; - } - - /// - /// Returns a boolean to specify if we should enable HighDPI improvements added in .NET 4.8 - /// - internal static bool EnableDpiChangedHighDpiImprovements - { - get - { - InitializeDpiHelperForWinforms(); - return enableDpiChangedHighDpiImprovements; - } - } - - /// - /// Returns a boolean to specify if we should enable ToolStrip HighDPI fixes. - /// - internal static bool EnableToolStripHighDpiImprovements - { - get - { - InitializeDpiHelperForWinforms(); - return enableToolStripHighDpiImprovements; - } - } - - /// - /// Returns a boolean to specify if we should enable processing of WM_DPICHANGED and related messages - /// - internal static bool EnableDpiChangedMessageHandling - { - get - { - InitializeDpiHelperForWinforms(); - if (enableDpiChangedMessageHandling) - { - // We can't cache this value because different top level windows can have different DPI awareness context - // for mixed mode applications. - DpiAwarenessContext dpiAwareness = CommonUnsafeNativeMethods.GetThreadDpiAwarenessContext(); - return CommonUnsafeNativeMethods.TryFindDpiAwarenessContextsEqual(dpiAwareness, DpiAwarenessContext.DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); - } - else - { - return false; - } - } - } - - /// - /// Returns a boolean to specify if we should enable all high Dpi improvements. - /// - internal static bool EnableCheckedListBoxHighDpiImprovements - { - get - { - InitializeDpiHelperForWinforms(); - return enableCheckedListBoxHighDpiImprovements; - } - } - - /// - /// Returns a boolean to specify if we should enable single-pass scaling of controls. - /// - internal static bool EnableSinglePassScalingOfDpiForms - { - get - { - InitializeDpiHelperForWinforms(); - return enableSinglePassScalingOfDpiForms; - } - } - - /// - /// Returns a boolean to specify if we should enable ThreadExceptionDialog HighDPI fixes. - /// - internal static bool EnableThreadExceptionDialogHighDpiImprovements - { - get - { - InitializeDpiHelperForWinforms(); - return enableThreadExceptionDialogHighDpiImprovements; - } - } - - /// - /// Returns a boolean to specify if we should enable DataGridViewControl High Dpi improvements - /// - internal static bool EnableDataGridViewControlHighDpiImprovements - { - get - { - InitializeDpiHelperForWinforms(); - return enableDataGridViewControlHighDpiImprovements; - } - } - - /// - /// Returns a boolean to specify if we should enable Control Anchor HighDPI fixes - /// - internal static bool EnableAnchorLayoutHighDpiImprovements - { - get + IntPtr hDC = UnsafeNativeMethods.GetDC(NativeMethods.NullHandleRef); + if (hDC != IntPtr.Zero) { - InitializeDpiHelperForWinforms(); - return enableAnchorLayoutHighDpiImprovements; - } - } + deviceDpi = UnsafeNativeMethods.GetDeviceCaps(new HandleRef(null, hDC), CAPS.LOGPIXELSX); - /// - /// Returns a boolean to specify if we should enable MonthCalendar HighDPI fixes - /// - internal static bool EnableMonthCalendarHighDpiImprovements - { - get - { - InitializeDpiHelperForWinforms(); - return enableMonthCalendarHighDpiImprovements; + UnsafeNativeMethods.ReleaseDC(NativeMethods.NullHandleRef, new HandleRef(null, hDC)); } - } -#endif - internal static int DeviceDpi - { - get - { - Initialize(); - return (int)deviceDpi; - } + isInitialized = true; } private static double LogicalToDeviceUnitsScalingFactor @@ -515,44 +181,6 @@ public static Size LogicalToDeviceUnits(Size logicalSize, int deviceDpi = 0) LogicalToDeviceUnits(logicalSize.Height, deviceDpi)); } - /// - /// Create and return a new bitmap scaled to the specified size. - /// - /// The image to scale from logical units to device units - /// The size to scale image to - public static Bitmap CreateResizedBitmap(Bitmap logicalImage, Size targetImageSize) - { - if (logicalImage == null) - { - return null; - } - - return ScaleBitmapToSize(logicalImage, targetImageSize); - } - - /// - /// Create a new bitmap scaled for the device units. - /// When displayed on the device, the scaled image will have same size as the original image would have when displayed at 96dpi. - /// - /// The image to scale from logical units to device units - public static void ScaleBitmapLogicalToDevice(ref Bitmap logicalBitmap, int deviceDpi = 0) - { - if (logicalBitmap == null) - { - return; - } - Bitmap deviceBitmap = CreateScaledBitmap(logicalBitmap, deviceDpi); - if (deviceBitmap != null) - { - logicalBitmap.Dispose(); - logicalBitmap = deviceBitmap; - } - } - - // This method is used only in System.Design, thus excluding the rest. - // This is particularly important for System.Drawing, which should not depend - // on System.Windows.Forms assembly, where "Button" type is defined. -#if (!DRAWING_NAMESPACE && !DRAWING_DESIGN_NAMESPACE) /// /// Create a new button bitmap scaled for the device units. /// Note: original image might be disposed. @@ -572,8 +200,6 @@ public static void ScaleButtonImageLogicalToDevice(Button button) button.Image.Dispose(); button.Image = deviceBitmap; } -#endif - } internal enum DpiAwarenessContext diff --git a/src/System.Windows.Forms.Design.Editors/src/Resources/BorderSidesEditor.resx b/src/System.Windows.Forms.Design.Editors/src/Resources/BorderSidesEditor.resx index b86f4ea7386..ea2b1e1adb4 100644 --- a/src/System.Windows.Forms.Design.Editors/src/Resources/BorderSidesEditor.resx +++ b/src/System.Windows.Forms.Design.Editors/src/Resources/BorderSidesEditor.resx @@ -1,64 +1,5 @@ - + - @@ -342,4 +283,4 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms.Design.Editors/src/Resources/SR.resx b/src/System.Windows.Forms.Design.Editors/src/Resources/SR.resx index 00bb5184466..41b755dc337 100644 --- a/src/System.Windows.Forms.Design.Editors/src/Resources/SR.resx +++ b/src/System.Windows.Forms.Design.Editors/src/Resources/SR.resx @@ -1,64 +1,5 @@  - diff --git a/src/System.Windows.Forms.Design.Editors/src/Resources/ShortcutKeysEditor.resx b/src/System.Windows.Forms.Design.Editors/src/Resources/ShortcutKeysEditor.resx index ee44e38379f..1af3c7a90f5 100644 --- a/src/System.Windows.Forms.Design.Editors/src/Resources/ShortcutKeysEditor.resx +++ b/src/System.Windows.Forms.Design.Editors/src/Resources/ShortcutKeysEditor.resx @@ -1,63 +1,5 @@  - diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/IToolboxService.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/IToolboxService.cs index 1b9433c8c30..c390c1c9e4c 100644 --- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/IToolboxService.cs +++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/IToolboxService.cs @@ -77,22 +77,22 @@ public interface IToolboxService ToolboxItem GetSelectedToolboxItem(IDesignerHost host); /// - /// Gets all .NET Framework tools on the toolbox. + /// Gets all .NET tools on the toolbox. /// ToolboxItemCollection GetToolboxItems(); /// - /// Gets all .NET Framework tools on the toolbox. + /// Gets all .NET tools on the toolbox. /// ToolboxItemCollection GetToolboxItems(IDesignerHost host); /// - /// Gets all .NET Framework tools on the toolbox fopr specific category. + /// Gets all .NET tools on the toolbox fopr specific category. /// ToolboxItemCollection GetToolboxItems(string category); /// - /// Gets all .NET Framework tools on the toolbox for specific category. + /// Gets all .NET tools on the toolbox for specific category. /// ToolboxItemCollection GetToolboxItems(string category, IDesignerHost host); diff --git a/src/System.Windows.Forms/src/Resources/SR.resx b/src/System.Windows.Forms/src/Resources/SR.resx index 4a503bc59ee..6a6d06fffbe 100644 --- a/src/System.Windows.Forms/src/Resources/SR.resx +++ b/src/System.Windows.Forms/src/Resources/SR.resx @@ -203,7 +203,7 @@ Unknown image type. - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. Complex DataBinding accepts as a data source either an IList or an IListSource. @@ -3083,7 +3083,7 @@ To replace this default dialog please handle the DataError event. Cancel - Microsoft .NET Framework + Microsoft .NET {0} @@ -3158,14 +3158,14 @@ just-in-time (JIT) debugging instead of this dialog box. &Quit - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx index aece132eff9..25db5819048 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx @@ -1,64 +1,5 @@ - + - @@ -480,4 +421,4 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/mdiwindowdialog.resx b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/mdiwindowdialog.resx index e09904ff146..1da697dc104 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/mdiwindowdialog.resx +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/mdiwindowdialog.resx @@ -1,64 +1,5 @@  - @@ -269,4 +210,4 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf index 29109584f76..1a805698493 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - Ovládací prvek ActiveX je ovládací prvek bez oken. Tento ovládací prvek není v této verzi platformy .NET Framework podporován. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + Ovládací prvek ActiveX je ovládací prvek bez oken. Tento ovládací prvek není v této verzi platformy .NET podporován. @@ -5065,8 +5065,8 @@ Chcete-li nahradit toto výchozí dialogové okno, nastavte popisovač události - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ nikoli v tomto dialogovém okně. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - Aplikace se pokusila provést operaci, která není povolena zásadami zabezpečení. Chcete-li této aplikaci udělit požadované oprávnění, obraťte se na správce systému nebo použijte konfigurační nástroj rozhraní Microsoft .NET Framework. + Aplikace se pokusila provést operaci, která není povolena zásadami zabezpečení. Chcete-li této aplikaci udělit požadované oprávnění, obraťte se na správce systému nebo použijte konfigurační nástroj rozhraní Microsoft .NET. Pokud kliknete na tlačítko Pokračovat, aplikace bude tuto chybu ignorovat a pokusí se pokračovat. @@ -5204,12 +5204,12 @@ Pokud kliknete na tlačítko Pokračovat, aplikace bude tuto chybu ignorovat a p - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - Aplikace se pokusila provést operaci, která není povolena zásadami zabezpečení. Chcete-li této aplikaci udělit požadované oprávnění, obraťte se na správce systému nebo použijte konfigurační nástroj rozhraní Microsoft .NET Framework. + Aplikace se pokusila provést operaci, která není povolena zásadami zabezpečení. Chcete-li této aplikaci udělit požadované oprávnění, obraťte se na správce systému nebo použijte konfigurační nástroj rozhraní Microsoft .NET. Pokud kliknete na tlačítko Pokračovat, aplikace bude tuto chybu ignorovat a pokusí se pokračovat. Pokud kliknete na tlačítko Konec, bude aplikace okamžitě ukončena. @@ -11698,4 +11698,4 @@ Trasování zásobníku, kde došlo k neplatné operaci: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf index f99bf72cff0..5cca3058854 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - Das ActiveX-Steuerelement ist ein fensterloses Steuerelement. Es wird in dieser Version von .NET Framework nicht unterstützt. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + Das ActiveX-Steuerelement ist ein fensterloses Steuerelement. Es wird in dieser Version von .NET nicht unterstützt. @@ -5065,8 +5065,8 @@ Behandeln Sie das DataError-Ereignis, um dieses Standarddialogfeld zu ersetzen.< - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ anstelle dieses Dialogfelds finden Sie am Ende dieser Meldung. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - Die Anwendung hat einen Vorgang versucht, der von der Sicherheitsrichtlinie nicht zugelassen ist. Wenden Sie sich an den Systemadministrator, um der Anwendung die erforderliche Berechtigung zu gewähren, oder verwenden Sie das Microsoft .NET Framework-Konfigurationstool. + Die Anwendung hat einen Vorgang versucht, der von der Sicherheitsrichtlinie nicht zugelassen ist. Wenden Sie sich an den Systemadministrator, um der Anwendung die erforderliche Berechtigung zu gewähren, oder verwenden Sie das Microsoft .NET-Konfigurationstool. Wenn Sie auf "Weiter" klicken, ignoriert die Anwendung den Fehler und setzt den Vorgang fort. @@ -5204,12 +5204,12 @@ Wenn Sie auf "Weiter" klicken, ignoriert die Anwendung den Fehler und setzt den - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - Die Anwendung hat einen Vorgang versucht, der von der Sicherheitsrichtlinie nicht zugelassen ist. Wenden Sie sich an den Systemadministrator, um der Anwendung die erforderliche Berechtigung zu gewähren, oder verwenden Sie das Microsoft .NET Framework-Konfigurationstool. + Die Anwendung hat einen Vorgang versucht, der von der Sicherheitsrichtlinie nicht zugelassen ist. Wenden Sie sich an den Systemadministrator, um der Anwendung die erforderliche Berechtigung zu gewähren, oder verwenden Sie das Microsoft .NET-Konfigurationstool. Wenn Sie auf "Weiter" klicken, ignoriert die Anwendung den Fehler und setzt den Vorgang fort. Wenn Sie auf "Beenden" klicken, wird die Anwendung sofort beendet. @@ -11698,4 +11698,4 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf index e81f1bb06b9..660932f2fb9 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - El control ActiveX es un control sin ventanas. Esta versión de .Net Framework no admite dichos controles. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + El control ActiveX es un control sin ventanas. Esta versión de .Net no admite dichos controles. @@ -5065,8 +5065,8 @@ Para reemplazar este cuadro de diálogo predeterminado controle el evento DataEr - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ Just-In-Time (JIT) en lugar de a este cuadro de diálogo. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - La aplicación intentó realizar una operación no permitida por la directiva de seguridad. Para otorgar a esta aplicación el permiso requerido póngase en contacto con el administrador del sistema o utilice la herramienta Configuración de Microsoft .NET Framework. + La aplicación intentó realizar una operación no permitida por la directiva de seguridad. Para otorgar a esta aplicación el permiso requerido póngase en contacto con el administrador del sistema o utilice la herramienta Configuración de Microsoft .NET. Si hace clic en Continuar, la aplicación pasará por alto este error e intentará seguir. @@ -5204,12 +5204,12 @@ Si hace clic en Continuar, la aplicación pasará por alto este error e intentar - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - La aplicación intentó realizar una operación no permitida por la directiva de seguridad. Para otorgar a esta aplicación el permiso requerido póngase en contacto con el administrador del sistema o utilice la herramienta Configuración de Microsoft .NET Framework. + La aplicación intentó realizar una operación no permitida por la directiva de seguridad. Para otorgar a esta aplicación el permiso requerido póngase en contacto con el administrador del sistema o utilice la herramienta Configuración de Microsoft .NET. Si hace clic en Continuar, la aplicación pasará por alto este error e intentará seguir. Si hace clic en Salir, la aplicación se cerrará inmediatamente. @@ -11698,4 +11698,4 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf index 53232ebf414..668f301c2bb 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - Le contrôle ActiveX est un contrôle sans fenêtre. Ce contrôle n'est pas pris en charge dans cette version du .NET Framework. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + Le contrôle ActiveX est un contrôle sans fenêtre. Ce contrôle n'est pas pris en charge dans cette version du .NET. @@ -5065,8 +5065,8 @@ Pour remplacer cette boîte de dialogue par défaut, traitez l'événement DataE - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ juste-à-temps (JIT) à la place de cette boîte de dialogue. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - L'application a essayé d'effectuer une opération qui est interdite par la stratégie de sécurité. Pour accorder à cette application les autorisations requises, contactez votre administrateur système ou utilisez l'outil Microsoft .NET Framework Configuration. + L'application a essayé d'effectuer une opération qui est interdite par la stratégie de sécurité. Pour accorder à cette application les autorisations requises, contactez votre administrateur système ou utilisez l'outil Microsoft .NET Configuration. Si vous cliquez sur Continuer, l'application va ignorer cette erreur et essayer de continuer. @@ -5204,12 +5204,12 @@ Si vous cliquez sur Continuer, l'application va ignorer cette erreur et essayer - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - L'application a essayé d'effectuer une opération qui est interdite par la stratégie de sécurité. Pour accorder à cette application les autorisations requises, contactez votre administrateur système ou utilisez l'outil Microsoft .NET Framework Configuration. + L'application a essayé d'effectuer une opération qui est interdite par la stratégie de sécurité. Pour accorder à cette application les autorisations requises, contactez votre administrateur système ou utilisez l'outil Microsoft .NET Configuration. Si vous cliquez sur Continuer, l'application va ignorer cette erreur et essayer de continuer. Si vous cliquez sur Quitter, l'application va s'arrêter immédiatement. @@ -11698,4 +11698,4 @@ Cette opération non conforme s'est produite sur la trace de la pile : - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf index c91b65d428f..b47175ba68d 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - Il controllo ActiveX è privo di finestra. Questo tipo di controllo non è supportato nella versione di .NET Framework in uso. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + Il controllo ActiveX è privo di finestra. Questo tipo di controllo non è supportato nella versione di .NET in uso. @@ -5065,8 +5065,8 @@ Per sostituire questa finestra di dialogo predefinita, gestire l'evento DataErro - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ sono riportate in fondo al messaggio. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - L'applicazione ha tentato di eseguire un'operazione non consentita dai criteri di sicurezza. Per attribuire all'applicazione l'autorizzazione necessaria, rivolgersi all'amministratore del sistema oppure utilizzare lo strumento .NET Framework Configuration. + L'applicazione ha tentato di eseguire un'operazione non consentita dai criteri di sicurezza. Per attribuire all'applicazione l'autorizzazione necessaria, rivolgersi all'amministratore del sistema oppure utilizzare lo strumento .NET Configuration. Se si sceglie Continua, l'errore verrà ignorato e l'applicazione tenterà di continuare. Se si sceglie Chiudi, l'applicazione verrà chiusa immediatamente. @@ -5204,12 +5204,12 @@ Se si sceglie Continua, l'errore verrà ignorato e l'applicazione tenterà di co - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - L'applicazione ha tentato di eseguire un'operazione non consentita dai criteri di sicurezza. Per attribuire all'applicazione l'autorizzazione necessaria, rivolgersi all'amministratore del sistema oppure utilizzare lo strumento .NET Framework Configuration. + L'applicazione ha tentato di eseguire un'operazione non consentita dai criteri di sicurezza. Per attribuire all'applicazione l'autorizzazione necessaria, rivolgersi all'amministratore del sistema oppure utilizzare lo strumento .NET Configuration. Se si sceglie Continua, l'errore verrà ignorato e l'applicazione tenterà di continuare. Se si sceglie Chiudi, l'applicazione verrà chiusa immediatamente. @@ -11698,4 +11698,4 @@ Traccia dello stack da cui si è verificata l'operazione non valida: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf index b9c3e508f06..db7b3d75302 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - ActiveX コントロールはウィンドウレス コントロールです。このコントロールは、このバージョンの .NET Framework ではサポートされていません。 + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + ActiveX コントロールはウィンドウレス コントロールです。このコントロールは、このバージョンの .NET ではサポートされていません。 @@ -5065,8 +5065,8 @@ To replace this default dialog please handle the DataError event. - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ just-in-time (JIT) debugging instead of this dialog box. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - セキュリティ ポリシーで許可されていない操作をアプリケーションが実行しようとしました。必要なアクセス許可をこのアプリケーションに与えるには、システム管理者に連絡するか、Microsoft .NET Framework 構成ツールを使用してください。 + セキュリティ ポリシーで許可されていない操作をアプリケーションが実行しようとしました。必要なアクセス許可をこのアプリケーションに与えるには、システム管理者に連絡するか、Microsoft .NET 構成ツールを使用してください。 [続行] をクリックすると、アプリケーションはこのエラーを無視し、続行しようとします。 @@ -5204,12 +5204,12 @@ If you click Continue, the application will ignore this error and attempt to con - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - セキュリティ ポリシーで許可されていない操作をアプリケーションが実行しようとしました。必要なアクセス許可をこのアプリケーションに与えるには、システム管理者に連絡するか、Microsoft .NET Framework 構成ツールを使用してください。 + セキュリティ ポリシーで許可されていない操作をアプリケーションが実行しようとしました。必要なアクセス許可をこのアプリケーションに与えるには、システム管理者に連絡するか、Microsoft .NET 構成ツールを使用してください。 [続行] をクリックすると、アプリケーションはこのエラーを無視し、続行しようとします。[終了] をクリックすると、アプリケーションは直ちに終了します。 @@ -11698,4 +11698,4 @@ Stack trace where the illegal operation occurred was: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf index 179da59423b..44fc6f4ebbc 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - ActiveX 컨트롤은 창 없는 컨트롤입니다. 이번 버전의 .NET Framework에서는 이러한 컨트롤을 지원하지 않습니다. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + ActiveX 컨트롤은 창 없는 컨트롤입니다. 이번 버전의 .NET 에서는 이러한 컨트롤을 지원하지 않습니다. @@ -5065,8 +5065,8 @@ To replace this default dialog please handle the DataError event. - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ just-in-time (JIT) debugging instead of this dialog box. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - 보안 정책에서 허용하지 않는 작업을 수행하려고 했습니다. 이 응용 프로그램에 필요한 권한을 부여하려면 시스템 관리자에게 문의하거나 Microsoft .NET Framework 구성 도구를 사용하십시오. + 보안 정책에서 허용하지 않는 작업을 수행하려고 했습니다. 이 응용 프로그램에 필요한 권한을 부여하려면 시스템 관리자에게 문의하거나 Microsoft .NET 구성 도구를 사용하십시오. [계속]을 클릭하면 응용 프로그램에서 이 오류를 무시하고 계속합니다. @@ -5204,12 +5204,12 @@ If you click Continue, the application will ignore this error and attempt to con - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - 보안 정책에서 허용하지 않는 작업을 수행하려고 했습니다. 이 응용 프로그램에 필요한 권한을 부여하려면 시스템 관리자에게 문의하거나 Microsoft .NET Framework 구성 도구를 사용하십시오. + 보안 정책에서 허용하지 않는 작업을 수행하려고 했습니다. 이 응용 프로그램에 필요한 권한을 부여하려면 시스템 관리자에게 문의하거나 Microsoft .NET 구성 도구를 사용하십시오. [계속]을 클릭하면 응용 프로그램에서 이 오류를 무시하고 계속합니다. [끝내기]를 클릭하면 응용 프로그램이 즉시 닫힙니다. @@ -11698,4 +11698,4 @@ Stack trace where the illegal operation occurred was: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf index 3251fa50eee..e4d17493710 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - Formant ActiveX jest formantem bez okien. Formant nie jest obsługiwany w tej wersji platformy .NET Framework. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + Formant ActiveX jest formantem bez okien. Formant nie jest obsługiwany w tej wersji platformy .NET. @@ -5065,8 +5065,8 @@ Aby zamienić to domyślne okno dialogowe, obsłuż zdarzenie DataError. - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ zamiast tego okna dialogowego znajdują się na końcu tego komunikatu. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - Aplikacja próbowała wykonać operację niedozwoloną przez zasady zabezpieczeń. Aby udzielić tej aplikacji wymaganych uprawnień, skontaktuj się z administratorem systemu lub użyj narzędzia Microsoft .NET Framework. + Aplikacja próbowała wykonać operację niedozwoloną przez zasady zabezpieczeń. Aby udzielić tej aplikacji wymaganych uprawnień, skontaktuj się z administratorem systemu lub użyj narzędzia Microsoft .NET. Jeśli klikniesz przycisk Kontynuuj, aplikacja zignoruje ten błąd i będzie próbowała kontynuować pracę. @@ -5204,12 +5204,12 @@ Jeśli klikniesz przycisk Kontynuuj, aplikacja zignoruje ten błąd i będzie pr - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - Aplikacja próbowała wykonać operację niedozwoloną przez zasady zabezpieczeń. Aby udzielić tej aplikacji wymaganych uprawnień, skontaktuj się z administratorem systemu lub użyj narzędzia Microsoft .NET Framework Configuration. + Aplikacja próbowała wykonać operację niedozwoloną przez zasady zabezpieczeń. Aby udzielić tej aplikacji wymaganych uprawnień, skontaktuj się z administratorem systemu lub użyj narzędzia Microsoft .NET Configuration. Jeśli klikniesz przycisk Kontynuuj, aplikacja zignoruje ten błąd i będzie próbowała kontynuować pracę. Jeśli klikniesz przycisk Zamknij, aplikacja zostanie natychmiast zamknięta. @@ -11698,4 +11698,4 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf index ab241a736e0..b7e698f75af 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - O controle ActiveX é um controle sem janelas. Não há suporte para esses controles nesta versão do .NET Framework. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + O controle ActiveX é um controle sem janelas. Não há suporte para esses controles nesta versão do .NET. @@ -5065,8 +5065,8 @@ Para substituir a caixa de diálogo padrão, manipule o evento DataError. - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ depuração just-in-time (JIT) em vez desta caixa de diálogo. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - O aplicativo tentou executar uma operação não permitida pela política de segurança. Para conceder a permissão necessária ao aplicativo, contate o administrador de sistema ou use a ferramenta Microsoft .NET Framework Configuration. + O aplicativo tentou executar uma operação não permitida pela política de segurança. Para conceder a permissão necessária ao aplicativo, contate o administrador de sistema ou use a ferramenta Microsoft .NET Configuration. Se você clicar em Continuar, o aplicativo ignorará o erro e tentará continuar. @@ -5204,12 +5204,12 @@ Se você clicar em Continuar, o aplicativo ignorará o erro e tentará continuar - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - O aplicativo tentou executar uma operação não permitida pela política de segurança. Para conceder a permissão necessária ao aplicativo, contate o administrador de sistema ou use a ferramenta Microsoft .NET Framework Configuration. + O aplicativo tentou executar uma operação não permitida pela política de segurança. Para conceder a permissão necessária ao aplicativo, contate o administrador de sistema ou use a ferramenta Microsoft .NET Configuration. Se você clicar em Continuar, o aplicativo ignorará o erro e tentará continuar. Se você clicar em Sair, o aplicativo será fechado imediatamente @@ -11698,4 +11698,4 @@ Rastreamento de pilha em que a operação ilegal ocorreu: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf index c006a9eb31e..bf01b465bab 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - Данный элемент управления ActiveX является неоконным и не поддерживается в этой версии .NET Framework. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + Данный элемент управления ActiveX является неоконным и не поддерживается в этой версии .NET. @@ -5065,8 +5065,8 @@ To replace this default dialog please handle the DataError event. - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5192,12 +5192,12 @@ just-in-time (JIT) debugging instead of this dialog box. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - Приложение попыталось выполнить операцию, недопустимую в соответствии с использующейся политикой безопасности. Для выдачи соответствующего разрешения данному приложению обратитесь к системному администратору или используйте конфигуратор Microsoft .NET Framework. + Приложение попыталось выполнить операцию, недопустимую в соответствии с использующейся политикой безопасности. Для выдачи соответствующего разрешения данному приложению обратитесь к системному администратору или используйте конфигуратор Microsoft .NET. При нажатии кнопки "Продолжить" приложение проигнорирует ошибку и попытается продолжить работу. @@ -5205,12 +5205,12 @@ If you click Continue, the application will ignore this error and attempt to con - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - Приложение попыталось выполнить операцию, недопустимую в соответствии с использующейся политикой безопасности. Для получения соответствующего разрешения для данного приложения обратитесь к системному администратору или используйте конфигуратор Microsoft .NET Framework. + Приложение попыталось выполнить операцию, недопустимую в соответствии с использующейся политикой безопасности. Для получения соответствующего разрешения для данного приложения обратитесь к системному администратору или используйте конфигуратор Microsoft .NET. При нажатии кнопки "Продолжить" приложение проигнорирует ошибку и попытается продолжить работу. При нажатии кнопки "Выход" приложение немедленно завершит работу. @@ -11699,4 +11699,4 @@ Stack trace where the illegal operation occurred was: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf index 641f6a097bf..95a52ca764e 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - ActiveX denetimi penceresiz bir denetim. Denetim .NET Framework'un bu sürümünde desteklenmiyor. + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + ActiveX denetimi penceresiz bir denetim. Denetim .NET'un bu sürümünde desteklenmiyor. @@ -5065,8 +5065,8 @@ Bu varsayılan iletişim kutusunu değiştirmek için, lütfen DataError olayın - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ hakkında detaylı bilgi için bu iletinin sonuna bakın. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - Uygulama, güvenlik ilkesi tarafından izin verilmeyen bir işlem gerçekleştirmeye çalıştı. Bu uygulamaya gereken izni vermek için, sistem yöneticinize başvurun veya Microsoft .NET Framework Yapılandırma aracını kullanın. + Uygulama, güvenlik ilkesi tarafından izin verilmeyen bir işlem gerçekleştirmeye çalıştı. Bu uygulamaya gereken izni vermek için, sistem yöneticinize başvurun veya Microsoft .NET Yapılandırma aracını kullanın. Devam'ı tıklatırsanız, uygulama bu hatayı yoksayar ve devam etmeye çalışır. @@ -5204,12 +5204,12 @@ Devam'ı tıklatırsanız, uygulama bu hatayı yoksayar ve devam etmeye çalış - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - Uygulama, güvenlik ilkesi tarafından izin verilmeyen bir işlem gerçekleştirmeye çalıştı. Bu uygulamaya gereken izni vermek için, sistem yöneticinize başvurun veya Microsoft .NET Framework Yapılandırma aracını kullanın. + Uygulama, güvenlik ilkesi tarafından izin verilmeyen bir işlem gerçekleştirmeye çalıştı. Bu uygulamaya gereken izni vermek için, sistem yöneticinize başvurun veya Microsoft .NET Yapılandırma aracını kullanın. Devam'ı tıklatırsanız, uygulama bu hatayı yoksayar ve devam etmeye çalışır. Çıkış'ı tıklatırsanız, uygulama hemen kapatılır. @@ -11698,4 +11698,4 @@ Geçersiz işlemin gerçekleştiği yığın izi: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf index 7d9ca0da2ad..277efefbbe5 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - ActiveX 控件是无窗口控件。此版本的 .NET Framework 不支持该控件。 + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + ActiveX 控件是无窗口控件。此版本的 .NET 不支持该控件。 @@ -5065,8 +5065,8 @@ To replace this default dialog please handle the DataError event. - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ just-in-time (JIT) debugging instead of this dialog box. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - 应用程序尝试执行安全策略不允许的操作。若要授予该应用程序所需的权限，请与系统管理员联系，或使用 Microsoft .NET Framework 配置工具。 + 应用程序尝试执行安全策略不允许的操作。若要授予该应用程序所需的权限，请与系统管理员联系，或使用 Microsoft .NET 配置工具。 如果单击“继续”，应用程序将忽略此错误并尝试继续运行。 @@ -5204,12 +5204,12 @@ If you click Continue, the application will ignore this error and attempt to con - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - 应用程序尝试执行安全策略不允许的操作。若要授予该应用程序所需的权限，请与系统管理员联系，或使用 Microsoft .NET Framework 配置工具。 + 应用程序尝试执行安全策略不允许的操作。若要授予该应用程序所需的权限，请与系统管理员联系，或使用 Microsoft .NET 配置工具。 如果单击“继续”，应用程序将忽略此错误并尝试继续运行。如果单击“退出”，应用程序将立即关闭。 @@ -11698,4 +11698,4 @@ Stack trace where the illegal operation occurred was: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf index 6f9f34905cd..b54e42e8978 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf @@ -128,8 +128,8 @@ - ActiveX control is a windowless control. The control is not supported in this version of the .NET Framework. - ActiveX 控制項是無視窗的控制項。這個版本的 .Net Framework 不支援這個控制項。 + ActiveX control is a windowless control. The control is not supported in this version of the .NET. + ActiveX 控制項是無視窗的控制項。這個版本的 .Net 不支援這個控制項。 @@ -5065,8 +5065,8 @@ To replace this default dialog please handle the DataError event. - Microsoft .NET Framework - Microsoft .NET Framework + Microsoft .NET + Microsoft .NET @@ -5191,12 +5191,12 @@ just-in-time (JIT) debugging instead of this dialog box. - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. {1}. - 應用程式嘗試執行安全性原則不允許的作業。若要將必要權限授與此應用程式，請洽詢您的系統管理員，或使用 Microsoft .NET Framework 組態工具進行相關的設定。 + 應用程式嘗試執行安全性原則不允許的作業。若要將必要權限授與此應用程式，請洽詢您的系統管理員，或使用 Microsoft .NET 組態工具進行相關的設定。 如果您按一下 [繼續]，應用程式將會略過此錯誤，然後試著繼續執行。 @@ -5204,12 +5204,12 @@ If you click Continue, the application will ignore this error and attempt to con - Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Framework Configuration tool. + Application attempted to perform an operation not allowed by the security policy. To grant this application the required permission, contact your system administrator, or use the Microsoft .NET Configuration tool. If you click Continue, the application will ignore this error and attempt to continue. If you click Quit, the application will close immediately. {1}. - 應用程式嘗試執行安全性原則不允許的作業。若要將必要權限授與此應用程式，請洽詢您的系統管理員，或使用 Microsoft .NET Framework 組態工具進行相關的設定。 + 應用程式嘗試執行安全性原則不允許的作業。若要將必要權限授與此應用程式，請洽詢您的系統管理員，或使用 Microsoft .NET 組態工具進行相關的設定。 如果您按一下 [繼續]，應用程式將會略過此錯誤，然後試著繼續執行。如果您按下 [結束]，應用程式將立即關閉。 @@ -11698,4 +11698,4 @@ Stack trace where the illegal operation occurred was: - \ No newline at end of file + diff --git a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs index 9f2412439d3..b4383b97f34 100644 --- a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs +++ b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs @@ -417,9 +417,7 @@ private object GenerateObjectFromDataNodeInfo(DataNodeInfo dataNodeInfo, ITypeRe if (!string.IsNullOrEmpty(mimeTypeName)) { - if (string.Equals(mimeTypeName, ResXResourceWriter.BinSerializedObjectMimeType) - || string.Equals(mimeTypeName, ResXResourceWriter.Beta2CompatSerializedObjectMimeType) - || string.Equals(mimeTypeName, ResXResourceWriter.CompatBinSerializedObjectMimeType)) + if (string.Equals(mimeTypeName, ResXResourceWriter.BinSerializedObjectMimeType)) { string text = dataNodeInfo.ValueData; byte[] serializedData = FromBase64WrappedString(text); @@ -1103,6 +1101,7 @@ public Type GetType(string name, bool throwOnError, bool ignoreCase) throw new ArgumentException(string.Format(SR.InvalidResXNoType, name)); } + //TODO -dreddy if (result != null) { // Only cache types from .Net framework because they don't need to update. diff --git a/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs b/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs index 8861d4e21c7..58bd66a4270 100644 --- a/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs +++ b/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs @@ -45,19 +45,6 @@ public class ResXResourceWriter : IResourceWriter private static readonly TraceSwitch ResValueProviderSwitch = new TraceSwitch("ResX", "Debug the resource value provider"); - internal static readonly string Beta2CompatSerializedObjectMimeType = "text/microsoft-urt/psuedoml-serialized/base64"; - - // These two "compat" mimetypes are here. In Beta 2 and RTM we used the term "URT" - // internally to refer to parts of the .NET Framework. Since these references - // will be in Beta 2 ResX files, and RTM ResX files for customers that had - // early access to releases, we don't want to break that. We will read - // and parse these types correctly in version 1.0, but will always - // write out the new version. So, opening and editing a ResX file in VS will - // update it to the new types. - // - internal static readonly string CompatBinSerializedObjectMimeType = "text/microsoft-urt/binary-serialized/base64"; - internal static readonly string CompatSoapSerializedObjectMimeType = "text/microsoft-urt/soap-serialized/base64"; - public static readonly string BinSerializedObjectMimeType = "application/x-microsoft.net.object.binary.base64"; public static readonly string SoapSerializedObjectMimeType = "application/x-microsoft.net.object.soap.base64"; public static readonly string DefaultSerializedObjectMimeType = BinSerializedObjectMimeType; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs index 7dec5a185e0..c5584e5817d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs @@ -5900,8 +5900,8 @@ internal System.Drawing.Graphics CreateGraphicsInternal() } /// - /// Creates a handle for this control. This method is called by the .NET Framework, this should - /// not be called. Inheriting classes should always call base.createHandle when + /// Creates a handle for this control. This method is called by the .NET. + /// Inheriting classes should always call base.createHandle when /// overriding this method. /// [ @@ -20679,7 +20679,6 @@ public void NotifyClients(AccessibleEvents accEvent, int objectID, int childID) /// Raises the LiveRegionChanged UIA event. /// To make this method effective, the control must implement System.Windows.Forms.Automation.IAutomationLiveRegion interface /// and its LiveSetting property must return either AutomationLiveSetting.Polite or AutomationLiveSetting.Assertive value. - /// In addition, the applications must be recompiled to target .NET Framework 4.7.3 or opt in into this feature using compatibility switches. /// /// True if operation succeeds, False otherwise. public override bool RaiseLiveRegionChanged() diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ControlPaint.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ControlPaint.cs index 2f92f5ac73f..2dc7d24787b 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ControlPaint.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ControlPaint.cs @@ -180,7 +180,7 @@ private static IntPtr CreateBitmapInfo(Bitmap bitmap, IntPtr hdcS) /// Creates a 16-bit color bitmap. /// Sadly, this must be public for the designer to get at it. /// From MSDN: - /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code. + /// This member supports the .NET infrastructure and is not intended to be used directly from your code. /// public static IntPtr CreateHBitmap16Bit(Bitmap bitmap, Color background) { @@ -242,7 +242,7 @@ public static IntPtr CreateHBitmap16Bit(Bitmap bitmap, Color background) /// de-allocating the HBITMAP with Windows.DeleteObject(handle). /// If the image uses transparency, the background will be filled with the specified color. /// From MSDN: - /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code. + /// This member supports the .NET infrastructure and is not intended to be used directly from your code. /// public static IntPtr CreateHBitmapTransparencyMask(Bitmap bitmap) { @@ -300,7 +300,7 @@ public static IntPtr CreateHBitmapTransparencyMask(Bitmap bitmap) /// de-allocating the HBITMAP with Windows.DeleteObject(handle). /// If the image uses transparency, the background will be filled with the specified color. /// From MSDN: - /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code. + /// This member supports the .NET infrastructure and is not intended to be used directly from your code. /// public static IntPtr CreateHBitmapColorMask(Bitmap bitmap, IntPtr monochromeMask) { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.cs index 6f3b2769482..2cb37fdba1c 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.cs @@ -93,8 +93,6 @@ public DataGridViewComboBoxCell() /// /// Creates a new AccessibleObject for this DataGridViewComboBoxCell instance. /// The AccessibleObject instance returned by this method supports ControlType UIA property. - /// However the new object is only available in applications that are recompiled to target - /// .NET Framework 4.7.2 or opt-in into this feature using a compatibility switch. /// /// /// AccessibleObject for this DataGridViewComboBoxCell instance. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxCell.cs index fdc9342465c..1709072be07 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxCell.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxCell.cs @@ -46,8 +46,6 @@ public DataGridViewTextBoxCell() /// /// Creates a new AccessibleObject for this DataGridViewTextBoxCell instance. /// The AccessibleObject instance returned by this method supports ControlType UIA property. - /// However the new object is only available in applications that are recompiled to target - /// .NET Framework 4.7.2 or opt-in into this feature using a compatibility switch. /// /// /// AccessibleObject for this DataGridViewTextBoxCell instance. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs index 7df63491517..e8c54cb3832 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs @@ -618,7 +618,7 @@ protected override AccessibleObject CreateAccessibilityInstance() /// /// - /// Creates a handle for this control. This method is called by the .NET Framework, + /// Creates a handle for this control. This method is called by the .NET, /// this should not be called. Inheriting classes should always call /// base.createHandle when overriding this method. /// diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs index e7b95884283..5d53621ad0a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs @@ -9857,9 +9857,7 @@ public IEnumerator GetEnumerator() /// /// Creates the new instance of AccessibleObject for this ListView control. - /// Returning ListViewAccessibleObject is only available in applications that - /// are recompiled to target .NET Framework 4.7.3 or opt-in into this feature - /// using a compatibility switch. + /// Returning ListViewAccessibleObject. /// /// /// The AccessibleObject for this ListView instance. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MaskedTextBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MaskedTextBox.cs index 419c07593dd..bc4acdf6aac 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MaskedTextBox.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MaskedTextBox.cs @@ -1607,8 +1607,8 @@ public Type ValidatingType } /// - /// Creates a handle for this control. This method is called by the .NET Framework, this should - /// not be called. Inheriting classes should always call base.createHandle when overriding this method. + /// Creates a handle for this control. This method is called by the .NET. + /// Inheriting classes should always call base.createHandle when overriding this method. /// Overridden to be able to set the control text with the masked (passworded) value when recreating /// handle, since the underlying native edit control is not aware of it. /// diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs b/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs index 872b597e696..e252c75f1b2 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs @@ -298,7 +298,7 @@ private static int WndProcFlags intWndProcFlags |= UseDebuggableWndProc; } else { - // Reading Framework registry key in Netcore/5.0 doesn't make sense. This path seems to be used to override the + // Reading legacy Framework registry key in Netcore/5.0 doesn't make sense. This path seems to be used to override the // default behaviour after applications deployed ( otherwise, Developer/user can set this flag // via Application.SetUnhandledExceptionModeInternal(..). // Disabling this feature from .NET core 3.0 release. Would need to redesign if there are customer requests on this. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ProgressBar.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ProgressBar.cs index be03a5391be..e079d3d3e77 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ProgressBar.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ProgressBar.cs @@ -880,8 +880,6 @@ private void UserPreferenceChangedHandler(object o, UserPreferenceChangedEventAr /// /// Creates a new AccessibleObject for this ProgressBar instance. /// The AccessibleObject instance returned by this method supports ControlType UIA property. - /// However the new object is only available in applications that are recompiled to target - /// .NET Framework 4.8 or opt-in into this feature using a compatibility switch. /// /// /// AccessibleObject for this ProgressBar instance. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.cs index 9ba7ab839db..0cd2d6fd0fe 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.cs @@ -1169,9 +1169,7 @@ static private void ShowCodeIdle(object sender, EventArgs e) /// /// Creates a new AccessibleObject for this PropertyDescriptorGridEntry instance. - /// The AccessibleObject instance returned by this method supports IsEnabled UIA property. - /// However the new object is only available in applications that are recompiled to target - /// .NET Framework 4.7.2 or opt in into this feature using a compatibility switch. + /// The AccessibleObject instance returned by this method supports IsEnabled UIA property. /// /// /// AccessibleObject for this PropertyDescriptorGridEntry instance. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs index ccc81ffdaf6..bb2769fd8af 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs @@ -7685,8 +7685,6 @@ public GridViewEdit(PropertyGridView psheet) /// /// Creates a new AccessibleObject for this GridViewEdit instance. /// The AccessibleObject instance returned by this method overrides several UIA properties. - /// However the new object is only available in applications that are recompiled to target - /// .NET Framework 4.7.2 or opt in into this feature using a compatibility switch. /// /// /// AccessibleObject for this GridViewEdit instance. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TextBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TextBox.cs index 9f7873b0afe..b8a38907e01 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TextBox.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TextBox.cs @@ -725,13 +725,7 @@ protected virtual void OnTextAlignChanged(EventArgs e) /// /// Process a command key. /// Native "EDIT" control does not support "Select All" shorcut represented by Ctrl-A keys, when in multiline mode, - /// and historically Winforms TextBox did not support it either. - /// We are adding support for this shortcut for application targeting 4.6.1 and newer and for applications targeting 4.0 and newer - /// versions of the .NET Framework if they opt into this feature by adding the following config switch to the 'runtime' section of the app.config file: - /// - /// - /// - /// To opt out of this feature, when targeting 4.6.1 and newer, please set the above mentioned switch to true. + /// Winforms TextBox supports this in .NET. /// /// m - the current windows message /// keyData - bitmask containing one or more keys diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripStatusLabel.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripStatusLabel.cs index 07358fed2f0..cf816f69613 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripStatusLabel.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripStatusLabel.cs @@ -57,8 +57,6 @@ public ToolStripStatusLabel(string text, Image image, EventHandler onClick, stri /// /// Creates a new AccessibleObject for this ToolStripStatusLabel instance. /// The AccessibleObject instance returned by this method supports UIA Live Region feature. - /// However the new object is only available in applications that are recompiled to target - /// .NET Framework 4.7.3 or opted into this feature using compatibility switches. /// /// /// AccessibleObject for this ToolStripStatusLabel instance. @@ -277,8 +275,6 @@ public ToolStripStatusLabelAccessibleObject(ToolStripStatusLabel ownerItem) : ba /// /// Raises the LiveRegionChanged UIA event. - /// To make this method effective, the applications must be recompiled to target .NET Framework 4.7.3 - /// or opted into this feature using compatibility switches. /// /// True if operation succeeds, False otherwise. public override bool RaiseLiveRegionChanged() diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.resx index df8339b688f..2a5e6f3c363 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.resx @@ -1,64 +1,5 @@  - @@ -120,4 +61,4 @@ 17, 17 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewHeaders.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewHeaders.resx index 72fa7842588..6b21d20960e 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewHeaders.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewHeaders.resx @@ -1,64 +1,5 @@  - @@ -135,4 +76,4 @@ True - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DesignTimeAligned.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DesignTimeAligned.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DesignTimeAligned.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DesignTimeAligned.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MDIParent.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MDIParent.resx index d5494e3059c..82a05ef4b33 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MDIParent.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MDIParent.resx @@ -1,64 +1,5 @@  - @@ -120,4 +61,4 @@ 17, 17 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.resx index d5494e3059c..82a05ef4b33 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.resx @@ -1,64 +1,5 @@  - @@ -120,4 +61,4 @@ 17, 17 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.resx index 59099f264e4..566e3bc91db 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.resx @@ -1,64 +1,5 @@  - @@ -120,4 +61,4 @@ 17, 17 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Panels.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Panels.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Panels.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Panels.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PropertyGrid.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PropertyGrid.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PropertyGrid.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PropertyGrid.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Splitter.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Splitter.resx index 1af7de150c9..667ea1506c8 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Splitter.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Splitter.resx @@ -1,64 +1,5 @@  - @@ -117,4 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TreeViewTest.resx b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TreeViewTest.resx index f9d08620d0c..3ed83e0d094 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TreeViewTest.resx +++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TreeViewTest.resx @@ -1,64 +1,5 @@  - @@ -164,4 +105,4 @@ AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/4EACw== - \ No newline at end of file + From 63d2268bd3780505271935babccef71a51517265 Mon Sep 17 00:00:00 2001 From: dreddy-work Date: Tue, 2 Jul 2019 13:50:46 -0700 Subject: [PATCH 2/2] Updating NetAssembly definition. --- .../src/System/Resources/ResXDataNode.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs index b4383b97f34..676bd620e67 100644 --- a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs +++ b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs @@ -935,7 +935,8 @@ internal class AssemblyNamesTypeResolutionService : ITypeResolutionService private Hashtable cachedAssemblies; private Hashtable cachedTypes; - private static readonly string NetFrameworkPath = Path.Combine(Environment.GetEnvironmentVariable("SystemRoot"), "Microsoft.Net\\Framework"); + private static readonly string s_dotNetPath = Path.Combine(Environment.GetEnvironmentVariable("ProgramFiles"), "dotnet\\shared"); + private static readonly string s_dotNetPathX86 = Path.Combine(Environment.GetEnvironmentVariable("ProgramFiles(x86)"), "dotnet\\shared"); internal AssemblyNamesTypeResolutionService(AssemblyName[] names) { @@ -1101,12 +1102,11 @@ public Type GetType(string name, bool throwOnError, bool ignoreCase) throw new ArgumentException(string.Format(SR.InvalidResXNoType, name)); } - //TODO -dreddy if (result != null) { // Only cache types from .Net framework because they don't need to update. // For simplicity, don't cache custom types - if (IsNetFrameworkAssembly(result.Assembly.Location)) + if (IsDotNetAssembly(result.Assembly.Location)) { cachedTypes[name] = result; } @@ -1118,9 +1118,9 @@ public Type GetType(string name, bool throwOnError, bool ignoreCase) /// /// This is matching %windir%\Microsoft.NET\Framework*, so both 32bit and 64bit framework will be covered. /// - private bool IsNetFrameworkAssembly(string assemblyPath) + private bool IsDotNetAssembly(string assemblyPath) { - return assemblyPath != null && assemblyPath.StartsWith(NetFrameworkPath, StringComparison.OrdinalIgnoreCase); + return assemblyPath != null && (assemblyPath.StartsWith(s_dotNetPath, StringComparison.OrdinalIgnoreCase) || assemblyPath.StartsWith(s_dotNetPathX86, StringComparison.OrdinalIgnoreCase)); } public void ReferenceAssembly(AssemblyName name)