From d0bbddcb9cd8218d829cc6c0ca8b4ee97868365c Mon Sep 17 00:00:00 2001 From: lindexi Date: Sun, 5 Apr 2020 10:13:31 +0800 Subject: [PATCH 1/2] Using array empty to replace create an empty array --- .../MS/internal/Generated/AvTraceMessages.cs | 8 +++---- .../MS/Internal/Annotations/Serializer.cs | 4 ++-- .../MS/Internal/Generated/AvTraceMessages.cs | 24 +++++++++---------- .../Markup/Baml2006/Baml2006SchemaContext.cs | 2 +- .../System/Windows/Automation/ControlType.cs | 6 ++--- .../MS/Internal/Generated/AvTraceMessages.cs | 12 +++++----- .../Compoundfile/DataSpaceManager.cs | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs index 431b410f591..34e5e6308a4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs @@ -82,7 +82,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -106,7 +106,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -266,7 +266,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -290,7 +290,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Serializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Serializer.cs index 56ef97b961d..5a69eeb668d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Serializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Serializer.cs @@ -57,7 +57,7 @@ public Serializer(Type type) Invariant.Assert(_attribute != null, "Internal Serializer used for a type with no XmlRootAttribute."); // Get the default constructor for the type - _ctor = type.GetConstructor(new Type[0]); + _ctor = type.GetConstructor(Array.Empty()); } /// @@ -90,7 +90,7 @@ public object Deserialize(XmlReader reader) { Invariant.Assert(reader != null); - IXmlSerializable serializable = (IXmlSerializable)_ctor.Invoke(new object[0]); + IXmlSerializable serializable = (IXmlSerializable)_ctor.Invoke(Array.Empty()); // If this is a brand-new stream we need to jump into it if (reader.ReadState == ReadState.Initial) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Generated/AvTraceMessages.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Generated/AvTraceMessages.cs index 1452a7ab772..ed5df6969e1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Generated/AvTraceMessages.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Generated/AvTraceMessages.cs @@ -1346,7 +1346,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -1370,7 +1370,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -1474,7 +1474,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -1498,7 +1498,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -1714,7 +1714,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -1738,7 +1738,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -2010,7 +2010,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -2034,7 +2034,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -2096,7 +2096,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -2120,7 +2120,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -2258,7 +2258,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -2282,7 +2282,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006SchemaContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006SchemaContext.cs index 32a74f37a18..13d76c2c884 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006SchemaContext.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006SchemaContext.cs @@ -29,7 +29,7 @@ public Baml2006SchemaContext(Assembly localAssembly): } internal Baml2006SchemaContext(Assembly localAssembly, XamlSchemaContext parentSchemaContext) - : base(new Assembly[0]) + : base(Array.Empty()) { _localAssembly = localAssembly; _parentSchemaContext = parentSchemaContext; diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/System/Windows/Automation/ControlType.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/System/Windows/Automation/ControlType.cs index a92c755462e..2edb441a1b5 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/System/Windows/Automation/ControlType.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/System/Windows/Automation/ControlType.cs @@ -64,20 +64,20 @@ internal static ControlType Register(AutomationIdentifierConstants.ControlTypes internal static ControlType Register(AutomationIdentifierConstants.ControlTypes id, string programmaticName, string stId, AutomationPattern[][] requiredPatternsSets) { - return ControlType.Register(id, programmaticName, stId, new AutomationProperty[0], new AutomationPattern[0], requiredPatternsSets); + return ControlType.Register(id, programmaticName, stId, Array.Empty(), Array.Empty(), requiredPatternsSets); } //Never supported patterns and required patterns are set to an empty array internal static ControlType Register(AutomationIdentifierConstants.ControlTypes id, string programmaticName, string stId, AutomationProperty[] requiredProperties) { - return ControlType.Register(id, programmaticName, stId, requiredProperties, new AutomationPattern[0], new AutomationPattern[0][]); + return ControlType.Register(id, programmaticName, stId, requiredProperties, Array.Empty(), new AutomationPattern[0][]); } //Required patterns, never supported patterns and required properties are set to an empty array internal static ControlType Register(AutomationIdentifierConstants.ControlTypes id, string programmaticName, string stId) { - return ControlType.Register(id, programmaticName, stId, new AutomationProperty[0], new AutomationPattern[0], new AutomationPattern[0][]); + return ControlType.Register(id, programmaticName, stId, Array.Empty(), Array.Empty(), new AutomationPattern[0][]); } #endregion diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/Generated/AvTraceMessages.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/Generated/AvTraceMessages.cs index 0e7f4e77bb2..b5d51133c8c 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/Generated/AvTraceMessages.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/Generated/AvTraceMessages.cs @@ -82,7 +82,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -106,7 +106,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -210,7 +210,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -234,7 +234,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -310,7 +310,7 @@ static public void Trace( TraceEventType type, AvTraceDetails traceDetails, para /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -334,7 +334,7 @@ static public void TraceActivityItem( AvTraceDetails traceDetails, params Object /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/IO/Packaging/Compoundfile/DataSpaceManager.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/IO/Packaging/Compoundfile/DataSpaceManager.cs index 9a4deb7ecea..83d813f7df7 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/IO/Packaging/Compoundfile/DataSpaceManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/IO/Packaging/Compoundfile/DataSpaceManager.cs @@ -828,7 +828,7 @@ internal Stream GetPrimaryInstanceStreamOf( string transformLabel ) { targetInstance.transformPrimaryStream = new DirtyStateTrackingStream (new MemoryStream - (new byte[0], + (Array.Empty(), false /* Not writable */)); } else From d41961aba396e2d2c64a49b50d10d7856bbcd746 Mon Sep 17 00:00:00 2001 From: lindexi Date: Tue, 12 Jan 2021 10:11:27 +0800 Subject: [PATCH 2/2] Fix template --- eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt | 6 +++--- .../System/Windows/Markup/Baml2006/Baml2006Reader.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt b/eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt index 71467b40910..f74ac470fc7 100644 --- a/eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt +++ b/eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt @@ -78,7 +78,7 @@ namespace MS.Internal /// These help delay allocation of object array static public void Trace( TraceEventType type, AvTraceDetails traceDetails ) { - _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 ) { @@ -102,7 +102,7 @@ namespace MS.Internal /// These help delay allocation of object array static public void TraceActivityItem( AvTraceDetails traceDetails ) { - _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[0] ); + _avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty() ); } static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 ) { @@ -168,4 +168,4 @@ void OutputTraceCreation(int id, XElement traceDetails) _<#= traceDetails.Attribute("Name").Value #> = new AvTraceDetails(<#=id#>, new string[] { <#= dataString #> } ); <#+ } -#> \ No newline at end of file +#> diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006Reader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006Reader.cs index 6aea335fb40..71c9ba28597 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006Reader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006Reader.cs @@ -1441,7 +1441,7 @@ private System.Windows.Media.Int32Collection GetInt32Collection() int capacity = reader.ReadInt32(); if (capacity < 0) { - throw new ArgumentException(SR.Get(SRID.IntegerCollectionLengthLessThanZero, new object[0])); + throw new ArgumentException(SR.Get(SRID.IntegerCollectionLengthLessThanZero, Array.Empty())); } System.Windows.Media.Int32Collection ints = new System.Windows.Media.Int32Collection(capacity); switch (type)