From 333565f23410e6b03131b73b1b3356c39fef96e5 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Fri, 8 May 2020 18:18:23 +0530 Subject: [PATCH] Fix 'WinFx' -> 'WinFX' everywhere else In project files, scripts, comments, etc... But not in sources (like GetWinFxCallback) --- eng/WpfArcadeSdk/tools/Pbt.props | 6 +++--- eng/WpfArcadeSdk/tools/Pbt.targets | 4 ++-- .../PresentationBuildTasks/PresentationBuildTasks.csproj | 6 +++--- .../src/PresentationCore/PresentationCore.csproj | 2 +- .../System/Windows/Interop/IErrorPage.cs | 2 +- .../System/Windows/Markup/BamlMapTable.cs | 2 +- .../System/Windows/Markup/XamlTypeMapper.cs | 2 +- .../src/Shared/Tracing/mcwpf/mcwpf.csproj | 4 ++-- .../MS/Internal/Automation/CodeQuality_Approved.cs | 2 +- .../System/Windows/Automation/WindowPattern.cs | 6 +++--- .../System/Windows/Automation/Provider/IWindowProvider.cs | 6 +++--- .../MS/Internal/Automation/CodeQuality_Approved.cs | 2 +- src/Microsoft.DotNet.Wpf/src/WpfGfx/tools/csp/csp.csproj | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/WpfArcadeSdk/tools/Pbt.props b/eng/WpfArcadeSdk/tools/Pbt.props index dba9a3d00..334ba2fe8 100644 --- a/eng/WpfArcadeSdk/tools/Pbt.props +++ b/eng/WpfArcadeSdk/tools/Pbt.props @@ -35,7 +35,7 @@ Project="../targets/Microsoft.NET.Sdk.WindowsDesktop.props" Condition="!Exists('$(LocalMicrosoftWinFXTargets)') And '$(InternalMarkupCompilation)'=='true'"/> - We need Microsoft.WinFx.props though, so that's imported here specifically. + We need Microsoft.WinFX.props though, so that's imported here specifically. The use of Microsoft.NET.Sdk.WindowsDesktop doesn't break the source-build promise. - Microsoft.NET.Sdk.WindowsDesktop is built from sources @@ -57,7 +57,7 @@ Condition="Exists('$(LocalMicrosoftWinFXProps)') "/> + Exists('../targets/Microsoft.WinFX.props')"/> diff --git a/eng/WpfArcadeSdk/tools/Pbt.targets b/eng/WpfArcadeSdk/tools/Pbt.targets index 3938ab805..4c4a27d01 100644 --- a/eng/WpfArcadeSdk/tools/Pbt.targets +++ b/eng/WpfArcadeSdk/tools/Pbt.targets @@ -1,7 +1,7 @@ - - + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs index 4293c68db..c5c4e978b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs @@ -48,7 +48,7 @@ public interface IErrorPage DispatcherOperationCallback RefreshCallback { get; set;} /// - /// Callback when user clicks GetWinFx button + /// Callback when user clicks GetWinFX button /// DispatcherOperationCallback GetWinFxCallback { get; set;} } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs index 97576ae06..84c026a34 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs @@ -1571,7 +1571,7 @@ internal void LoadTypeInfoRecord(BamlTypeInfoRecord record) return converterType; } - // Reflect for per property type converter , but skip if WinFx props + // Reflect for per property type converter , but skip if WinFX props Assembly ownerAsm = ownerType.Assembly; #if PBTCOMPILER if (XamlTypeMapper.AssemblyPF != ownerAsm && diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs index c8eaa39b5..05cc8318c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs @@ -2479,7 +2479,7 @@ private MemberInfo GetStaticMemberInfo(Type targetType, string memberName, bool #if PBTCOMPILER private static bool IsFriendAssembly(Assembly assembly) { - // WinFx assemblies can never be friends of compiled assemblies, so just bail out. + // WinFX assemblies can never be friends of compiled assemblies, so just bail out. if (assembly == XamlTypeMapper.AssemblyPF || assembly == XamlTypeMapper.AssemblyPC || assembly == XamlTypeMapper.AssemblyWB) diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj b/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj index 3d02acc1f..12b668b6b 100644 --- a/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj @@ -7,8 +7,8 @@ true v3.5 - v3.5 - v3.5 + v3.5 + v3.5 diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs index 5958a960c..2b280027b 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs @@ -289,7 +289,7 @@ [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.Condition.TrueCondition")] [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.Condition.FalseCondition")] [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TextPattern.TextChangedEvent")] -// Reviewed by WinFx team and this case is OK +// Reviewed by WinFX team and this case is OK [module: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "System.Windows.Automation.Text.FlowDirections")] // Reviewed by atgarch and these enums are OK [module: SuppressMessage("Microsoft.Naming", "CA1714:FlagsEnumsShouldHavePluralNames", Scope = "type", Target = "System.Windows.Automation.TreeScope")] diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs index e58940e31..966ebccd0 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs @@ -115,10 +115,10 @@ public void Close() /// call may return sometime after the window is ready for user input. The calling code /// should not rely on this call to understand exactly when the window has become idle. /// - /// For now this method works reliably for both WinFx and Win32 Windows that are starting - /// up. However, if called at other times on WinFx Windows (e.g. during a long layout) + /// For now this method works reliably for both WinFX and Win32 Windows that are starting + /// up. However, if called at other times on WinFX Windows (e.g. during a long layout) /// WaitForInputIdle may return true before the Window is actually idle. Additional work - /// needs to be done to detect when WinFx Windows are idle. + /// needs to be done to detect when WinFX Windows are idle. /// /// The amount of time, in milliseconds, to wait for the /// associated process to become idle. The maximum is the largest possible value of a diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs index fa1eea21a..35161ec1f 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs @@ -46,10 +46,10 @@ public interface IWindowProvider /// call may return sometime after the window is ready for user input. The calling code /// should not rely on this call to understand exactly when the window has become idle. /// - /// For now this method works reliably for both WinFx and Win32 Windows that are starting - /// up. However, if called at other times on WinFx Windows (e.g. during a long layout) + /// For now this method works reliably for both WinFX and Win32 Windows that are starting + /// up. However, if called at other times on WinFX Windows (e.g. during a long layout) /// WaitForInputIdle may return true before the Window is actually idle. Additional work - /// needs to be done to detect when WinFx Windows are idle. + /// needs to be done to detect when WinFX Windows are idle. /// /// The amount of time, in milliseconds, to wait for the /// associated process to become idle. The maximum is the largest possible value of a diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs index e0fe1eef9..454c8efd7 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs @@ -425,7 +425,7 @@ [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TransformPatternIdentifiers.CanRotateProperty" )] [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TransformPatternIdentifiers.CanResizeProperty" )] [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TextPatternIdentifiers.TextChangedEvent")] -// Reviewed by WinFx team and this case is OK +// Reviewed by WinFX team and this case is OK [module: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "System.Windows.Automation.Text.FlowDirections")] // Reviewed by atgarch and these enums are OK [module: SuppressMessage("Microsoft.Naming", "CA1714:FlagsEnumsShouldHavePluralNames", Scope = "type", Target = "System.Windows.Automation.TreeScope")] diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/tools/csp/csp.csproj b/src/Microsoft.DotNet.Wpf/src/WpfGfx/tools/csp/csp.csproj index bb41924f5..3afdf4cf8 100644 --- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/tools/csp/csp.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/tools/csp/csp.csproj @@ -3,8 +3,8 @@ true v3.5 - v3.5 - v3.5 + v3.5 + v3.5 -- GitLab