提交 333565f2 编写于 作者: N Nirmal Guru 提交者: Ryland Alaniz

Fix 'WinFx' -> 'WinFX' everywhere else

In project files, scripts, comments, etc...
But not in sources (like GetWinFxCallback)
上级 bb16e233
......@@ -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)') "/>
<Import Sdk="Microsoft.NET.Sdk.WindowsDesktop"
Project="../targets/Microsoft.WinFx.props"
Project="../targets/Microsoft.WinFX.props"
Condition="!Exists('$(LocalMicrosoftWinFXProps)') And
Exists('../targets/Microsoft.WinFx.props')"/>
Exists('../targets/Microsoft.WinFX.props')"/>
</Project>
<Project>
<PropertyGroup>
<!--
This should be defined before Microsoft.WinFx.targets in imported.
This should be defined before Microsoft.WinFX.targets in imported.
It's OK if there is no DLL realized at this location - we just need to have the property define.
It is also OK for a DLL to NOT exist at the time <UsingTask> is encountered against this assembly path.
......@@ -59,7 +59,7 @@
(a) PresentationBuildTasks.dll is built locally
(b) The TFM of the assembly matches the build toolset currently being used (netcore vs netframework)
(c) The assembly is placed at $(_PresentationBuildTasksAssembly)
(d) This is all done prior to the first ever use of a task from within this assembly by Microsoft.WinFx.targets
(d) This is all done prior to the first ever use of a task from within this assembly by Microsoft.WinFX.targets
-->
<Target Name="EnsurePbtPath"
Condition="'$(InternalMarkupCompilation)'=='true' And Exists('$(LocalMicrosoftWinFXTargets)')"
......
......@@ -40,12 +40,12 @@
<!--
Incorporate Microsoft.WinFx.targets in nuget packages under
Incorporate Microsoft.WinFX.targets in nuget packages under
content\targets\
-->
<ItemGroup>
<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.props" SubFolder="root\targets" />
<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.targets" SubFolder="root\targets" />
<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFX.props" SubFolder="root\targets" />
<PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFX.targets" SubFolder="root\targets" />
</ItemGroup>
<!--
......
......@@ -1426,7 +1426,7 @@
</ItemGroup>
<!--
Need Microsoft.WinFx.targets to embed *.compositefont
Need Microsoft.WinFX.targets to embed *.compositefont
files using MainResourcesGeneration target
-->
<PropertyGroup>
......
......@@ -48,7 +48,7 @@ public interface IErrorPage
DispatcherOperationCallback RefreshCallback { get; set;}
/// <summary>
/// Callback when user clicks GetWinFx button
/// Callback when user clicks GetWinFX button
/// </summary>
DispatcherOperationCallback GetWinFxCallback { get; set;}
}
......
......@@ -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 &&
......
......@@ -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)
......
......@@ -7,8 +7,8 @@
<PropertyGroup>
<AllowCrossTargeting>true</AllowCrossTargeting>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<CrossTargetWinFxRefsVersion>v3.5</CrossTargetWinFxRefsVersion>
<CrossTargetWinFxToolsVersion>v3.5</CrossTargetWinFxToolsVersion>
<CrossTargetWinFXRefsVersion>v3.5</CrossTargetWinFXRefsVersion>
<CrossTargetWinFXToolsVersion>v3.5</CrossTargetWinFXToolsVersion>
</PropertyGroup>
<!-- Imports -->
......
......@@ -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")]
......
......@@ -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.
/// </remarks>
/// <param name="milliseconds">The amount of time, in milliseconds, to wait for the
/// associated process to become idle. The maximum is the largest possible value of a
......
......@@ -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.
/// </remarks>
/// <param name="milliseconds">The amount of time, in milliseconds, to wait for the
/// associated process to become idle. The maximum is the largest possible value of a
......
......@@ -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")]
......
......@@ -3,8 +3,8 @@
<PropertyGroup>
<AllowCrossTargeting>true</AllowCrossTargeting>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<CrossTargetWinFxRefsVersion>v3.5</CrossTargetWinFxRefsVersion>
<CrossTargetWinFxToolsVersion>v3.5</CrossTargetWinFxToolsVersion>
<CrossTargetWinFXRefsVersion>v3.5</CrossTargetWinFXRefsVersion>
<CrossTargetWinFXToolsVersion>v3.5</CrossTargetWinFXToolsVersion>
</PropertyGroup>
<Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\src\Microsoft.wpf.Product.Settings.targets" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册