Skip to content

Commit 371af25

Browse files
h3xds1nzh3xds1nz
committed
Fix the rest
1 parent 639d40e commit 371af25

File tree

16 files changed

+386
-389
lines changed

16 files changed

+386
-389
lines changed

‎eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ namespace MS.Internal
2929
string name = source.Attribute("Name").Value;
3030
string traceClassName = source.Attribute("TraceNameOverride")?.Value ?? $"Trace{name}";
3131
#>
32-
static internal partial class <#= traceClassName #>
32+
internal static partial class <#= traceClassName #>
3333
{
34-
static private AvTrace _avTrace = new AvTrace(
34+
private static AvTrace _avTrace = new AvTrace(
3535
delegate() { return PresentationTraceSources.<#=name#>Source; },
3636
delegate() { PresentationTraceSources._<#=name#>Source = null; }
3737
);
@@ -45,7 +45,7 @@ namespace MS.Internal
4545

4646
static AvTraceDetails _<#=traceName#>;
4747
<# if (IsFormattedTraceMessage(traceDetails)) { #>
48-
static public AvTraceDetails <#= traceName #>(params object[] args)
48+
public static AvTraceDetails <#= traceName #>(params object[] args)
4949
{
5050
if ( _<#=traceName#> == null )
5151
{
@@ -54,7 +54,7 @@ namespace MS.Internal
5454
return new AvTraceFormat(_<#= traceName #>, args);
5555
}
5656
<# } else { #>
57-
static public AvTraceDetails <#= traceName #>
57+
public static AvTraceDetails <#= traceName #>
5858
{
5959
get
6060
{
@@ -70,66 +70,66 @@ namespace MS.Internal
7070
<# } #>
7171

7272
/// <summary> Send a single trace output </summary>
73-
static public void Trace( TraceEventType type, AvTraceDetails traceDetails, params object[] parameters )
73+
public static void Trace( TraceEventType type, AvTraceDetails traceDetails, params object[] parameters )
7474
{
7575
_avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters );
7676
}
7777

7878
/// <summary> These help delay allocation of object array </summary>
79-
static public void Trace( TraceEventType type, AvTraceDetails traceDetails )
79+
public static void Trace( TraceEventType type, AvTraceDetails traceDetails )
8080
{
8181
_avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty<object>() );
8282
}
83-
static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 )
83+
public static void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1 )
8484
{
8585
_avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[] { p1 } );
8686
}
87-
static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1, object p2 )
87+
public static void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1, object p2 )
8888
{
8989
_avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[] { p1, p2 } );
9090
}
91-
static public void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1, object p2, object p3 )
91+
public static void Trace( TraceEventType type, AvTraceDetails traceDetails, object p1, object p2, object p3 )
9292
{
9393
_avTrace.Trace( type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[] { p1, p2, p3 } );
9494
}
9595

9696
/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
97-
static public void TraceActivityItem( AvTraceDetails traceDetails, params Object[] parameters )
97+
public static void TraceActivityItem( AvTraceDetails traceDetails, params Object[] parameters )
9898
{
9999
_avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters );
100100
}
101101

102102
/// <summary> These help delay allocation of object array </summary>
103-
static public void TraceActivityItem( AvTraceDetails traceDetails )
103+
public static void TraceActivityItem( AvTraceDetails traceDetails )
104104
{
105105
_avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, Array.Empty<object>() );
106106
}
107-
static public void TraceActivityItem( AvTraceDetails traceDetails, object p1 )
107+
public static void TraceActivityItem( AvTraceDetails traceDetails, object p1 )
108108
{
109109
_avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[] { p1 } );
110110
}
111-
static public void TraceActivityItem( AvTraceDetails traceDetails, object p1, object p2 )
111+
public static void TraceActivityItem( AvTraceDetails traceDetails, object p1, object p2 )
112112
{
113113
_avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[] { p1, p2 } );
114114
}
115-
static public void TraceActivityItem( AvTraceDetails traceDetails, object p1, object p2, object p3 )
115+
public static void TraceActivityItem( AvTraceDetails traceDetails, object p1, object p2, object p3 )
116116
{
117117
_avTrace.TraceStartStop( traceDetails.Id, traceDetails.Message, traceDetails.Labels, new object[] { p1, p2, p3 } );
118118
}
119119

120-
static public bool IsEnabled
120+
public static bool IsEnabled
121121
{
122122
get { return _avTrace != null && _avTrace.IsEnabled; }
123123
}
124124

125125
/// <summary> Is there a Tracesource? (See comment on AvTrace.IsEnabledOverride.) </summary>
126-
static public bool IsEnabledOverride
126+
public static bool IsEnabledOverride
127127
{
128128
get { return _avTrace.IsEnabledOverride; }
129129
}
130130

131131
/// <summary> Re-read the configuration for this trace source </summary>
132-
static public void Refresh()
132+
public static void Refresh()
133133
{
134134
_avTrace.Refresh();
135135
}

‎src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7708,9 +7708,9 @@ public static void SetVirtualizationMode(System.Windows.DependencyObject element
77087708
public partial class VirtualizingStackPanel : System.Windows.Controls.VirtualizingPanel, System.Windows.Controls.Primitives.IScrollInfo
77097709
{
77107710
public static readonly System.Windows.RoutedEvent CleanUpVirtualizedItemEvent;
7711-
public static readonly new System.Windows.DependencyProperty IsVirtualizingProperty;
7711+
public static new readonly System.Windows.DependencyProperty IsVirtualizingProperty;
77127712
public static readonly System.Windows.DependencyProperty OrientationProperty;
7713-
public static readonly new System.Windows.DependencyProperty VirtualizationModeProperty;
7713+
public static new readonly System.Windows.DependencyProperty VirtualizationModeProperty;
77147714
public VirtualizingStackPanel() { }
77157715
protected override bool CanHierarchicallyScrollAndVirtualizeCore { get { throw null; } }
77167716
[System.ComponentModel.DefaultValueAttribute(false)]

‎src/Microsoft.DotNet.Wpf/src/.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,6 @@ dotnet_diagnostic.IDE0005.severity = suggestion
167167
# IDE0034: Simplify 'default' expression
168168
dotnet_diagnostic.IDE0034.severity = suggestion
169169

170-
# IDE0036: Order modifiers
171-
dotnet_diagnostic.IDE0036.severity = suggestion
172-
173170
# IDE0041: Use 'is null' check
174171
dotnet_diagnostic.IDE0041.severity = suggestion
175172

0 commit comments

Comments
 (0)