Merge pull request #12589 from dotnet/main

gewarren · web-flow · commit 1a17fe396c3a · 2026-05-01T16:42:15.000-07:00
Merge main into live
diff --git a/xml/System.Collections.Generic/Dictionary`2.xml b/xml/System.Collections.Generic/Dictionary`2.xml
@@ -263,7 +263,6 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.Dictionary`2> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
- :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
diff --git a/xml/System.Collections.Generic/HashSet`1.xml b/xml/System.Collections.Generic/HashSet`1.xml
@@ -203,7 +203,6 @@ The following example demonstrates how to merge two disparate sets. This example
  The following example demonstrates how to create and populate two <xref:System.Collections.Generic.HashSet`1> objects. This example is part of a larger example provided for the <xref:System.Collections.Generic.HashSet`1.UnionWith*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/HashSetT/Overview/Program.cs" id="Snippet03":::
- :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/HashSetT/Overview/Program.fs" id="Snippet03":::
  :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/HashSetT/Overview/Program.vb" id="Snippet03":::
 
  ]]></format>
diff --git a/xml/System.Collections.Generic/List`1.xml b/xml/System.Collections.Generic/List`1.xml
@@ -194,7 +194,6 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
- :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/SortedList`2.xml b/xml/System.Collections.Generic/SortedList`2.xml
@@ -246,7 +246,6 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet2":::
- :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/Stack`1.xml b/xml/System.Collections.Generic/Stack`1.xml
@@ -224,7 +224,6 @@
  The <xref:System.Collections.Generic.Stack`1.Contains*> method is used to show that the string "four" is in the first copy of the stack, after which the <xref:System.Collections.Generic.Stack`1.Clear*> method clears the copy and the <xref:System.Collections.Generic.Stack`1.Count> property shows that the stack is empty.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" id="Snippet1":::
- :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
diff --git a/xml/System.Diagnostics/ActivityTraceId.xml b/xml/System.Diagnostics/ActivityTraceId.xml
@@ -153,7 +153,7 @@ Because an `ActivityTraceId` is a structure that contains 16 bytes, it can be pa
          ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">
-          <paramref name="idData" /> does not contain 16 hexadecimal characters.
+          <paramref name="idData" /> does not contain 32 hexadecimal characters.
 
 -or-
 
diff --git a/xml/System.Net.NetworkInformation/PingOptions.xml b/xml/System.Net.NetworkInformation/PingOptions.xml
@@ -135,7 +135,6 @@
  The following code example demonstrates calling this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/IPStatus/Overview/syncping.cs" id="Snippet2":::
- :::code language="fsharp" source="~/snippets/fsharp/System.Net.NetworkInformation/IPStatus/Overview/syncping.fs" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/Aes.xml b/xml/System.Security.Cryptography/Aes.xml
@@ -138,7 +138,6 @@
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Aes/Overview/program.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Aes/Overview/program.vb" id="Snippet1":::  
- :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aessample/fs/program.fs" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Text/StringBuilder.xml b/xml/System.Text/StringBuilder.xml
@@ -161,7 +161,6 @@ The following example shows how to call many of the methods defined by the <xref
  The following example demonstrates how to call the <xref:System.Text.StringBuilder.%23ctor*> constructor with no parameters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/.ctor/constructors.cs" id="Snippet1":::
- :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/.ctor/constructors.fs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/.ctor/Form1.vb" id="Snippet1":::
 
  ]]></format>
diff --git a/xml/System.Timers/Timer.xml b/xml/System.Timers/Timer.xml
@@ -193,7 +193,6 @@
  The following example instantiates a <xref:System.Timers.Timer> object that fires its <xref:System.Timers.Timer.Elapsed?displayProperty=nameWithType> event every two seconds (2000 milliseconds), sets up an event handler for the event, and starts the timer. The event handler displays the value of the <xref:System.Timers.ElapsedEventArgs.SignalTime?displayProperty=nameWithType> property each time it is raised.
 
  :::code language="csharp" source="~/snippets/csharp/System.Timers/ElapsedEventArgs/Overview/timer1.cs" id="Snippet1":::
- :::code language="fsharp" source="~/snippets/fsharp/System.Timers/ElapsedEventArgs/Overview/timer1.fs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Timers/ElapsedEventArgs/Overview/timer1.vb" id="Snippet1":::
 
  ]]></format>
diff --git a/xml/System/ArrayTypeMismatchException.xml b/xml/System/ArrayTypeMismatchException.xml
@@ -173,7 +173,6 @@
  The following example demonstrates the ArrayTypeMismatchException() constructor of the <xref:System.ArrayTypeMismatchException> class. It contains a function which takes two arrays as arguments and checks whether the two arrays are of the same type. If the arrays are of different types, a new <xref:System.ArrayTypeMismatchException> is thrown and then caught in the calling method.
 
  :::code language="csharp" source="~/snippets/csharp/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor1.cs" id="Snippet1":::
- :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor1/FS/arraytypemismatch_constructor1.fs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor1.vb" id="Snippet1":::
 
  ]]></format>
diff --git a/xml/System/Attribute.xml b/xml/System/Attribute.xml
@@ -162,7 +162,6 @@
  The following code example shows the definition of a custom parameter <xref:System.Attribute> class with its constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/.ctor/getcustattrparam.cs" id="Snippet2":::
- :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_System/system.Attribute.GetCustomAttribute/FS/getcustattrparam.fs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/System/Attribute/.ctor/getcustattrparam.vb" id="Snippet2":::
 
  ]]></format>
diff --git a/xml/System/Exception.xml b/xml/System/Exception.xml
@@ -171,7 +171,6 @@
  The following code example derives an `Exception` that uses a predefined message. The code demonstrates the use of the parameterless constructor for the derived class and the base `Exception` class.
 
  :::code language="csharp" source="~/snippets/csharp/System/Exception/.ctor/new.cs" id="Snippet1":::
- :::code language="fsharp" source="~/snippets/fsharp/System/Exception/.ctor/new.fs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System/Exception/.ctor/new.vb" id="Snippet1":::
 
  ]]></format>
diff --git a/xml/System/FlagsAttribute.xml b/xml/System/FlagsAttribute.xml
@@ -115,13 +115,11 @@
 The following example defines a `PhoneService` enumeration that represents forms of communication provided by a telephone company. It initializes three variables representing the service provided to three different households, and then indicates which households have no service, which households have only cell phone service, and which households have both cell phone and land line service. Finally, it implicitly calls the <xref:System.Enum.ToString(System.String)?displayProperty=nameWithType> method to display the types of service provided to each household.
 
  :::code language="csharp" source="~/snippets/csharp/System/FlagsAttribute/Overview/flags1.cs" id="Snippet2":::
- :::code language="fsharp" source="~/snippets/fsharp/System/FlagsAttribute/Overview/flags1.fs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/System/FlagsAttribute/.ctor/flags1.vb" id="Snippet2":::
 
  The following example illustrates the use of the `FlagsAttribute` attribute and shows the effect on the <xref:System.Enum.ToString*> method of using `FlagsAttribute` on an <xref:System.Enum> declaration.
 
  :::code language="csharp" source="~/snippets/csharp/System/FlagsAttribute/Overview/flags.cs" id="Snippet1":::
- :::code language="fsharp" source="~/snippets/fsharp/System/FlagsAttribute/Overview/flags.fs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System/FlagsAttribute/.ctor/flags.vb" id="Snippet1":::
 
  ]]></format>
diff --git a/xml/System/Lazy`1.xml b/xml/System/Lazy`1.xml
@@ -260,13 +260,11 @@
  The example defines a `LargeObject` class that will be initialized lazily by one of several threads. The two key lines of code in this example are the creation of the initializer and the actual initialization. At the beginning of the `Main` method, the example creates the thread-safe lazy initializer for `LargeObject`:
 
  :::code language="csharp" source="~/snippets/csharp/System/LazyT/.ctor/example.cs" id="Snippetnewlazy":::
- :::code language="fsharp" source="~/snippets/fsharp/System/LazyT/.ctor/example.fs" id="Snippetnewlazy":::
  :::code language="vb" source="~/snippets/visualbasic/System/LazyT/.ctor/example.vb" id="Snippetnewlazy":::
 
  The example creates and starts three threads that block on a <xref:System.Threading.ManualResetEvent> object, so that the example can release the threads all at once. The `ThreadProc` method that's used by all three threads calls the <xref:System.Lazy`1.Value> property to get the `LargeObject` instance:
 
  :::code language="csharp" source="~/snippets/csharp/System/LazyT/.ctor/example.cs" id="Snippetvalueprop":::
- :::code language="fsharp" source="~/snippets/fsharp/System/LazyT/.ctor/example.fs" id="Snippetvalueprop":::
  :::code language="vb" source="~/snippets/visualbasic/System/LazyT/.ctor/example.vb" id="Snippetvalueprop":::
 
  The <xref:System.Lazy`1> class provides locking, so that only one thread is allowed to create the `LargeObject` instance. The example demonstrates that the other threads all get the same instance.
@@ -275,7 +273,6 @@
 >  For simplicity, this example uses a global instance of <xref:System.Lazy`1>, and all the methods are `static` (`Shared` in Visual Basic). These are not requirements for the use of lazy initialization.
 
  :::code language="csharp" source="~/snippets/csharp/System/LazyT/.ctor/example.cs" id="Snippetall":::
- :::code language="fsharp" source="~/snippets/fsharp/System/LazyT/.ctor/example.fs" id="Snippetall":::
  :::code language="vb" source="~/snippets/visualbasic/System/LazyT/.ctor/example.vb" id="Snippetall":::
 
  ]]></format>
diff --git a/xml/System/Random.xml b/xml/System/Random.xml
@@ -177,7 +177,6 @@ In .NET Core, the default seed value is produced by the thread-static, pseudo-ra
 The following example uses the parameterless constructor to instantiate three <xref:System.Random> objects and displays a sequence of five random integers for each. If it is run on .NET Framework, because the first two <xref:System.Random> objects are created in close succession, they are instantiated using identical seed values based on the system clock and, therefore, they produce an identical sequence of random numbers. On the other hand, the parameterless constructor of the third <xref:System.Random> object is called after a two-second delay caused by calling the <xref:System.Threading.Thread.Sleep*?displayProperty=nameWithType> method. Because this produces a different seed value for the third <xref:System.Random> object, it produces a different sequence of random numbers.
 
  :::code language="csharp" source="~/snippets/csharp/System/Random/.ctor/ctor1.cs" id="Snippet2":::
- :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_System/system.Random.Ctor/FS/ctor1.fs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/System/Random/.ctor/ctor1.vb" id="Snippet2":::
 
  ]]></format>
