Skip to content

Commit 9300fc2

Browse files
Merge pull request #12199 from dotnet/main
Merge main into live
2 parents e6f5c1d + 461ccba commit 9300fc2

File tree

10 files changed

+239
-296
lines changed

10 files changed

+239
-296
lines changed

snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/etwtrace.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp5.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
</PropertyGroup>
77

8-
</Project>
8+
</Project>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net10.0</TargetFramework>
6+
</PropertyGroup>
7+
8+
</Project>

snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Enum MyColor
66
Red
77
Yellow
88
Blue
9-
End Enum 'MyColor
9+
End Enum 'MyColor
1010
<EventSource(Name:="MyCompany")> _
1111
Class MyCompanyEventSource
1212
Inherits EventSource
@@ -117,4 +117,4 @@ Class Program
117117
'</Snippet13>
118118
End Sub
119119
End Class
120-
'</Snippet1>
120+
'</Snippet1>

xml/System.Diagnostics.Tracing/EventAttribute.xml

Lines changed: 75 additions & 111 deletions
Large diffs are not rendered by default.

xml/System.Diagnostics.Tracing/EventKeywords.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@
5454
<Docs>
5555
<summary>Defines the standard keywords that apply to events.</summary>
5656
<remarks>
57-
<format type="text/markdown"><![CDATA[
58-
59-
## Remarks
60-
You can customize the meaning of a keyword by assigning different names to the flags.
61-
62-
63-
64-
## Examples
65-
The following example shows how to use the <xref:System.Diagnostics.Tracing.EventKeywords> class to redefine event keywords. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
66-
57+
<format type="text/markdown"><![CDATA[
58+
59+
## Remarks
60+
You can customize the meaning of a keyword by assigning different names to the flags.
61+
62+
63+
64+
## Examples
65+
The following example shows how to use the <xref:System.Diagnostics.Tracing.EventKeywords> class to redefine event keywords. This code example is part of a larger example provided for the [EventSource](/dotnet/fundamentals/runtime-libraries/system-diagnostics-tracing-eventsource#examples) class.
66+
6767
:::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet3":::
68-
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet3":::
69-
68+
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet3":::
69+
7070
]]></format>
7171
</remarks>
7272
</Docs>

xml/System.Diagnostics.Tracing/EventLevel.xml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,26 @@
4848
<Docs>
4949
<summary>Identifies the level of an event.</summary>
5050
<remarks>
51-
<format type="text/markdown"><![CDATA[
52-
53-
## Remarks
54-
The level signifies the severity of an event. Lower severity levels encompass higher severity levels. For example, `Warning` includes the `Error` and `Critical` levels, which are higher in severity.
55-
56-
57-
58-
## Examples
51+
<format type="text/markdown"><![CDATA[
52+
53+
The level signifies the severity of an event. Lower severity levels encompass higher severity levels. For example, `Warning` includes the `Error` and `Critical` levels, which are higher in severity.
54+
55+
## Examples
5956
6057
The following example shows how to use the `Error` enumeration member to identify an error message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
61-
58+
6259
:::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
63-
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::
60+
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::
61+
62+
The following example shows how to use the `Informational` enumeration member to identify an informational message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
6463
65-
The following example shows how to use the `Informational` enumeration member to identify an informational message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
66-
6764
:::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet6":::
68-
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet6":::
65+
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet6":::
66+
67+
The following example shows how to use the `Verbose` enumeration member to identify a verbose message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
6968
70-
The following example shows how to use the `Verbose` enumeration member to identify a verbose message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
71-
7269
:::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet11":::
73-
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet11":::
70+
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet11":::
7471
7572
]]></format>
7673
</remarks>

xml/System.Diagnostics.Tracing/EventOpcode.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
<Docs>
4949
<summary>Defines the standard operation codes that the event source attaches to events.</summary>
5050
<remarks>
51-
<format type="text/markdown"><![CDATA[
52-
51+
<format type="text/markdown"><![CDATA[
52+
5353
## Examples
5454
55-
The following example shows how to use the `Start` enumeration member to specify a start operation. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
56-
55+
The following example shows how to use the `Start` enumeration member to specify a start operation. This code example is part of a larger example provided for the [EventSource](/dotnet/fundamentals/runtime-libraries/system-diagnostics-tracing-eventsource#examples) class.
56+
5757
:::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet7":::
58-
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet7":::
59-
60-
The following example shows how to use the `Stop` enumeration member to specify a stop operation. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
61-
58+
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet7":::
59+
60+
The following example shows how to use the `Stop` enumeration member to specify a stop operation. This code example is part of a larger example provided for the [EventSource](/dotnet/fundamentals/runtime-libraries/system-diagnostics-tracing-eventsource#examples) class.
61+
6262
:::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet8":::
6363
:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet8":::
6464

0 commit comments

Comments
 (0)