From 4b60f2ce585ce40a3c80bff841a2f5b6efeea360 Mon Sep 17 00:00:00 2001
From: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
Date: Tue, 1 Oct 2024 07:53:38 -0700
Subject: [PATCH 1/7] replace alias with 'localhost' (#10474)

---
 .../DataGrid/AutoGenerateColumns/app.config   |  4 +--
 .../properties/settings.designer.cs           | 30 +++++++++++--------
 .../properties/settings.settings              |  6 ++--
 .../DataGrid/Columns/app.config               |  4 +--
 .../Columns/properties/settings.designer.cs   | 30 +++++++++++--------
 .../Columns/properties/settings.settings      |  6 ++--
 .../DataGrid/FrozenColumnCount/app.config     |  4 +--
 .../properties/settings.designer.cs           | 30 +++++++++++--------
 .../properties/settings.settings              |  6 ++--
 .../DataGrid/Overview/app.config              |  2 +-
 .../Overview/properties/settings.designer.cs  | 30 +++++++++++--------
 .../Overview/properties/settings.settings     |  6 ++--
 .../DataGrid/RowHeaderStyle/app.config        |  4 +--
 .../properties/settings.designer.cs           | 30 +++++++++++--------
 .../properties/settings.settings              |  6 ++--
 .../DataGrid/SelectedCellsChanged/app.config  |  4 +--
 .../properties/settings.designer.cs           | 30 +++++++++++--------
 .../properties/settings.settings              |  6 ++--
 .../Overview/app.config                       |  4 +--
 .../Overview/properties/settings.designer.cs  | 30 +++++++++++--------
 .../Overview/properties/settings.settings     |  6 ++--
 .../VS_Snippets_Wpf/datagrid1/vb/app.config   |  2 +-
 .../datagrid1/vb/my project/settings.settings |  6 ++--
 .../vb/datagrid_autogencolumns_vb/app.config  |  2 +-
 .../my project/settings.settings              |  6 ++--
 .../vb/datagrid_cellselection_vb/app.config   |  2 +-
 .../my project/settings.settings              |  6 ++--
 .../app.config                                |  2 +-
 .../my project/settings.settings              |  6 ++--
 .../datagrid_customcolumns/vb/app.config      |  2 +-
 .../vb/my project/settings.settings           |  6 ++--
 .../datagrid_frozencolumn/vb/app.config       |  2 +-
 .../vb/my project/settings.settings           |  6 ++--
 .../vb/datagrid_rowheader_vb/app.config       |  2 +-
 .../my project/settings.settings              |  6 ++--
 35 files changed, 188 insertions(+), 146 deletions(-)

diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/app.config b/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/app.config
index aaea48f8325..170f6537a49 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/app.config
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_AutoGenColumns.Properties.Settings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.designer.cs b/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.designer.cs
index 9fedbb73881..4c49e2392ec 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.designer.cs
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.designer.cs
@@ -8,28 +8,34 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DataGrid_AutoGenColumns.Properties {
-    
-    
+namespace DataGrid_AutoGenColumns.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
             "ue")]
-        public string AdventureWorksLT2008ConnectionString {
-            get {
+        public string AdventureWorksLT2008ConnectionString
+        {
+            get
+            {
                 return ((string)(this["AdventureWorksLT2008ConnectionString"]));
             }
         }
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.settings b/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.settings
index a716324d20f..5b06e7adede 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.settings
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/properties/settings.settings
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/Columns/app.config b/snippets/csharp/System.Windows.Controls/DataGrid/Columns/app.config
index 3d8ccc034c3..f86f4ddc658 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/Columns/app.config
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/Columns/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_ColumnsManipulation.Properties.Settings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.designer.cs b/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.designer.cs
index 80056b432a8..50be8dc7f8a 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.designer.cs
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.designer.cs
@@ -8,28 +8,34 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DataGrid_ColumnsManipulation.Properties {
-    
-    
+namespace DataGrid_ColumnsManipulation.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
             "ue")]
-        public string AdventureWorksLT2008ConnectionString {
-            get {
+        public string AdventureWorksLT2008ConnectionString
+        {
+            get
+            {
                 return ((string)(this["AdventureWorksLT2008ConnectionString"]));
             }
         }
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.settings b/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.settings
index 44c2c68d853..6004be9a19d 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.settings
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/Columns/properties/settings.settings
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/app.config b/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/app.config
index 97c9267e14e..7dea2aa19b2 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/app.config
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_FrozenColumns.Properties.Settings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.designer.cs b/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.designer.cs
index 170c2b876bb..c67a13205e9 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.designer.cs
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.designer.cs
@@ -8,28 +8,34 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DataGrid_FrozenColumns.Properties {
-    
-    
+namespace DataGrid_FrozenColumns.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
             "ue")]
-        public string AdventureWorksLT2008ConnectionString {
-            get {
+        public string AdventureWorksLT2008ConnectionString
+        {
+            get
+            {
                 return ((string)(this["AdventureWorksLT2008ConnectionString"]));
             }
         }
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.settings b/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.settings
index 51a01adccc7..aebb0349d97 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.settings
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/properties/settings.settings
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/Overview/app.config b/snippets/csharp/System.Windows.Controls/DataGrid/Overview/app.config
index b7aebb16375..da2aab3ebe6 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/Overview/app.config
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/Overview/app.config
@@ -4,7 +4,7 @@
   </configSections>
   <connectionStrings>
     <add name="DataGrid1.Properties.Settings.AdventureWorksLT2008ConnectionString"
-        connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+        connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
         providerName="System.Data.SqlClient" />
   </connectionStrings>
 </configuration>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.designer.cs b/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.designer.cs
index f330cc2e4cc..6a982d5b3eb 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.designer.cs
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.designer.cs
@@ -8,28 +8,34 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DataGrid1.Properties {
-    
-    
+namespace DataGrid1.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
             "ue")]
-        public string AdventureWorksLT2008ConnectionString {
-            get {
+        public string AdventureWorksLT2008ConnectionString
+        {
+            get
+            {
                 return ((string)(this["AdventureWorksLT2008ConnectionString"]));
             }
         }
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.settings b/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.settings
index cb9a5838776..12062b2d747 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.settings
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/Overview/properties/settings.settings
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/app.config b/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/app.config
index 9ba7696d169..5253477010c 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/app.config
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_RowHeader.Properties.Settings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.designer.cs b/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.designer.cs
index cba91f5f734..b8e208eb5e2 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.designer.cs
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.designer.cs
@@ -8,28 +8,34 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DataGrid_RowHeader.Properties {
-    
-    
+namespace DataGrid_RowHeader.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
             "ue")]
-        public string AdventureWorksLT2008ConnectionString {
-            get {
+        public string AdventureWorksLT2008ConnectionString
+        {
+            get
+            {
                 return ((string)(this["AdventureWorksLT2008ConnectionString"]));
             }
         }
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.settings b/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.settings
index bed7b52f537..1a1072a5a86 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.settings
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/properties/settings.settings
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/app.config b/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/app.config
index 0b77f8d0c0d..ff1b6b3a5c2 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/app.config
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_CellSelection.Properties.Settings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.designer.cs b/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.designer.cs
index d5c85194778..f3dcb13b9c6 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.designer.cs
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.designer.cs
@@ -8,28 +8,34 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DataGrid_CellSelection.Properties {
-    
-    
+namespace DataGrid_CellSelection.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
             "ue")]
-        public string AdventureWorksLT2008ConnectionString {
-            get {
+        public string AdventureWorksLT2008ConnectionString
+        {
+            get
+            {
                 return ((string)(this["AdventureWorksLT2008ConnectionString"]));
             }
         }
diff --git a/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.settings b/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.settings
index e2dbc45ac5d..ec7e9653fae 100644
--- a/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.settings
+++ b/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/properties/settings.settings
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/app.config b/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/app.config
index 0db4d1c609e..0069bd698a9 100644
--- a/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/app.config
+++ b/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="ColumnsArtSample.Properties.Settings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.designer.cs b/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.designer.cs
index 2df36ffee05..d8e1d84d6dd 100644
--- a/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.designer.cs
+++ b/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.designer.cs
@@ -8,28 +8,34 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ColumnsArtSample.Properties {
-    
-    
+namespace ColumnsArtSample.Properties
+{
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
+
+        public static Settings Default
+        {
+            get
+            {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=Tr" +
             "ue")]
-        public string AdventureWorksLT2008ConnectionString {
-            get {
+        public string AdventureWorksLT2008ConnectionString
+        {
+            get
+            {
                 return ((string)(this["AdventureWorksLT2008ConnectionString"]));
             }
         }
diff --git a/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.settings b/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.settings
index 8385bee257e..55e0cbc59f1 100644
--- a/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.settings
+++ b/snippets/csharp/System.Windows.Controls/DataGridCheckBoxColumn/Overview/properties/settings.settings
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/app.config b/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/app.config
index a5a4dd50a27..de32bb97049 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/app.config
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid1_VB.MySettings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.diagnostics>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.settings
index 7e9d98e468d..a6462038dc4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.settings	
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.settings	
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/app.config b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/app.config
index b786eeded20..3fb0e67632f 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/app.config
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_AutoGenColumns_VB.MySettings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.diagnostics>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.settings
index 7e9d98e468d..a6462038dc4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.settings	
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.settings	
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/app.config b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/app.config
index cce63a4bb7b..cf812f7188a 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/app.config
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_CellSelection_VB.MySettings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.diagnostics>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.settings
index 7e9d98e468d..a6462038dc4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.settings	
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.settings	
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/app.config b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/app.config
index f490311b5d4..7fda9a2d1da 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/app.config
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_ColumnsManipulation_VB.MySettings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.diagnostics>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.settings
index 7e9d98e468d..a6462038dc4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.settings	
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.settings	
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/app.config b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/app.config
index 2ae3addd6ca..020160d468b 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/app.config
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_CustomColumns_VB.MySettings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.diagnostics>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/my project/settings.settings
index 7e9d98e468d..a6462038dc4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/my project/settings.settings	
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/my project/settings.settings	
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/app.config b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/app.config
index d0a0428f348..afa7e56ed76 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/app.config
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_FrozenColumn_VB.MySettings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.diagnostics>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.settings
index 7e9d98e468d..a6462038dc4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.settings	
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.settings	
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/app.config b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/app.config
index 0a44560a9e3..747658988a4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/app.config
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/app.config
@@ -4,7 +4,7 @@
     </configSections>
     <connectionStrings>
         <add name="DataGrid_RowHeader_VB.MySettings.AdventureWorksLT2008ConnectionString"
-            connectionString="Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
+            connectionString="Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.diagnostics>
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.settings
index 7e9d98e468d..a6462038dc4 100644
--- a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.settings	
+++ b/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.settings	
@@ -5,10 +5,10 @@
     <Setting Name="AdventureWorksLT2008ConnectionString" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=jgalasyn1;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=AdventureWorksLT2008;Integrated Security=True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>

From 912ede2f9f5c5eaba42c13d37172f5381b69bf28 Mon Sep 17 00:00:00 2001
From: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
Date: Tue, 1 Oct 2024 12:35:19 -0700
Subject: [PATCH 2/7] ROPC fixes in C# files (#10479)

---
 .../System.Data/EntityKey/Overview/app.config |   6 +-
 .../Overview/web.config.backup.1              |  46 --
 .../Overview/web.config.backup.1              |  46 --
 .../Overview/web.config.backup.1              |  46 --
 .../CS/Project.csproj                         |  12 +
 .../Classic WebData OdbcCommand/CS/source.cs  |   6 +-
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   7 +-
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   7 +-
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   8 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   8 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   5 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   3 +-
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   8 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   5 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/Project.csproj                         |  12 +
 .../CS/Project.csproj                         |  12 +
 .../CS/Project.csproj                         |  12 +
 .../CS/Source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/Project.csproj                         |   2 +-
 .../CS/source.cs                              |   7 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   7 -
 .../CS/Project.csproj                         |   2 +-
 .../CS/source.cs                              |   7 -
 .../CS/Project.csproj                         |   2 +-
 .../CS/source.cs                              |   7 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   6 -
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   7 -
 .../CS/SqlDataReader.Read.csproj              |   2 +-
 .../CS/source.cs                              |  13 +-
 .../CS/LINQtoDataSetExamplesCS.csproj         |  64 +-
 .../DP LINQ to DataSet Examples/CS/Program.cs |   9 +-
 .../CS/Properties/AssemblyInfo.cs             |  36 -
 .../CS/source.cs                              |  41 --
 .../CS/source.cs                              |   5 -
 .../Project.csproj                            |  12 +
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |  25 +-
 .../CS/source.cs                              |  51 --
 .../CS/Project.csproj                         |  12 +
 .../CS/source.cs                              |   1 -
 .../CS/Project.csproj                         |  13 +
 .../CS/source.cs                              |  24 +-
 .../idatareader_nextresult/cs/Project.csproj  |  14 +
 .../idatareader_nextresult/cs/source.cs       | 189 +++---
 .../CS/ConfigurationStringSettings.cs         |   7 +-
 .../CS/ConnectionStrings.cs                   |  66 +-
 .../CS/Project.csproj                         |  16 +
 .../CS/Project.csproj                         |  13 +
 .../CS/WebConfigurationManager.cs             | 190 +++---
 .../CS/sql22cs.aspx                           |  88 ---
 .../ConfigurationManager.xml                  |  58 --
 .../ConnectionStringSettingsCollection.xml    | 176 +++--
 .../ConnectionStringsSection.xml              |  50 +-
 .../ProtectedConfigurationProvider.xml        |  27 -
 .../DbConnectionStringBuilder.xml             |  23 +-
 .../EntityConnectionStringBuilder.xml         |   6 -
 .../OdbcConnectionStringBuilder.xml           |   2 -
 .../OleDbConnectionStringBuilder.xml          |  11 -
 .../OracleConnectionStringBuilder.xml         | 527 ++++++++-------
 xml/System.Data.SqlClient/SqlCredential.xml   |  69 +-
 xml/System.Web.Caching/SqlCacheDependency.xml |   4 +-
 xml/System.Web.UI.WebControls/Parameter.xml   | 628 +++++++++---------
 .../QueryStringParameter.xml                  | 219 +++---
 .../SqlDataSource.xml                         |  19 +-
 99 files changed, 1490 insertions(+), 1888 deletions(-)
 delete mode 100644 snippets/csharp/System.IdentityModel.Services/SessionAuthenticationModule/Overview/web.config.backup.1
 delete mode 100644 snippets/csharp/System.IdentityModel.Services/SignInRequestMessage/Overview/web.config.backup.1
 delete mode 100644 snippets/csharp/System.IdentityModel.Services/WSFederationAuthenticationModule/Overview/web.config.backup.1
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/Project.csproj
 delete mode 100644 snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Properties/AssemblyInfo.cs
 delete mode 100644 snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/CS/source.cs
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/Project.csproj
 delete mode 100644 snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/CS/source.cs
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/Project.csproj
 create mode 100644 snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/Project.csproj
 delete mode 100644 snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx

diff --git a/snippets/csharp/System.Data/EntityKey/Overview/app.config b/snippets/csharp/System.Data/EntityKey/Overview/app.config
index bc5cd770d42..936b73f4837 100644
--- a/snippets/csharp/System.Data/EntityKey/Overview/app.config
+++ b/snippets/csharp/System.Data/EntityKey/Overview/app.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="AdventureWorksEntities" connectionString="metadata=res://*/AdventureWorksModel.csdl|res://*/AdventureWorksModel.ssdl|res://*/AdventureWorksModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=juliakornich;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
-    <add name="SchoolEntities" connectionString="metadata=res://*/School.csdl|res://*/School.ssdl|res://*/School.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=juliakornich;Initial Catalog=School;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
+    <add name="AdventureWorksEntities" connectionString="metadata=res://*/AdventureWorksModel.csdl|res://*/AdventureWorksModel.ssdl|res://*/AdventureWorksModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=localhost;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
+    <add name="SchoolEntities" connectionString="metadata=res://*/School.csdl|res://*/School.ssdl|res://*/School.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=localhost;Initial Catalog=School;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/snippets/csharp/System.IdentityModel.Services/SessionAuthenticationModule/Overview/web.config.backup.1 b/snippets/csharp/System.IdentityModel.Services/SessionAuthenticationModule/Overview/web.config.backup.1
deleted file mode 100644
index 4e807904ac4..00000000000
--- a/snippets/csharp/System.IdentityModel.Services/SessionAuthenticationModule/Overview/web.config.backup.1
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <appSettings>
-    <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="WebForms" />
-  </appSettings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime requestValidationMode="4.5" targetFramework="4.5" encoderType="System.Web.Security.AntiXss.AntiXssEncoder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <pages controlRenderingCompatibilityVersion="4.5" />
-    <machineKey compatibilityMode="Framework45" />
-    <authentication mode="Forms">
-      <forms loginUrl="~/Account/Login.aspx" timeout="2880" ticketCompatibilityMode="Framework40" />
-    </authentication>
-    <roleManager enabled="false" defaultProvider="DefaultRoleProvider">
-      <providers>
-        <clear />
-        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
-        <add name="DefaultRoleProvider" type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </roleManager>
-    <profile defaultProvider="DefaultProfileProvider">
-      <providers>
-        <add name="DefaultProfileProvider" type="System.Web.Providers.DefaultProfileProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </profile>
-    <membership defaultProvider="DefaultMembershipProvider">
-      <providers>
-        <add name="DefaultMembershipProvider" type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
-      </providers>
-    </membership>
-    <sessionState mode="InProc" customProvider="DefaultSessionProvider">
-      <providers>
-        <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </sessionState>
-  </system.web>
-  <connectionStrings>
-    <add name="DefaultConnection" connectionString="Data Source=(LocalDB)\v11.0;Initial Catalog=aspnet-WebApplication1-20111111115649;Integrated Security=True;MultipleActiveResultSets=True"
-      providerName="System.Data.SqlClient" />
-  </connectionStrings>
-</configuration>
\ No newline at end of file
diff --git a/snippets/csharp/System.IdentityModel.Services/SignInRequestMessage/Overview/web.config.backup.1 b/snippets/csharp/System.IdentityModel.Services/SignInRequestMessage/Overview/web.config.backup.1
deleted file mode 100644
index 4e807904ac4..00000000000
--- a/snippets/csharp/System.IdentityModel.Services/SignInRequestMessage/Overview/web.config.backup.1
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <appSettings>
-    <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="WebForms" />
-  </appSettings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime requestValidationMode="4.5" targetFramework="4.5" encoderType="System.Web.Security.AntiXss.AntiXssEncoder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <pages controlRenderingCompatibilityVersion="4.5" />
-    <machineKey compatibilityMode="Framework45" />
-    <authentication mode="Forms">
-      <forms loginUrl="~/Account/Login.aspx" timeout="2880" ticketCompatibilityMode="Framework40" />
-    </authentication>
-    <roleManager enabled="false" defaultProvider="DefaultRoleProvider">
-      <providers>
-        <clear />
-        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
-        <add name="DefaultRoleProvider" type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </roleManager>
-    <profile defaultProvider="DefaultProfileProvider">
-      <providers>
-        <add name="DefaultProfileProvider" type="System.Web.Providers.DefaultProfileProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </profile>
-    <membership defaultProvider="DefaultMembershipProvider">
-      <providers>
-        <add name="DefaultMembershipProvider" type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
-      </providers>
-    </membership>
-    <sessionState mode="InProc" customProvider="DefaultSessionProvider">
-      <providers>
-        <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </sessionState>
-  </system.web>
-  <connectionStrings>
-    <add name="DefaultConnection" connectionString="Data Source=(LocalDB)\v11.0;Initial Catalog=aspnet-WebApplication1-20111111115649;Integrated Security=True;MultipleActiveResultSets=True"
-      providerName="System.Data.SqlClient" />
-  </connectionStrings>
-</configuration>
\ No newline at end of file
diff --git a/snippets/csharp/System.IdentityModel.Services/WSFederationAuthenticationModule/Overview/web.config.backup.1 b/snippets/csharp/System.IdentityModel.Services/WSFederationAuthenticationModule/Overview/web.config.backup.1
deleted file mode 100644
index 4e807904ac4..00000000000
--- a/snippets/csharp/System.IdentityModel.Services/WSFederationAuthenticationModule/Overview/web.config.backup.1
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  http://go.microsoft.com/fwlink/?LinkId=169433
-  -->
-<configuration>
-  <appSettings>
-    <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="WebForms" />
-  </appSettings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime requestValidationMode="4.5" targetFramework="4.5" encoderType="System.Web.Security.AntiXss.AntiXssEncoder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <pages controlRenderingCompatibilityVersion="4.5" />
-    <machineKey compatibilityMode="Framework45" />
-    <authentication mode="Forms">
-      <forms loginUrl="~/Account/Login.aspx" timeout="2880" ticketCompatibilityMode="Framework40" />
-    </authentication>
-    <roleManager enabled="false" defaultProvider="DefaultRoleProvider">
-      <providers>
-        <clear />
-        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
-        <add name="DefaultRoleProvider" type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </roleManager>
-    <profile defaultProvider="DefaultProfileProvider">
-      <providers>
-        <add name="DefaultProfileProvider" type="System.Web.Providers.DefaultProfileProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </profile>
-    <membership defaultProvider="DefaultMembershipProvider">
-      <providers>
-        <add name="DefaultMembershipProvider" type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
-      </providers>
-    </membership>
-    <sessionState mode="InProc" customProvider="DefaultSessionProvider">
-      <providers>
-        <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
-      </providers>
-    </sessionState>
-  </system.web>
-  <connectionStrings>
-    <add name="DefaultConnection" connectionString="Data Source=(LocalDB)\v11.0;Initial Catalog=aspnet-WebApplication1-20111111115649;Integrated Security=True;MultipleActiveResultSets=True"
-      providerName="System.Data.SqlClient" />
-  </connectionStrings>
-</configuration>
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/source.cs
index 3fee1b2cb1c..d533e0a3ff5 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/source.cs	
@@ -4,10 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-    }
     // <Snippet1>
     public void InsertRow(string connectionString, string insertSQL)
     {
@@ -31,6 +27,6 @@ public void InsertRow(string connectionString, string insertSQL)
             // The connection is automatically closed when the
             // code exits the using block.
         }
-        // </Snippet1>
     }
+    // </Snippet1>
 }
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/source.cs
index 3c0ac36c465..432ea039af5 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/source.cs	
@@ -4,11 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        ExecuteTransaction(connectionString);
-    }
     // <Snippet1>
     public static void ExecuteTransaction(string connectionString)
     {
@@ -61,6 +56,6 @@ public static void ExecuteTransaction(string connectionString)
             // The connection is automatically closed when the
             // code exits the using block.
         }
-        // </Snippet1>
     }
+    // </Snippet1>
 }
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs
index 3c0ac36c465..432ea039af5 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs	
@@ -4,11 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        ExecuteTransaction(connectionString);
-    }
     // <Snippet1>
     public static void ExecuteTransaction(string connectionString)
     {
@@ -61,6 +56,6 @@ public static void ExecuteTransaction(string connectionString)
             // The connection is automatically closed when the
             // code exits the using block.
         }
-        // </Snippet1>
     }
+    // </Snippet1>
 }
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/source.cs
index e5d7180cabd..53ec3b2ac53 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/source.cs	
@@ -7,14 +7,6 @@ namespace Classic_WebData_OdbcConnection.CloseCS
 {
 	class Program
 	{
-		static void Main(string[] args)
-		{
-			string connectionString;
-			connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-
-			CreateOdbcConnection(connectionString);
-		}
-
 		// <Snippet1>
 		private static void CreateOdbcConnection(string connectionString)
 		{
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/source.cs
index 7f7abb85a06..5767b6b5c32 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/source.cs	
@@ -7,14 +7,6 @@ namespace Classic_WebData_OdbcConnectionCS
 {
 	class Program
 	{
-		static void Main()
-		{
-			string connectionString;
-			connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-
-			InsertRow(connectionString);
-		}
-
 		// <Snippet1>
 		static private void InsertRow(string connectionString)
 		{
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/source.cs
index 773df29712d..d0501376f81 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     //<Snippet1>
     public static OdbcDataAdapter CreateDataAdapter(
         OdbcConnection connection)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/source.cs
index 21004c745d1..924e2ee4879 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/source.cs	
@@ -4,11 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-    }
-
     // <Snippet1>
     public DataSet GetDataSetFromAdapter(
         DataSet dataSet, string connectionString, string queryString)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/Project.csproj
new file mode 100644
index 00000000000..283a2efeb88
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/source.cs
index b557a3aa06f..976d0d76abb 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        //string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
-        //string x = "DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    }
-
     // <Snippet1>
     public DataSet GetDataSetFromAdapter(
         DataSet dataSet, string connectionString, string queryString)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/Project.csproj
new file mode 100644
index 00000000000..97983414e1e
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Oledb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/source.cs
index 4d87fc4a868..846bfa072a3 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/source.cs	
@@ -8,8 +8,7 @@ class Program
     {
         static void Main()
         {
-            string connectionString = "Provider=sqloledb;Data Source=(local);Initial Catalog=Northwind;"
-                + "Integrated Security=SSPI";
+            string connectionString = "Provider=sqloledb;Data Source=(local);Initial Catalog=Northwind;Integrated Security=SSPI";
             string queryString = "UPDATE Shippers SET CompanyName = 'Speedy Expresss' WHERE ShipperID = 1";
             CreateOleDbCommand(queryString, connectionString);
             Console.ReadLine();
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/Project.csproj
new file mode 100644
index 00000000000..ed52be723a6
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Oledb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/source.cs
index dbe5c864f62..4fffeecc2a8 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/source.cs	
@@ -6,14 +6,6 @@ namespace OleDbCommandPrepareCS
 {
     class Program
     {
-        static void Main()
-        {
-            string connectionString = "Provider=sqloledb;Data Source=(local);Initial Catalog=Northwind;"
-                + "Integrated Security=SSPI";
-            OleDbCommandPrepare(connectionString);
-            Console.ReadLine();
-        }
-
         // <Snippet1>
         private static void OleDbCommandPrepare(string connectionString)
         {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/Project.csproj
new file mode 100644
index 00000000000..ed52be723a6
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Oledb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/source.cs
index 85ae4b28733..d5fe617a207 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/source.cs	
@@ -4,12 +4,6 @@
 
 class Class1
 {
-    static void Main()
-    {
-        string x = "Provider=SQLOLEDB;Data Source=(local);Integrated Security=SSPI;Initial Catalog=Northwind";
-        ReadData(x);
-    }
-
     // <Snippet1>
     public static void ReadData(string connectionString)
     {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/Project.csproj
new file mode 100644
index 00000000000..ed52be723a6
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Oledb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/source.cs
index 22c5a754ba9..ebedc213c33 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/source.cs	
@@ -4,11 +4,6 @@
 
 class Class1
 {
-    static void Main()
-    {
-        //        string x = "Provider=SQLOLEDB;Data Source=(local);Integrated Security=SSPI;Initial Catalog=Northwind";
-    }
-
     // <Snippet1>
     public DataSet GetDataSetFromAdapter(
         DataSet dataSet, string connectionString, string queryString)
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/Project.csproj
new file mode 100644
index 00000000000..1c164d356f7
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/source.cs
index 38156804352..d259578fe2c 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/source.cs	
@@ -8,12 +8,6 @@ namespace SqlCommandCS
 {
     class Program
     {
-        static void Main()
-        {
-            string str = "Data Source=(local);Initial Catalog=Northwind;"
-                + "Integrated Security=SSPI";
-            ReadOrderData(str);
-        }
         // <Snippet1>
         private static void ReadOrderData(string connectionString)
         {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/CS/Project.csproj
new file mode 100644
index 00000000000..40f16ef424e
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/CS/Project.csproj
new file mode 100644
index 00000000000..40f16ef424e
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/CS/Project.csproj
new file mode 100644
index 00000000000..40f16ef424e
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Project.csproj
new file mode 100644
index 00000000000..0ff7e2c779d
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Source.cs
index f2755c1a916..24de3ae7c0f 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Source.cs	
@@ -6,12 +6,6 @@ namespace SqlPrepareCS
 {
     class Program
     {
-        static void Main()
-        {
-            string connectionString = "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)";
-            SqlCommandPrepareEx(connectionString);
-            Console.ReadLine();
-        }
         // <Snippet1>
         private static void SqlCommandPrepareEx(string connectionString)
         {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/CS/Project.csproj
new file mode 100644
index 00000000000..40f16ef424e
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/Project.csproj
index 9de5f49321c..b8fcb56ef9d 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/Project.csproj	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/Project.csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs
index 7c1bf2110a6..8f520e65ab9 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs	
@@ -6,13 +6,6 @@ namespace Transaction1CS
 {
     class Program
     {
-        static void Main()
-        {
-            string connectionString =
-                "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)";
-            ExecuteSqlTransaction(connectionString);
-            Console.ReadLine();
-        }
         // <Snippet1>
         private static void ExecuteSqlTransaction(string connectionString)
         {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/Project.csproj
new file mode 100644
index 00000000000..1c164d356f7
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/source.cs
index ba2fc1da85a..6fc3c7ee3ce 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/source.cs	
@@ -4,13 +4,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        string connectionString =
-            "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)";
-        ExecuteSqlTransaction(connectionString);
-        Console.ReadLine();
-    }
     // <Snippet1>
     private static void ExecuteSqlTransaction(string connectionString)
     {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/Project.csproj
index 9de5f49321c..b8fcb56ef9d 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/Project.csproj	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/Project.csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/source.cs
index 5d9481de004..a5d8137f8ac 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/source.cs	
@@ -6,13 +6,6 @@ namespace Transaction1CS
 {
     class Program
     {
-        static void Main()
-        {
-            string connectionString =
-                "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)";
-            ExecuteSqlTransaction(connectionString);
-            Console.ReadLine();
-        }
         // <Snippet1>
         private static void ExecuteSqlTransaction(string connectionString)
         {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/Project.csproj
index 9de5f49321c..b8fcb56ef9d 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/Project.csproj	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/Project.csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/source.cs
index 526a9b14528..af32b2bbdb2 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/source.cs	
@@ -6,13 +6,6 @@ namespace Transaction1CS
 {
     class Program
     {
-        static void Main()
-        {
-            string connectionString =
-                "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)";
-            ExecuteSqlTransaction(connectionString);
-            Console.ReadLine();
-        }
         // <Snippet1>
         private static void ExecuteSqlTransaction(string connectionString)
         {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/Project.csproj
new file mode 100644
index 00000000000..1c164d356f7
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/source.cs
index 5df069e85c2..39227080837 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/source.cs	
@@ -5,12 +5,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        string str = "Data Source=(local);Initial Catalog=Northwind;"
-            + "Integrated Security=SSPI";
-        ReadOrderData(str);
-    }
     // <Snippet1>
     private static void ReadOrderData(string connectionString)
     {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/Project.csproj
new file mode 100644
index 00000000000..1c164d356f7
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/source.cs
index b8cac5fefd1..26e9b09fb95 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/source.cs	
@@ -5,13 +5,6 @@
 
 class Program
 {
-    static void Main()
-    {
-        string str = "Data Source=(local);Initial Catalog=Northwind;"
-            + "Integrated Security=SSPI";
-        ReadGetOrdinal(str);
-    }
-
     // <Snippet1>
     private static void ReadGetOrdinal(string connectionString)
     {
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/SqlDataReader.Read.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/SqlDataReader.Read.csproj
index 9de5f49321c..b8fcb56ef9d 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/SqlDataReader.Read.csproj	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/SqlDataReader.Read.csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs
index d124ecf4cf6..576c7339184 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs	
@@ -1,17 +1,10 @@
-// <Snippet1>
-using System;
+using System;
 using System.Data;
 using System.Data.SqlClient;
 
 class Program
 {
-    static void Main()
-    {
-        string str = "Data Source=(local);Initial Catalog=Northwind;"
-            + "Integrated Security=SSPI";
-        ReadOrderData(str);
-    }
-
+    // <Snippet1>
     private static void ReadOrderData(string connectionString)
     {
         string queryString =
@@ -41,5 +34,5 @@ private static void ReadSingleRow(IDataRecord dataRecord)
     {
         Console.WriteLine(String.Format("{0}, {1}", dataRecord[0], dataRecord[1]));
     }
+    // </Snippet1>
 }
-// </Snippet1>
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/LINQtoDataSetExamplesCS.csproj b/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/LINQtoDataSetExamplesCS.csproj
index 160408c37bf..f424ed69192 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/LINQtoDataSetExamplesCS.csproj	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/LINQtoDataSetExamplesCS.csproj	
@@ -1,60 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.20829</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{404E1785-83BF-4026-B6D7-DC2AA2228D3F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DP_LINQ_to_DataSet_Examples</RootNamespace>
-    <AssemblyName>DP LINQ to DataSet Examples</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net4.8</TargetFramework>
+    <LangVersion>11</LangVersion>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Program.cs b/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Program.cs
index f5919ba1d81..b8eedad6b24 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Program.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Program.cs	
@@ -1,14 +1,12 @@
 // <SnippetImportsUsing>
 using System;
-using System.Linq;
-using System.Linq.Expressions;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
-using System.Data.Common;
 using System.Globalization;
-// </SnippetImportsUsing>
+using System.Linq;
 using System.Windows.Forms;
+// </SnippetImportsUsing>
 
 namespace LINQtoDataSetSamples
 {
@@ -2624,8 +2622,7 @@ static void FillDataSet(DataSet ds)
                 // Create a new adapter and give it a query to fetch sales order, contact,
                 // address, and product information for sales in the year 2002. Point connection
                 // information to the configuration setting "AdventureWorks".
-                string connectionString = "Data Source=localhost;Initial Catalog=AdventureWorks;"
-                    + "Integrated Security=true;";
+                string connectionString = "Data Source=localhost;Initial Catalog=AdventureWorks;Integrated Security=true;";
 
                 SqlDataAdapter da = new SqlDataAdapter(
                     "SELECT SalesOrderID, ContactID, OrderDate, OnlineOrderFlag, " +
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Properties/AssemblyInfo.cs b/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Properties/AssemblyInfo.cs
deleted file mode 100644
index cd871ea62ac..00000000000
--- a/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DP LINQ to DataSet Examples")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("msft")]
-[assembly: AssemblyProduct("DP LINQ to DataSet Examples")]
-[assembly: AssemblyCopyright("Copyright © msft 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("98861c2d-73b2-44ca-9382-3ae1e7839cd4")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/CS/source.cs
deleted file mode 100644
index e899747029f..00000000000
--- a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/CS/source.cs	
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Data;
-using System.Data.Common;
-
-namespace ConBuilderAddCS
-{
-    class Program
-    {
-        // <Snippet1>
-        static void Main()
-        {
-            try
-            {
-                DbConnectionStringBuilder builder =
-                    new DbConnectionStringBuilder();
-                builder.Add("Data Source", "ServerName");
-                builder.Add("Initial Catalog", "TheDatabase");
-                builder.Add("User ID", "UserName");
-                builder.Add("Password", "*******");
-                builder.Add("Command Logging", false);
-
-                // Overwrite the existing "User ID" value.
-                builder.Add("User ID", "NewUserName");
-
-                // The following code would trigger
-                // an ArgumentNullException:
-                // builder.Add(null, "Some Value");
-
-                Console.WriteLine(builder.ConnectionString);
-            }
-            catch (ArgumentNullException)
-            {
-                Console.WriteLine("Null key values are not allowed.");
-            }
-
-            Console.WriteLine("Press Enter to continue.");
-            Console.ReadLine();
-        }
-        // </Snippet1>
-    }
-}
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/CS/source.cs
index 45e4307be0b..a90c8768e63 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/CS/source.cs	
@@ -15,7 +15,6 @@ static void Main()
                 DbConnectionStringBuilder();
             builder.Add("Data Source", @"c:\MyData\MyDb.mdb");
             builder.Add("Provider", "Microsoft.Jet.Oledb.4.0");
-            builder.Add("Jet OLEDB:Database Password", "********");
             builder.Add("Jet OLEDB:System Database",
                 @"c:\MyData\Workgroup.mdb");
 
@@ -62,10 +61,6 @@ static void Main()
             {
                 Console.WriteLine("Invalid connection string.");
             }
-
-            Console.WriteLine();
-            Console.WriteLine("Press Enter to finish.");
-            Console.ReadLine();
         }
         // </Snippet1>
     }
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/Project.csproj
new file mode 100644
index 00000000000..84455e1397c
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/Project.csproj
new file mode 100644
index 00000000000..09e9769f543
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/source.cs
index 7d4c4e7aa1d..ceb9945ffec 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/source.cs	
@@ -8,16 +8,13 @@ namespace ConBuilderCS
 {
     class Program
     {
-        // <Snippet1>
         static void Main()
         {
+            // <Snippet1>
             DbConnectionStringBuilder builder =
                 new DbConnectionStringBuilder();
             builder.ConnectionString = @"Data Source=c:\MyData\MyDb.mdb";
             builder.Add("Provider", "Microsoft.Jet.Oledb.4.0");
-            builder.Add("Jet OLEDB:Database Password", "*******");
-            builder.Add("Jet OLEDB:System Database",
-                @"c:\MyData\Workgroup.mdb");
             // Set up row-level locking.
             builder.Add("Jet OLEDB:Database Locking Mode", 1);
 
@@ -26,7 +23,7 @@ static void Main()
             // build any type of connection string using
             // this class.
 
-            // The ConnectionString property may have been
+            // The ConnectionString property might have been
             // formatted by the DbConnectionStringBuilder class.
             OleDbConnection oledbConnect = new
                 OleDbConnection(builder.ConnectionString);
@@ -46,25 +43,13 @@ static void Main()
             // Pass the DbConnectionStringBuilder an existing
             // connection string, and you can retrieve and
             // modify any of the elements.
-            builder.ConnectionString = "server=(local);user id=*******;" +
-                "password=*******;initial catalog=AdventureWorks";
+            builder.ConnectionString = "server=(local);initial catalog=AdventureWorks";
             builder["Server"] = ".";
-            builder.Remove("User ID");
 
-            // Note that calling Remove on a nonexistent item doesn't
-            // throw an exception.
-            builder.Remove("BadItem");
-
-            // Setting the indexer adds the value if
-            // necessary.
+            // Setting the indexer adds the value, if necessary.
             builder["Integrated Security"] = true;
-            builder.Remove("password");
-            builder["User ID"] = "Hello";
             Console.WriteLine(builder.ConnectionString);
-
-            Console.WriteLine("Press Enter to finish.");
-            Console.ReadLine();
+            // </Snippet1>
         }
-        // </Snippet1>
     }
 }
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/CS/source.cs
deleted file mode 100644
index 6f2f4cda7b2..00000000000
--- a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/CS/source.cs	
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Data;
-// <Snippet1>
-using System.Data.OleDb;
-
-class Program
-{
-    static void Main()
-    {
-        OleDbConnectionStringBuilder builder =
-            new OleDbConnectionStringBuilder();
-        builder.ConnectionString = @"Data Source=c:\Sample.mdb";
-
-        // Call the Add method to explicitly add key/value
-        // pairs to the internal collection.
-        builder.Add("Provider", "Microsoft.Jet.Oledb.4.0");
-        builder.Add("Jet OLEDB:Database Password", "MyPassword!");
-        builder.Add("Jet OLEDB:System Database", @"C:\Workgroup.mdb");
-
-        // set up row-level locking.
-        builder.Add("Jet OLEDB:Database Locking Mode", 1);
-
-        // Dump the contents of the "filled-in"
-        // OleDbConnectionStringBuilder
-        // to the console window.
-        DumpBuilderContents(builder);
-
-        // Clear current values and reset known keys to their
-        // default values.
-        builder.Clear();
-
-        // Dump the contents of the newly emptied
-        // OleDbConnectionStringBuilder
-        // to the console window.
-        DumpBuilderContents(builder);
-
-        Console.WriteLine("Press Enter to continue.");
-        Console.ReadLine();
-    }
-
-    private static void DumpBuilderContents(OleDbConnectionStringBuilder builder)
-    {
-        Console.WriteLine("=================");
-        Console.WriteLine("builder.ConnectionString = " + builder.ConnectionString);
-        foreach (string key in builder.Keys)
-        {
-            Console.WriteLine(key + "=" + builder[key].ToString());
-        }
-    }
-}
-// </Snippet1>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/Project.csproj
new file mode 100644
index 00000000000..ccdf2c3dbe0
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/Project.csproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.OleDb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/source.cs
index fbc5fe5a81d..b5ad7718737 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/source.cs	
@@ -11,7 +11,6 @@ static void Main()
         builder.Provider = "Microsoft.Jet.Oledb.4.0";
         builder.DataSource = @"C:\Sample.mdb";
         // Set properties using the Item property (the indexer, in C#).
-        builder["Jet OLEDB:Database Password"] = "DataPassword";
         builder["Jet OLEDB:Encrypt Database"] = true;
         builder["Jet OLEDB:System database"] = @"C:\Workgroup.mdw";
 
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/Project.csproj
new file mode 100644
index 00000000000..56e4f6a80fe
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/Project.csproj	
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oracle.ManagedDataAccess" Version="23.5.1" />
+    <PackageReference Include="System.Data.OracleClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/source.cs
index 32e115e4e0d..28f8e499f62 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/source.cs	
+++ b/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/source.cs	
@@ -1,35 +1,24 @@
 using System;
-using System.Data;
-// <Snippet1>
-// You may need to set a reference to the System.Data.OracleClient
-// assembly before you can run this sample.
-using System.Data.OracleClient;
+using Oracle.ManagedDataAccess.Client;
 
 class Program
 {
     static void Main()
     {
+        // <Snippet1>
         OracleConnectionStringBuilder builder =
-            new OracleConnectionStringBuilder(GetConnectionString());
-        Console.WriteLine("Connection string = " + builder.ConnectionString);
+            new(GetConnectionString());
+        Console.WriteLine($"Connection string = '{builder.ConnectionString}'");
 
-        // Keys you have provided return true.
+        // Keys you've provided return true.
         Console.WriteLine(builder.ContainsKey("Integrated Security"));
 
-        // Comparison is case insensitive, and synonyms for the
-        // keywords are translated to well-known names.
-        // The following returns true because "PWD" is a
-        // synonym for "Password", a valid key.
-        Console.WriteLine(builder.ContainsKey("PWD"));
-
         // Keys that are valid but have not been set return true.
         Console.WriteLine(builder.ContainsKey("Unicode"));
 
         // Keys that do not exist return false.
         Console.WriteLine(builder.ContainsKey("MyKey"));
-
-        Console.WriteLine("Press Enter to continue.");
-        Console.ReadLine();
+        // </Snippet1>
     }
 
     private static string GetConnectionString()
@@ -39,4 +28,3 @@ private static string GetConnectionString()
         return "Server=OracleDemo;Integrated Security=True";
     }
 }
-// </Snippet1>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/Project.csproj
new file mode 100644
index 00000000000..1a9c4110a6a
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/Project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="System.Data.Odbc" />
+    <PackageReference Include="System.Data.OleDb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/source.cs
index fd77b30bd3a..327ca79b93d 100644
--- a/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/source.cs
+++ b/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/source.cs
@@ -5,95 +5,102 @@
 using System.Data.OleDb;
 using System.Data.Odbc;
 
-class Program {
-   static void Main(string[] args) {
-
-      // string connectionTypeName = "SqlClient";
-      // string connectionString = @"Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security=SSPI";
-
-      // string connectionTypeName = "Odbc";
-      // string connectionString = @"Driver={SQL Server Native Client 11.0};Server=(local);Database=AdventureWorks2012;Trusted_Connection=Yes";
-
-      string connectionTypeName = "OleDb";
-      string connectionString = @"Provider=SQLNCLI11;Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security=SSPI";
-
-      using (IDbConnection connection = DatabaseConnectionFactory.GetConnection(connectionTypeName, connectionString)) {
-         IDbCommand command = connection.CreateCommand();
-         command.Connection = connection;
-
-         // these 2 queries are executed as a single batch and return 2 separate results
-         command.CommandText = "SELECT CountryRegionCode, Name FROM Person.CountryRegion;" + "SELECT CountryRegionCode, StateProvinceCode, Name, StateProvinceID FROM Person.StateProvince;";
-
-         connection.Open();
-
-         using (IDataReader reader = command.ExecuteReader()) {
-
-            // process the first result
-            displayCountryRegions(reader);
-
-            // use NextResult to move to the second result and verify it is returned
-            if (!reader.NextResult())
-               throw new InvalidOperationException("Expected second result (StateProvinces) but only one was returned");
-
-            // process the second result
-            displayStateProvinces(reader);
-
-            reader.Close();
-         }
-
-         connection.Close();
-      }
-   }
-
-   static void displayCountryRegions(IDataReader reader) {
-      if (reader.FieldCount != 2)
-         throw new InvalidOperationException("First resultset (CountryRegions) must contain exactly 2 columns");
-
-      while (reader.Read()) {
-         Console.WriteLine("CountryRegionCode={0}, Name={1}"
-             , reader.GetString(reader.GetOrdinal("CountryRegionCode"))
-             , reader.GetString(reader.GetOrdinal("Name")));
-      }
-   }
-
-   static void displayStateProvinces(IDataReader reader) {
-      if (reader.FieldCount != 4)
-         throw new InvalidOperationException("Second resultset (StateProvinces) must contain exactly 4 columns");
-
-      while (reader.Read()) {
-         Console.WriteLine("CountryRegionCode={0}, StateProvinceCode={1}, Name={2}, StateProvinceID={3}"
-             , reader.GetString(reader.GetOrdinal("CountryRegionCode"))
-             , reader.GetString(reader.GetOrdinal("StateProvinceCode"))
-             , reader.GetString(reader.GetOrdinal("Name"))
-             , reader.GetInt32(reader.GetOrdinal("StateProvinceID")));
-      }
-   }
-
-   class DatabaseConnectionFactory {
-      static SqlConnection GetSqlConnection(string connectionString) {
-         return new SqlConnection(connectionString);
-      }
-
-      static OdbcConnection GetOdbcConnection(string connectionString) {
-         return new OdbcConnection(connectionString);
-      }
-
-      static OleDbConnection GetOleDbConnection(string connectionString) {
-         return new OleDbConnection(connectionString);
-      }
-
-      public static IDbConnection GetConnection(string connectionTypeName, string connectionString) {
-         switch (connectionTypeName) {
-            case "SqlClient":
-               return GetSqlConnection(connectionString);
-            case "Odbc":
-               return GetOdbcConnection(connectionString);
-            case "OleDb":
-               return GetOleDbConnection(connectionString);
-            default:
-               throw new ArgumentException("Value must be SqlClient, Odbc or OleDb", "connectionTypeName");
-         }
-      }
-   }
+class Program
+{
+    static void Main(string[] args)
+    {
+        string connectionTypeName = "OleDb";
+        string connectionString = @"Provider=SQLNCLI11;Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security=SSPI";
+
+        using (IDbConnection connection = DatabaseConnectionFactory.GetConnection(connectionTypeName, connectionString))
+        {
+            IDbCommand command = connection.CreateCommand();
+            command.Connection = connection;
+
+            // these 2 queries are executed as a single batch and return 2 separate results
+            command.CommandText = "SELECT CountryRegionCode, Name FROM Person.CountryRegion;" + "SELECT CountryRegionCode, StateProvinceCode, Name, StateProvinceID FROM Person.StateProvince;";
+
+            connection.Open();
+
+            using (IDataReader reader = command.ExecuteReader())
+            {
+
+                // process the first result
+                displayCountryRegions(reader);
+
+                // use NextResult to move to the second result and verify it is returned
+                if (!reader.NextResult())
+                    throw new InvalidOperationException("Expected second result (StateProvinces) but only one was returned");
+
+                // process the second result
+                displayStateProvinces(reader);
+
+                reader.Close();
+            }
+
+            connection.Close();
+        }
+    }
+
+    static void displayCountryRegions(IDataReader reader)
+    {
+        if (reader.FieldCount != 2)
+            throw new InvalidOperationException("First resultset (CountryRegions) must contain exactly 2 columns");
+
+        while (reader.Read())
+        {
+            Console.WriteLine("CountryRegionCode={0}, Name={1}"
+                , reader.GetString(reader.GetOrdinal("CountryRegionCode"))
+                , reader.GetString(reader.GetOrdinal("Name")));
+        }
+    }
+
+    static void displayStateProvinces(IDataReader reader)
+    {
+        if (reader.FieldCount != 4)
+            throw new InvalidOperationException("Second resultset (StateProvinces) must contain exactly 4 columns");
+
+        while (reader.Read())
+        {
+            Console.WriteLine("CountryRegionCode={0}, StateProvinceCode={1}, Name={2}, StateProvinceID={3}"
+                , reader.GetString(reader.GetOrdinal("CountryRegionCode"))
+                , reader.GetString(reader.GetOrdinal("StateProvinceCode"))
+                , reader.GetString(reader.GetOrdinal("Name"))
+                , reader.GetInt32(reader.GetOrdinal("StateProvinceID")));
+        }
+    }
+
+    class DatabaseConnectionFactory
+    {
+        static SqlConnection GetSqlConnection(string connectionString)
+        {
+            return new SqlConnection(connectionString);
+        }
+
+        static OdbcConnection GetOdbcConnection(string connectionString)
+        {
+            return new OdbcConnection(connectionString);
+        }
+
+        static OleDbConnection GetOleDbConnection(string connectionString)
+        {
+            return new OleDbConnection(connectionString);
+        }
+
+        public static IDbConnection GetConnection(string connectionTypeName, string connectionString)
+        {
+            switch (connectionTypeName)
+            {
+                case "SqlClient":
+                    return GetSqlConnection(connectionString);
+                case "Odbc":
+                    return GetOdbcConnection(connectionString);
+                case "OleDb":
+                    return GetOleDbConnection(connectionString);
+                default:
+                    throw new ArgumentException("Value must be SqlClient, Odbc, or OleDb", "connectionTypeName");
+            }
+        }
+    }
 }
-// </Snippet1>
\ No newline at end of file
+// </Snippet1>
diff --git a/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConfigurationStringSettings.cs b/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConfigurationStringSettings.cs
index 516cb501693..74d4f344b27 100644
--- a/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConfigurationStringSettings.cs
+++ b/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConfigurationStringSettings.cs
@@ -1,17 +1,12 @@
 // <Snippet21>
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Web.Configuration;
-using System.Collections;
-using System.Text;
 
 namespace ConfigurationStringSettings
 {
-
     class ConfigurationStringSettings
     {
-
         static void DisplayConnectionStrings()
         {
             // Set the path of the config file.
@@ -64,4 +59,4 @@ static void Main(string[] args)
         }
     }
 }
-// </Snippet21>
\ No newline at end of file
+// </Snippet21>
diff --git a/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs b/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs
index 17012e93d5a..5806f9c06ef 100644
--- a/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs
+++ b/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Configuration;
-using System.Text;
 
 namespace Samples.AspNet
 {
     class ConnectionStrings
     {
-
         // <Snippet1>
-        // Create a connectionn string element and add it to
+        // Create a connection string element and add it to
         // the connection strings section.
         static ConnectionStrings()
         {
@@ -18,20 +16,20 @@ static ConnectionStrings()
                     ConfigurationUserLevel.None);
 
             // Get the current connection strings count.
-            int connStrCnt = 
+            int connStrCnt =
                 ConfigurationManager.ConnectionStrings.Count;
- 
-            // Create the connection string name. 
-            string csName = 
+
+            // Create the connection string name.
+            string csName =
                 "ConnStr" + connStrCnt.ToString();
 
             // Create a connection string element and
             // save it to the configuration file.
-           
+
             // Create a connection string element.
             ConnectionStringSettings csSettings =
                     new ConnectionStringSettings(csName,
-                    "LocalSqlServer: data source=127.0.0.1;Integrated Security=SSPI;" +
+                    "LocalSqlServer: data source=127.0.0.1;Integrated Security=True;" +
                     "Initial Catalog=aspnetdb", "System.Data.SqlClient");
 
             // Get the connection strings section.
@@ -40,7 +38,7 @@ static ConnectionStrings()
 
             // Add the new element.
             csSection.ConnectionStrings.Add(csSettings);
-                
+
             // Save the configuration file.
             config.Save(ConfigurationSaveMode.Modified);
         }
@@ -49,35 +47,33 @@ static ConnectionStrings()
         // <Snippet2>
         static void ShowConnectionStrings()
         {
-             // Get the application configuration file.
+            // Get the application configuration file.
             System.Configuration.Configuration config =
                     ConfigurationManager.OpenExeConfiguration(
                     ConfigurationUserLevel.None);
 
             // <Snippet3>
-            // Get the conectionStrings section.
+            // Get the connectionStrings section.
             ConnectionStringsSection csSection =
                 config.ConnectionStrings;
-            
-            for (int i = 0; i < 
+
+            for (int i = 0; i <
                 ConfigurationManager.ConnectionStrings.Count; i++)
             {
-                ConnectionStringSettings cs = 
+                ConnectionStringSettings cs =
                     csSection.ConnectionStrings[i];
-                
+
                 // <Snippet4>
-                Console.WriteLine("  Connection String: \"{0}\"",
-                    cs.ConnectionString);
+                Console.WriteLine($"  Connection String: \"{cs.ConnectionString}\"");
                 // </Snippet4>
 
-                Console.WriteLine("#{0}", i);
+                Console.WriteLine($"#{i}");
                 // <Snippet5>
-                Console.WriteLine("  Name: {0}", cs.Name);
+                Console.WriteLine($"  Name: {cs.Name}");
                 // </Snippet5>
 
                 // <Snippet6>
-                Console.WriteLine("  Provider Name: {0}", 
-                    cs.ProviderName);
+                Console.WriteLine($"  Provider Name: {cs.ProviderName}");
                 // </Snippet6>
             }
             // </Snippet3>
@@ -90,27 +86,27 @@ static void ShowConnectionStrings()
         // configuration file.
         static void AddConnectionStrings()
         {
-           
+
             // Get the count of the connection strings.
-            int connStrCnt = 
+            int connStrCnt =
                 ConfigurationManager.ConnectionStrings.Count;
-            
+
             // Define the string name.
-            string csName = "ConnStr" + 
+            string csName = "ConnStr" +
                 connStrCnt.ToString();
 
             // Get the configuration file.
             System.Configuration.Configuration config =
                 ConfigurationManager.OpenExeConfiguration(
                 ConfigurationUserLevel.None);
-            
+
             // <Snippet8>
             // Add the connection string.
             ConnectionStringsSection csSection =
                 config.ConnectionStrings;
             csSection.ConnectionStrings.Add(
                 new ConnectionStringSettings(csName,
-                    "LocalSqlServer: data source=127.0.0.1;Integrated Security=SSPI;" +
+                    "LocalSqlServer: data source=127.0.0.1;Integrated Security=True;" +
                     "Initial Catalog=aspnetdb", "System.Data.SqlClient"));
             // </Snippet8>
 
@@ -135,7 +131,7 @@ static void ClearConnectionStrings()
             ConnectionStringsSection csSection =
                 config.ConnectionStrings;
             csSection.ConnectionStrings.Clear();
-           
+
             // Save the configuration file.
             config.Save(ConfigurationSaveMode.Modified);
 
@@ -168,7 +164,7 @@ static void GetIndex()
                 int index = csCollection.IndexOf(cs);
 
                 Console.WriteLine(
-                     "Connection string settings index: {0}", 
+                     "Connection string settings index: {0}",
                      index.ToString());
             }
             catch (ConfigurationErrorsException err)
@@ -207,7 +203,7 @@ static void RemoveConnectionStrings()
 
                     // Save the configuration file.
                     config.Save(ConfigurationSaveMode.Modified);
-                    
+
                     Console.WriteLine(
                      "Connection string settings removed.");
                 }
@@ -239,7 +235,7 @@ static void RemoveConnectionStrings2()
                  csSection.ConnectionStrings;
 
                 // Remove the element.
-                    csCollection.Remove("ConnStr0");
+                csCollection.Remove("ConnStr0");
 
                 // Save the configuration file.
                 config.Save(ConfigurationSaveMode.Modified);
@@ -275,7 +271,7 @@ static void RemoveConnectionStrings3()
 
                 // Save the configuration file.
                 config.Save(ConfigurationSaveMode.Modified);
-                
+
                 Console.WriteLine(
                      "Connection string settings removed.");
             }
@@ -337,7 +333,7 @@ static void GetItems2()
                 // with the specified name.
                 ConnectionStringSettings cs =
                     csCollection["ConnStr0"];
-               
+
                 Console.WriteLine(
                     "cs: {0}", cs.Name);
             }
@@ -350,7 +346,7 @@ static void GetItems2()
 
         static void Main(string[] args)
         {
-            
+
             // Display current connection strings.
             // ShowConnectionStrings();
 
diff --git a/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/Project.csproj b/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/Project.csproj
new file mode 100644
index 00000000000..fb21df9241f
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/Project.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Web" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/Project.csproj b/snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/Project.csproj
new file mode 100644
index 00000000000..51ddd88b23d
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/Project.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/WebConfigurationManager.cs b/snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/WebConfigurationManager.cs
index 07da1561c3a..4311bf38fef 100644
--- a/snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/WebConfigurationManager.cs
+++ b/snippets/csharp/VS_Snippets_WebNet/System.Web.Configuration.WebConfigurationManager/CS/WebConfigurationManager.cs
@@ -11,11 +11,11 @@ namespace Samples.Aspnet
     class UsingWebConfigurationManager
     {
 
-        // Methods to access a section at runtime. 
+        // Methods to access a section at runtime.
 
         // <Snippet2>
 
-        // Show how to use the GetSection(string). 
+        // Show how to use the GetSection(string).
         // to access the connectionStrings section.
         static void GetConnectionStringsSection()
         {
@@ -28,12 +28,12 @@ static void GetConnectionStringsSection()
             // Get the connectionStrings key,value pairs collection.
             ConnectionStringSettingsCollection connectionStrings =
                 connectionStringsSection.ConnectionStrings;
-           
+
             // Get the collection enumerator.
             IEnumerator connectionStringsEnum =
                 connectionStrings.GetEnumerator();
 
-            // Loop through the collection and 
+            // Loop through the collection and
             // display the connectionStrings key, value pairs.
             int i = 0;
             Console.WriteLine("[Display the connectionStrings]");
@@ -52,14 +52,14 @@ static void GetConnectionStringsSection()
 
         // <Snippet5>
 
-       // Show the use of GetSection(string, string). 
+       // Show the use of GetSection(string, string).
        // to access the connectionStrings section.
         static void GetSection2()
         {
 
             try
             {
-                // Get the connectionStrings section for the 
+                // Get the connectionStrings section for the
                 // specified Web app. This GetSection overload
                 // can olny be called from within a Web application.
                 ConnectionStringsSection connectionStringsSection =
@@ -74,7 +74,7 @@ static void GetSection2()
                 IEnumerator connectionStringsEnum =
                     connectionStrings.GetEnumerator();
 
-                // Loop through the collection and 
+                // Loop through the collection and
                 // display the connectionStrings key, value pairs.
                 int i = 0;
                 Console.WriteLine("[Display connectionStrings]");
@@ -99,7 +99,7 @@ static void GetSection2()
 
         // <Snippet6>
 
-       // Show the use of GetWebApplicationSection(string). 
+       // Show the use of GetWebApplicationSection(string).
        // to get the connectionStrings section.
         static void GetWebApplicationSection()
         {
@@ -117,7 +117,7 @@ static void GetWebApplicationSection()
             IEnumerator connectionStringsEnum =
                 connectionStrings.GetEnumerator();
 
-            // Loop through the collection and 
+            // Loop through the collection and
             // display the connectionStrings key, value pairs.
             int i = 0;
             Console.WriteLine("[Display connectionStrings]");
@@ -150,7 +150,7 @@ static void GetConnectionStrings()
             IEnumerator connectionStringsEnum =
                 connectionStrings.GetEnumerator();
 
-            // Loop through the collection and 
+            // Loop through the collection and
             // display the connectionStrings key, value pairs.
             int i = 0;
             Console.WriteLine("[Display connectionStrings]");
@@ -170,7 +170,7 @@ static void GetConnectionStrings()
         // <Snippet8>
 
         // Show the use of the AppSettings property
-        // to get the application settings. 
+        // to get the application settings.
         static void GetAppSettings()
         {
 
@@ -183,7 +183,7 @@ static void GetAppSettings()
             IEnumerator appSettingsEnum =
                 appSettings.GetEnumerator();
 
-            // Loop through the collection and 
+            // Loop through the collection and
             // display the appSettings key, value pairs.
             int i = 0;
             Console.WriteLine("[Display appSettings]");
@@ -200,15 +200,15 @@ static void GetAppSettings()
 
         // </Snippet8>
 
-        // Methods to access configuration files 
+        // Methods to access configuration files
         // not at runtime. These methods are
         // used to edit configuration files.
 
         // <Snippet9>
 
         // Show how to use OpenMachineConfiguration().
-        // It gets the machine.config file on the current 
-        // machine and displays section information. 
+        // It gets the machine.config file on the current
+        // machine and displays section information.
         static void OpenMachineConfiguration1()
         {
             // Get the machine.config file on the current machine.
@@ -228,7 +228,7 @@ static void OpenMachineConfiguration1()
             Console.WriteLine("[Total number of sections: {0}]", i);
 
             // Display machine.config path.
-            Console.WriteLine("[File path: {0}]", config.FilePath); 
+            Console.WriteLine("[File path: {0}]", config.FilePath);
         }
 
         // </Snippet9>
@@ -236,13 +236,13 @@ static void OpenMachineConfiguration1()
         // <Snippet10>
 
         // Show how to use OpenMachineConfiguration(string).
-        // It gets the machine.config file applicabe to the
-        // specified resource and displays section 
-        // basic information. 
+        // It gets the machine.config file applicable to the
+        // specified resource and displays section
+        // basic information.
         static void OpenMachineConfiguration2()
         {
-            // Get the machine.config file applicabe to the
-            // specified reosurce.
+            // Get the machine.config file applicable to the
+            // specified resource.
             System.Configuration.Configuration config =
                 WebConfigurationManager.OpenMachineConfiguration("configTest");
 
@@ -268,14 +268,14 @@ static void OpenMachineConfiguration2()
 
         // Show how to use OpenMachineConfiguration(string, string).
         // It gets the machine.config file on the specified server and
-        // applicabe to the specified reosurce and displays section 
-        // basic information. 
+        // applicable to the specified resource and displays section
+        // basic information.
         static void OpenMachineConfiguration3()
         {
-            // Get the machine.config file applicabe to the
-            // specified reosurce and on the specified server.
+            // Get the machine.config file applicable to the
+            // specified resource and on the specified server.
             System.Configuration.Configuration config =
-                WebConfigurationManager.OpenMachineConfiguration("configTest", 
+                WebConfigurationManager.OpenMachineConfiguration("configTest",
                 "myServer");
 
             // Loop to get the sections. Display basic information.
@@ -300,16 +300,16 @@ static void OpenMachineConfiguration3()
 
         // Show how to use OpenMachineConfiguration(string, string).
         // It gets the machine.config file on the specified server,
-        // applicabe to the specified reosurce, for the specified user
-        // and displays section basic information. 
+        // applicable to the specified resource, for the specified user
+        // and displays section basic information.
         static void OpenMachineConfiguration4()
         {
             // Get the current user token.
             IntPtr userToken =
                   System.Security.Principal.WindowsIdentity.GetCurrent().Token;
 
-            // Get the machine.config file applicabe to the
-            // specified reosurce, on the specified server for the
+            // Get the machine.config file applicable to the
+            // specified resource, on the specified server for the
             // specified user.
             System.Configuration.Configuration config =
                 WebConfigurationManager.OpenMachineConfiguration("configTest",
@@ -337,8 +337,8 @@ static void OpenMachineConfiguration4()
 
         // Show how to use OpenMachineConfiguration(string, string).
         // It gets the machine.config file on the specified server,
-        // applicabe to the specified reosurce, for the specified user
-        // and displays section basic information. 
+        // applicable to the specified resource, for the specified user
+        // and displays section basic information.
         static void OpenMachineConfiguration5()
         {
             // Set the user id and password.
@@ -347,8 +347,8 @@ static void OpenMachineConfiguration5()
             // Substitute with actual password.
             string password = "userPassword";
 
-            // Get the machine.config file applicabe to the
-            // specified reosurce, on the specified server for the
+            // Get the machine.config file applicable to the
+            // specified resource, on the specified server for the
             // specified user.
             System.Configuration.Configuration config =
                 WebConfigurationManager.OpenMachineConfiguration("configTest",
@@ -375,15 +375,15 @@ static void OpenMachineConfiguration5()
         // <Snippet14>
 
         // Show how to use OpenWebConfiguration(string).
-        // It gets he appSettings section of a Web application 
-        // runnig on the local server. 
+        // It gets he appSettings section of a Web application
+        // runnig on the local server.
         static void OpenWebConfiguration1()
         {
             // Get the configuration object for a Web application
-            // running on the local server. 
+            // running on the local server.
             System.Configuration.Configuration config =
-                WebConfigurationManager.OpenWebConfiguration("/configTest") 
-                as System.Configuration.Configuration; 
+                WebConfigurationManager.OpenWebConfiguration("/configTest")
+                as System.Configuration.Configuration;
 
             // Get the appSettings.
             KeyValueConfigurationCollection appSettings =
@@ -406,14 +406,14 @@ static void OpenWebConfiguration1()
         // <Snippet15>
 
         // Show how to use OpenWebConfiguration(string, string).
-        // It gets he appSettings section of a Web application 
-        // runnig on the local server. 
+        // It gets he appSettings section of a Web application
+        // runnig on the local server.
         static void OpenWebConfiguration2()
         {
             // Get the configuration object for a Web application
-            // running on the local server. 
+            // running on the local server.
             System.Configuration.Configuration config =
-                WebConfigurationManager.OpenWebConfiguration("/configTest", 
+                WebConfigurationManager.OpenWebConfiguration("/configTest",
                 "Default Web Site")
                 as System.Configuration.Configuration;
 
@@ -441,12 +441,12 @@ static void OpenWebConfiguration2()
         // <Snippet16>
 
         // Show how to use OpenWebConfiguration(string, string, string).
-        // It gets he appSettings section of a Web application 
-        // runnig on the local server. 
+        // It gets he appSettings section of a Web application
+        // runnig on the local server.
         static void OpenWebConfiguration3()
         {
             // Get the configuration object for a Web application
-            // running on the local server. 
+            // running on the local server.
             System.Configuration.Configuration config =
                 WebConfigurationManager.OpenWebConfiguration(
                 "/configTest", "Default Web Site", null)
@@ -462,7 +462,7 @@ static void OpenWebConfiguration3()
                 "[appSettings for app at: /configTest");
             Console.WriteLine(" site: Default Web Site");
             Console.WriteLine(" and locationSubPath: null]");
-            
+
             foreach (string key in appSettings.AllKeys)
             {
                 Console.WriteLine("Name: {0} Value: {1}",
@@ -476,22 +476,22 @@ static void OpenWebConfiguration3()
 
         // <Snippet17>
 
-        // Show how to use OpenWebConfiguration(string, string, 
+        // Show how to use OpenWebConfiguration(string, string,
         // string, string).
-        // It gets he appSettings section of a Web application 
-        // running on the specified server. 
+        // It gets he appSettings section of a Web application
+        // running on the specified server.
         // If the server is remote your application must have the
-        // required access rights to the configuration file. 
+        // required access rights to the configuration file.
         static void OpenWebConfiguration4()
         {
             // Get the configuration object for a Web application
             // running on the specified server.
-            // Null for the subPath signifies no subdir. 
+            // Null for the subPath signifies no subdir.
             System.Configuration.Configuration config =
                    WebConfigurationManager.OpenWebConfiguration(
                     "/configTest", "Default Web Site", null, "myServer")
                    as System.Configuration.Configuration;
-            
+
             // Get the appSettings.
             KeyValueConfigurationCollection appSettings =
                  config.AppSettings.Settings;
@@ -512,18 +512,18 @@ static void OpenWebConfiguration4()
 
         // <Snippet18>
 
-        // Show how to use OpenWebConfiguration(string, string, 
+        // Show how to use OpenWebConfiguration(string, string,
         // string, string, string, string).
-        // It gets he appSettings section of a Web application 
-        // running on a remote server. 
+        // It gets he appSettings section of a Web application
+        // running on a remote server.
         // If the server is remote your application must have the
-        // required access rights to the configuration file. 
+        // required access rights to the configuration file.
         static void OpenWebConfiguration5()
         {
             // Get the current user.
             string user =
                 System.Security.Principal.WindowsIdentity.GetCurrent().Name;
-            
+
             // Assign the actual password.
             string password = "userPassword";
 
@@ -554,26 +554,26 @@ static void OpenWebConfiguration5()
 
         // <Snippet19>
 
-        // Show how to use OpenWebConfiguration(string, string, 
+        // Show how to use OpenWebConfiguration(string, string,
         // string, string, IntPtr).
-        // It gets he appSettings section of a Web application 
-        // running on a remote server. 
+        // It gets he appSettings section of a Web application
+        // running on a remote server.
         // If the serve is remote your application shall have the
-        // requires access rights to the configuration file. 
+        // requires access rights to the configuration file.
         static void OpenWebConfiguration6()
         {
 
-            IntPtr userToken = 
+            IntPtr userToken =
                 System.Security.Principal.WindowsIdentity.GetCurrent().Token;
-           
-            string user = 
+
+            string user =
                 System.Security.Principal.WindowsIdentity.GetCurrent().Name;
-            
+
             // Get the configuration object for a Web application
             // running on a remote server.
             System.Configuration.Configuration config =
                 WebConfigurationManager.OpenWebConfiguration(
-                "/configTest", "Default Web Site", null, 
+                "/configTest", "Default Web Site", null,
                 "myServer", userToken) as System.Configuration.Configuration;
 
             // Get the appSettings.
@@ -597,7 +597,7 @@ static void OpenWebConfiguration6()
         // <Snippet20>
 
         // Utility to map virtual directories to physical ones.
-        // In the current physical directory maps 
+        // In the current physical directory maps
         // a physical sub-directory with its virtual directory.
         // A web.config file is created for the
         // default and the virtual directory at the appropriate level.
@@ -611,24 +611,24 @@ static WebConfigurationFileMap CreateFileMap()
 
             // Get he physical directory where this app runs.
             // We'll use it to map the virtual directories
-            // defined next. 
+            // defined next.
             string physDir = Environment.CurrentDirectory;
 
             // Create a VirtualDirectoryMapping object to use
             // as the root directory for the virtual directory
-            // named config. 
+            // named config.
             // Note: you must assure that you have a physical subdirectory
             // named config in the curremt physical directory where this
             // application runs.
-            VirtualDirectoryMapping vDirMap = 
+            VirtualDirectoryMapping vDirMap =
                 new VirtualDirectoryMapping(physDir + "\\config", true);
 
-            // Add vDirMap to the VirtualDirectories collection 
+            // Add vDirMap to the VirtualDirectories collection
             // assigning to it the virtual directory name.
             fileMap.VirtualDirectories.Add("/config", vDirMap);
 
             // Create a VirtualDirectoryMapping object to use
-            // as the default directory for all the virtual 
+            // as the default directory for all the virtual
             // directories.
             VirtualDirectoryMapping vDirMapBase =
                 new VirtualDirectoryMapping(physDir, true, "web.config");
@@ -636,15 +636,15 @@ static WebConfigurationFileMap CreateFileMap()
             // Add it to the virtual directory mapping collection.
             fileMap.VirtualDirectories.Add("/", vDirMapBase);
 
-# if DEBUG  
+# if DEBUG
             // Test at debug time.
             foreach (string key in fileMap.VirtualDirectories.AllKeys)
             {
                 Console.WriteLine("Virtual directory: {0} Physical path: {1}",
-                fileMap.VirtualDirectories[key].VirtualDirectory, 
+                fileMap.VirtualDirectories[key].VirtualDirectory,
                 fileMap.VirtualDirectories[key].PhysicalDirectory);
             }
-# endif 
+# endif
 
             // Return the mapping.
             return fileMap;
@@ -660,7 +660,7 @@ static void OpenMappedWebConfiguration1()
         {
 
             // Create the configuration directories mapping.
-            WebConfigurationFileMap fileMap = 
+            WebConfigurationFileMap fileMap =
                 CreateFileMap();
 
             try
@@ -669,10 +669,10 @@ static void OpenMappedWebConfiguration1()
                 // Get the Configuration object for the mapped
                 // virtual directory.
                 System.Configuration.Configuration config =
-                    WebConfigurationManager.OpenMappedWebConfiguration(fileMap, 
+                    WebConfigurationManager.OpenMappedWebConfiguration(fileMap,
                     "/config");
 
-                // Define a nique key for the creation of 
+                // Define a nique key for the creation of
                 // an appSettings element entry.
                 int appStgCnt = config.AppSettings.Settings.Count;
                 string asName = "AppSetting" + appStgCnt.ToString();
@@ -684,12 +684,12 @@ static void OpenMappedWebConfiguration1()
 
                 // Save to the configuration file.
                 config.Save(ConfigurationSaveMode.Modified);
-              
+
                 // Display new appSettings.
                 Console.WriteLine("Count:  [{0}]", config.AppSettings.Settings.Count);
                 foreach (string key in config.AppSettings.Settings.AllKeys)
-                { 
-                    Console.WriteLine("[{0}] = [{1}]", key, 
+                {
+                    Console.WriteLine("[{0}] = [{1}]", key,
                         config.AppSettings.Settings[key].Value);
                 }
             }
@@ -719,11 +719,11 @@ static void OpenMappedWebConfiguration2()
 
                 // Get the Configuration object for the mapped
                 // virtual directory.
-                System.Configuration.Configuration config = 
+                System.Configuration.Configuration config =
                     WebConfigurationManager.OpenMappedWebConfiguration(
                     fileMap, "/config", "config");
-                
-                // Define a nique key for the creation of 
+
+                // Define a nique key for the creation of
                 // an appSettings element entry.
                 int appStgCnt = config.AppSettings.Settings.Count;
                 string asName = "AppSetting" + appStgCnt.ToString();
@@ -737,7 +737,7 @@ static void OpenMappedWebConfiguration2()
                 config.Save(ConfigurationSaveMode.Modified);
 
                 // Display new appSettings.
-                Console.WriteLine("Count:  [{0}]", 
+                Console.WriteLine("Count:  [{0}]",
                     config.AppSettings.Settings.Count);
                 foreach (string key in config.AppSettings.Settings.AllKeys)
                 {
@@ -775,7 +775,7 @@ static void OpenMappedWebConfiguration3()
                     WebConfigurationManager.OpenMappedWebConfiguration(
                     fileMap, "/config", "config", "config");
 
-                // Define a nique key for the creation of 
+                // Define a unique key for the creation of
                 // an appSettings element entry.
                 int appStgCnt = config.AppSettings.Settings.Count;
                 string asName = "AppSetting" + appStgCnt.ToString();
@@ -789,7 +789,7 @@ static void OpenMappedWebConfiguration3()
                 config.Save(ConfigurationSaveMode.Modified);
 
                 // Display new appSettings.
-                Console.WriteLine("Count:  [{0}]", 
+                Console.WriteLine("Count:  [{0}]",
                     config.AppSettings.Settings.Count);
                 foreach (string key in config.AppSettings.Settings.AllKeys)
                 {
@@ -825,7 +825,7 @@ static void Main(string[] args)
                 case "0":
                     GetConnectionStringsSection();
                     break;
-                
+
                 case "1":
                     GetSection2();
                     break;
@@ -861,19 +861,19 @@ static void Main(string[] args)
                 case "9":
                     OpenWebConfiguration2();
                     break;
-                
+
                 case "10":
                     OpenWebConfiguration3();
                     break;
-                
+
                 case "11":
                     OpenWebConfiguration4();
                     break;
-                
+
                 case "12":
                     OpenWebConfiguration5();
                     break;
-                
+
                 case "13":
                     OpenWebConfiguration6();
                     break;
@@ -893,7 +893,7 @@ static void Main(string[] args)
                 case "17":
                     GetAppSettings();
                     break;
-                
+
                 case "18":
                     GetConnectionStrings();
                     break;
@@ -907,4 +907,4 @@ static void Main(string[] args)
         }
     }
 }
-// </Snippet1>
\ No newline at end of file
+// </Snippet1>
diff --git a/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx b/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx
deleted file mode 100644
index 46f7cc80601..00000000000
--- a/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- <Snippet1> -->
-<%@Page  Language="C#" %>
-<%@Import Namespace="System.Data" %>
-<%@Import Namespace="System.Data.Common" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!-- <Snippet2> -->
-<script runat="server">
-private void UpdateRecords(Object source, EventArgs e)
-{
-  // This method is an example of batch updating using a
-  // data source control. The method iterates through the rows
-  // of the GridView, extracts each CheckBox from the row and, if
-  // the CheckBox is checked, updates data by calling the Update
-  // method of the data source control, adding required parameters
-  // to the UpdateParameters collection.
-  CheckBox cb;
-  foreach(GridViewRow row in this.GridView1.Rows) {
-    cb = (CheckBox) row.Cells[0].Controls[1];
-    if(cb.Checked) {
-      string oid = (string) row.Cells[1].Text;
-      MyAccessDataSource.UpdateParameters.Add(new Parameter("date",TypeCode.DateTime,DateTime.Now.ToString()));
-      MyAccessDataSource.UpdateParameters.Add(new Parameter("orderid",TypeCode.String,oid));
-      MyAccessDataSource.Update();
-      MyAccessDataSource.UpdateParameters.Clear();
-    }
-  }
-}
-</script>
-<!-- </Snippet2> -->
-
-<html xmlns="http://www.w3.org/1999/xhtml" >
-  <head runat="server">
-    <title>ASP.NET Example</title>
-</head>
-<body>
-    <form id="form1" runat="server">
-<!-- <Snippet3> -->
-
-<!-- Security Note: The SqlDataSource uses a QueryStringParameter,
-     Security Note: which does not perform validation of input from the client.
-     Security Note: To validate the value of the QueryStringParameter, handle the Selecting event. -->
-
-      <asp:SqlDataSource
-        id="MyAccessDataSource"
-        runat="server"
-        ProviderName="<%$ ConnectionStrings:MyPasswordProtectedAccess.providerName%>"
-        ConnectionString="<%$ ConnectionStrings:MyPasswordProtectedAccess%>"
-        SelectCommand="SELECT OrderID, OrderDate, RequiredDate, ShippedDate FROM Orders WHERE EmployeeID=?"
-        UpdateCommand="UPDATE Orders SET ShippedDate=? WHERE OrderID = ?">
-        <SelectParameters>
-          <asp:QueryStringParameter Name="empId" QueryStringField="empId" />
-        </SelectParameters>
-      </asp:SqlDataSource>
-
-<!-- </Snippet3> -->
-      <asp:GridView
-        id ="GridView1"
-        runat="server"
-        DataSourceID="MyAccessDataSource"
-        AllowPaging="True"
-        PageSize="10"
-        AutoGenerateColumns="False">
-          <columns>
-            <asp:TemplateField HeaderText="">
-              <ItemTemplate>
-                <asp:CheckBox runat="server" />
-              </ItemTemplate>
-            </asp:TemplateField>
-            <asp:BoundField HeaderText="Order" DataField="OrderID" />
-            <asp:BoundField HeaderText="Order Date" DataField="OrderDate" />
-            <asp:BoundField HeaderText="Required Date" DataField="RequiredDate" />
-            <asp:BoundField HeaderText="Shipped Date" DataField="ShippedDate" />
-          </columns>
-      </asp:GridView>
-
-      <asp:Button
-        id="Button1"
-        runat="server"
-        Text="Update the Selected Records As Shipped"
-        OnClick="UpdateRecords" />
-
-      <asp:Label id="Label1" runat="server" />
-
-    </form>
-  </body>
-</html>
-<!-- </Snippet1> -->
\ No newline at end of file
diff --git a/xml/System.Configuration/ConfigurationManager.xml b/xml/System.Configuration/ConfigurationManager.xml
index f1f2191ca87..c125e168d24 100644
--- a/xml/System.Configuration/ConfigurationManager.xml
+++ b/xml/System.Configuration/ConfigurationManager.xml
@@ -212,21 +212,6 @@ Module Module1
     End Sub
 
 End Module
-```
-
- The previous example assumes your project has an App.config file as shown below.
-
-```xml
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-  <appSettings>
-    <add key="Setting1" value="May 5, 2014"/>
-    <add key="Setting2" value="May 6, 2014"/>
-  </appSettings>
-</configuration>
 ```
 
  The following example shows how to use a connection string to read data from a database.
@@ -291,20 +276,6 @@ Module Module1
     End Sub
 
 End Module
-```
-
- The previous example assumes your project has an App.config as shown below.
-
-```xml
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-    <connectionStrings>
-      <add name="WingtipToys" connectionString="Data Source=(LocalDB)\v11.0;Initial Catalog=WingtipToys;Integrated Security=True;Pooling=False" />
-    </connectionStrings>
-</configuration>
 ```
 
  ]]></format>
@@ -510,21 +481,6 @@ Module Module1
     End Sub
 
 End Module
-```
-
- The previous example assumes your project has an App.config file as shown below.
-
-```xml
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-  <appSettings>
-    <add key="Setting1" value="May 5, 2014"/>
-    <add key="Setting2" value="May 6, 2014"/>
-  </appSettings>
-</configuration>
 ```
 
  ]]></format>
@@ -632,20 +588,6 @@ Module Module1
     End Sub
 
 End Module
-```
-
- The previous example assumes your project has an App.config as shown below.
-
-```xml
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-    <connectionStrings>
-      <add name="WingtipToys" connectionString="Data Source=(LocalDB)\v11.0;Initial Catalog=WingtipToys;Integrated Security=True;Pooling=False" />
-    </connectionStrings>
-</configuration>
 ```
 
  ]]></format>
diff --git a/xml/System.Configuration/ConnectionStringSettingsCollection.xml b/xml/System.Configuration/ConnectionStringSettingsCollection.xml
index 8017ad75fc0..7c766ea57ac 100644
--- a/xml/System.Configuration/ConnectionStringSettingsCollection.xml
+++ b/xml/System.Configuration/ConnectionStringSettingsCollection.xml
@@ -38,31 +38,17 @@
   <Docs>
     <summary>Contains a collection of <see cref="T:System.Configuration.ConnectionStringSettings" /> objects.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Configuration.ConnectionStringSettingsCollection> object contains a collection of <xref:System.Configuration.ConnectionStringSettings> objects. Each <xref:System.Configuration.ConnectionStringSettings> object represents a single entry in the `<connectionStrings>` configuration-file section.  
-  
-   
-  
-## Examples  
- The following example shows how to access the <xref:System.Configuration.ConnectionStringSettingsCollection>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Configuration.ConnectionStringSettingsCollection> object contains a collection of <xref:System.Configuration.ConnectionStringSettings> objects. Each <xref:System.Configuration.ConnectionStringSettings> object represents a single entry in the `<connectionStrings>` configuration-file section.
+
+## Examples
+ The following example shows how to access the <xref:System.Configuration.ConnectionStringSettingsCollection>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet2":::  
-  
- The following example is an excerpt from the configuration file used by the previous example.  
-  
-```xml  
-<?xml version="1.0" encoding="utf-8"?>  
-<configuration>  
-  <connectionStrings>  
-    <add name="ConnStr1" connectionString="LocalSqlServer: data source=127.0.0.1;Integrated Security=SSPI;Initial Catalog=aspnetdb"  
-      providerName="System.Data.SqlClient" />  
-  </connectionStrings>  
-</configuration>  
-```  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet2":::
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -130,14 +116,14 @@
         <param name="settings">A <see cref="T:System.Configuration.ConnectionStringSettings" /> object to add to the collection.</param>
         <summary>Adds a <see cref="T:System.Configuration.ConnectionStringSettings" /> object to the collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add a <xref:System.Configuration.ConnectionStringSettings> object to a <xref:System.Configuration.ConnectionStringSettingsCollection> collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add a <xref:System.Configuration.ConnectionStringSettings> object to a <xref:System.Configuration.ConnectionStringSettingsCollection> collection.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet7":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet7":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -210,19 +196,19 @@
       <Docs>
         <summary>Removes all the <see cref="T:System.Configuration.ConnectionStringSettings" /> objects from the collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Configuration.ConnectionStringSettingsCollection.Clear%2A> method removes all the connection strings from the configuration file at the current configuration hierarchy level and writes a `<clear>` tag in the file. The `<clear>` tag signifies that all the connection strings defined in the parent configuration files are disregarded by the system.  
-  
-   
-  
-## Examples  
- The following example shows how to remove all the <xref:System.Configuration.ConnectionStringSettings> objects from the <xref:System.Configuration.ConnectionStringSettingsCollection> collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Configuration.ConnectionStringSettingsCollection.Clear%2A> method removes all the connection strings from the configuration file at the current configuration hierarchy level and writes a `<clear>` tag in the file. The `<clear>` tag signifies that all the connection strings defined in the parent configuration files are disregarded by the system.
+
+
+
+## Examples
+ The following example shows how to remove all the <xref:System.Configuration.ConnectionStringSettings> objects from the <xref:System.Configuration.ConnectionStringSettingsCollection> collection.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet9":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet9":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -331,14 +317,14 @@
         <summary>Returns the collection index of the passed <see cref="T:System.Configuration.ConnectionStringSettings" /> object.</summary>
         <returns>The collection index of the specified <see cref="T:System.Configuration.ConnectionStringSettingsCollection" /> object.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to get the index of the specified <xref:System.Configuration.ConnectionStringSettings> object.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to get the index of the specified <xref:System.Configuration.ConnectionStringSettings> object.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet10":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet10":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -388,19 +374,19 @@
         <summary>Gets or sets the connection string at the specified index in the collection.</summary>
         <value>The <see cref="T:System.Configuration.ConnectionStringSettings" /> object at the specified index.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In C#, this property is the indexer for the <xref:System.Configuration.ConnectionStringSettingsCollection> class.  
-  
-   
-  
-## Examples  
- The following example shows how to access a <xref:System.Configuration.ConnectionStringSettings> object at a given index in a <xref:System.Configuration.ConnectionStringSettingsCollection> collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In C#, this property is the indexer for the <xref:System.Configuration.ConnectionStringSettingsCollection> class.
+
+
+
+## Examples
+ The following example shows how to access a <xref:System.Configuration.ConnectionStringSettings> object at a given index in a <xref:System.Configuration.ConnectionStringSettingsCollection> collection.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet14":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet14":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -440,19 +426,19 @@
         <summary>Gets or sets the <see cref="T:System.Configuration.ConnectionStringSettings" /> object with the specified name in the collection.</summary>
         <value>The <see cref="T:System.Configuration.ConnectionStringSettings" /> object with the specified name; otherwise, <see langword="null" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In C#, this property is the indexer for the <xref:System.Configuration.ConnectionStringSettingsCollection> class.  
-  
-   
-  
-## Examples  
- The following example shows how to access a named <xref:System.Configuration.ConnectionStringSettings> object in a <xref:System.Configuration.ConnectionStringSettingsCollection> collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In C#, this property is the indexer for the <xref:System.Configuration.ConnectionStringSettingsCollection> class.
+
+
+
+## Examples
+ The following example shows how to access a named <xref:System.Configuration.ConnectionStringSettings> object in a <xref:System.Configuration.ConnectionStringSettingsCollection> collection.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet15":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet15":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -536,14 +522,14 @@
         <param name="settings">A <see cref="T:System.Configuration.ConnectionStringSettings" /> object in the collection.</param>
         <summary>Removes the specified <see cref="T:System.Configuration.ConnectionStringSettings" /> object from the collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to remove the specified <xref:System.Configuration.ConnectionStringSettings> object from the collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to remove the specified <xref:System.Configuration.ConnectionStringSettings> object from the collection.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet11":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet11":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -582,14 +568,14 @@
         <param name="name">The name of a <see cref="T:System.Configuration.ConnectionStringSettings" /> object in the collection.</param>
         <summary>Removes the specified <see cref="T:System.Configuration.ConnectionStringSettings" /> object from the collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to remove the <xref:System.Configuration.ConnectionStringSettings> object with the specified name from the collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to remove the <xref:System.Configuration.ConnectionStringSettings> object with the specified name from the collection.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet12":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet12":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
@@ -628,14 +614,14 @@
         <param name="index">The index of a <see cref="T:System.Configuration.ConnectionStringSettings" /> object in the collection.</param>
         <summary>Removes the <see cref="T:System.Configuration.ConnectionStringSettings" /> object at the specified index in the collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to remove the <xref:System.Configuration.ConnectionStringSettings> object at the specified index in the collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to remove the <xref:System.Configuration.ConnectionStringSettings> object at the specified index in the collection.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet13":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet13":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringsSection" />
diff --git a/xml/System.Configuration/ConnectionStringsSection.xml b/xml/System.Configuration/ConnectionStringsSection.xml
index 21b889e13d0..94f683ce0be 100644
--- a/xml/System.Configuration/ConnectionStringsSection.xml
+++ b/xml/System.Configuration/ConnectionStringsSection.xml
@@ -32,31 +32,19 @@
   <Docs>
     <summary>Provides programmatic access to the connection strings configuration-file section.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Configuration.ConnectionStringsSection> class allows you to programmatically modify the `connectionStrings` section of the configuration file. The connection strings are provided as a <xref:System.Configuration.ConnectionStringSettingsCollection> of <xref:System.Configuration.ConnectionStringSettings> `add` configuration elements.  
-  
-   
-  
-## Examples  
- The following example shows how to use the <xref:System.Configuration.ConnectionStringsSection>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Configuration.ConnectionStringsSection> class allows you to programmatically modify the `connectionStrings` section of the configuration file. The connection strings are provided as a <xref:System.Configuration.ConnectionStringSettingsCollection> of <xref:System.Configuration.ConnectionStringSettings> `add` configuration elements.
+
+
+
+## Examples
+ The following example shows how to use the <xref:System.Configuration.ConnectionStringsSection>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet1":::  
-  
- The following excerpt shows the configuration used by the previous example.  
-  
-```xml  
-<?xml version="1.0" encoding="utf-8"?>  
-<configuration>  
-  <connectionStrings>  
-    <add name="ConnStr1" connectionString="LocalSqlServer: data source=127.0.0.1;Integrated Security=SSPI;Initial Catalog=aspnetdb"  
-      providerName="System.Data.SqlClient" />  
-  </connectionStrings>  
-</configuration>  
-```  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet1":::
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Configuration.ConnectionStringSettingsCollection" />
@@ -127,14 +115,14 @@
         <summary>Gets a <see cref="T:System.Configuration.ConnectionStringSettingsCollection" /> collection of <see cref="T:System.Configuration.ConnectionStringSettings" /> objects.</summary>
         <value>A <see cref="T:System.Configuration.ConnectionStringSettingsCollection" /> collection of <see cref="T:System.Configuration.ConnectionStringSettings" /> objects.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use the <xref:System.Configuration.ConnectionStringsSection.ConnectionStrings%2A> property of the <xref:System.Configuration.ConnectionStringsSection> object.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use the <xref:System.Configuration.ConnectionStringsSection.ConnectionStrings%2A> property of the <xref:System.Configuration.ConnectionStringsSection> object.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/CS/ConnectionStrings.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet2":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.ConnectionStrings/VB/ConnectionStrings.vb" id="Snippet2":::
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Configuration.ConnectionStringSettingsCollection" />
diff --git a/xml/System.Configuration/ProtectedConfigurationProvider.xml b/xml/System.Configuration/ProtectedConfigurationProvider.xml
index 262ed3b7187..94c905d2aa3 100644
--- a/xml/System.Configuration/ProtectedConfigurationProvider.xml
+++ b/xml/System.Configuration/ProtectedConfigurationProvider.xml
@@ -61,33 +61,6 @@ You can encrypt sections of a configuration file to protect sensitive informatio
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Configuration.UsingProtectedConfigurationProvider/CS/ProtectedConfigurationProvider.cs" id="Snippet11":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Configuration.UsingProtectedConfigurationProvider/VB/ProtectedConfigurationProvider.vb" id="Snippet11":::
 
- The following is an excerpt of the configuration file used by the above examples.
-
-[!INCLUDE[ROPC warning](~/includes/ropc-warning.md)]
-
-```xml
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-
-  <configProtectedData >
-    <providers>
-      <clear />
-      <add keyContainerName="pcKey.txt"
-        name="TripleDESProtectedConfigurationProvider"
-type="Samples.Aspnet.TripleDESProtectedConfigurationProvider, protectedconfigurationproviderlib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=79e01ae0f5cfc66f, processorArchitecture=MSIL" />
-    </providers>
-
-  </configProtectedData >
-
-  <connectionStrings>
-    <add name="NorthwindConnectionString"
-      connectionString="Data Source=webnetue2;Initial Catalog=Northwind;User ID=aspnet_test;Password=test"
-providerName="System.Data.SqlClient" />
-  </connectionStrings>
-
-</configuration>
-```
-
  ]]></format>
     </remarks>
     <altmember cref="T:System.Configuration.ProtectedConfigurationProviderCollection" />
diff --git a/xml/System.Data.Common/DbConnectionStringBuilder.xml b/xml/System.Data.Common/DbConnectionStringBuilder.xml
index 426afec405c..da880354bcf 100644
--- a/xml/System.Data.Common/DbConnectionStringBuilder.xml
+++ b/xml/System.Data.Common/DbConnectionStringBuilder.xml
@@ -81,17 +81,17 @@
 ## Remarks
  The <xref:System.Data.Common.DbConnectionStringBuilder> class provides the base class from which the strongly typed connection string builders (<xref:System.Data.SqlClient.SqlConnectionStringBuilder>, <xref:System.Data.OleDb.OleDbConnectionStringBuilder>, and so on) derive. The connection string builders let developers programmatically create syntactically correct connection strings, and parse and rebuild existing connection strings.
 
- The <xref:System.Data.Common.DbConnectionStringBuilder> has been defined in a database-agnostic manner. Because of the addition of the <xref:System.Data.Common> namespace, developers require a base class against which they can program in order to build connection strings that can work against an arbitrary database. Therefore, the <xref:System.Data.Common.DbConnectionStringBuilder> class lets users assign arbitrary key/value pairs and pass the resulting connection string to a strongly typed provider. All the data providers that are included as part of the .NET Framework provide a strongly typed class that inherits from <xref:System.Data.Common.DbConnectionStringBuilder>: <xref:System.Data.SqlClient.SqlConnectionStringBuilder>, <xref:System.Data.OracleClient.OracleConnectionStringBuilder>, <xref:System.Data.Odbc.OdbcConnectionStringBuilder>, and <xref:System.Data.OleDb.OleDbConnectionStringBuilder>.
+ The <xref:System.Data.Common.DbConnectionStringBuilder> has been defined in a database-agnostic manner. Because of the addition of the <xref:System.Data.Common> namespace, developers require a base class against which they can program in order to build connection strings that can work against an arbitrary database. Therefore, the <xref:System.Data.Common.DbConnectionStringBuilder> class lets users assign arbitrary key/value pairs and pass the resulting connection string to a strongly typed provider. All the data providers that are included as part of .NET offer a strongly typed class that inherits from <xref:System.Data.Common.DbConnectionStringBuilder>: <xref:System.Data.SqlClient.SqlConnectionStringBuilder>, <xref:System.Data.OracleClient.OracleConnectionStringBuilder>, <xref:System.Data.Odbc.OdbcConnectionStringBuilder>, and <xref:System.Data.OleDb.OleDbConnectionStringBuilder>.
 
- The developer can build, assign, and edit connection strings for any arbitrary provider. For providers that support specific key/value pairs, the connection string builder provides strongly typed properties corresponding to the known pairs. In order to support providers that require the ability to support unknown values, developers can also supply arbitrary key/value pairs.
+You can build, assign, and edit connection strings for any arbitrary provider. For providers that support specific key/value pairs, the connection string builder provides strongly typed properties corresponding to the known pairs. For providers that require the ability to support unknown values, you can also supply arbitrary key/value pairs.
 
- The <xref:System.Data.Common.DbConnectionStringBuilder> class implements the <xref:System.ComponentModel.ICustomTypeDescriptor> interface. This means that the class works with Visual Studio designers at design time. When developers use the designer to build strongly typed DataSets and strongly typed connections within Visual Studio, the strongly typed connection string builder class will display the properties associated with its type and will also have converters that can map common values for known keys.
+ The <xref:System.Data.Common.DbConnectionStringBuilder> class implements the <xref:System.ComponentModel.ICustomTypeDescriptor> interface. This means that the class works with Visual Studio designers at design time. When developers use the designer to build strongly typed DataSets and strongly typed connections within Visual Studio, the strongly typed connection string builder class displays the properties associated with its type and also has converters that can map common values for known keys.
 
- Developers needing to create connection strings as part of applications can use the <xref:System.Data.Common.DbConnectionStringBuilder> class or one of its strongly typed derivatives to build and modify connection strings. The <xref:System.Data.Common.DbConnectionStringBuilder> class also makes it easy to manage connection strings stored in an application configuration file.
+If you need to create connection strings as part of applications, use the <xref:System.Data.Common.DbConnectionStringBuilder> class or one of its strongly typed derivatives to build and modify connection strings. The <xref:System.Data.Common.DbConnectionStringBuilder> class also makes it easy to manage connection strings stored in an application configuration file.
 
- Developers can create connection strings using either a strongly typed connection string builder class, or they can use the <xref:System.Data.Common.DbConnectionStringBuilder> class. The <xref:System.Data.Common.DbConnectionStringBuilder> performs no checks for valid key/value pairs. Therefore, it is possible using this class to create invalid connection strings. The <xref:System.Data.SqlClient.SqlConnectionStringBuilder> supports only key/value pairs that are supported by SQL Server; trying to add invalid pairs will throw an exception.
+You can create connection strings using either a strongly typed connection string builder class or the <xref:System.Data.Common.DbConnectionStringBuilder> class. The <xref:System.Data.Common.DbConnectionStringBuilder> performs no checks for valid key/value pairs. Therefore, it's possible to create invalid connection strings when using this class. The <xref:System.Data.SqlClient.SqlConnectionStringBuilder> supports only key/value pairs that are supported by SQL Server; trying to add invalid pairs will throw an exception.
 
- Both the <xref:System.Data.Common.DbConnectionStringBuilder.Add%2A> method and <xref:System.Data.Common.DbConnectionStringBuilder.Item%2A> property handle tries to insert malicious entries. For example, the following code correctly escapes the nested key/value pair:
+ Both the <xref:System.Data.Common.DbConnectionStringBuilder.Add%2A> method and <xref:System.Data.Common.DbConnectionStringBuilder.Item%2A> property handle cases where a bad actor tries to insert malicious entries. For example, the following code correctly escapes the nested key/value pair:
 
 ```vb
 Dim builder As New System.Data.Common.DbConnectionStringBuilder
@@ -277,17 +277,6 @@ initial catalog="AdventureWorks;NewValue=Bad"
 
  Calling the <xref:System.Data.Common.DbConnectionStringBuilder.Add%2A> method by passing a null (`Nothing` in Visual Basic) key throws an <xref:System.ArgumentNullException>. However, calling the <xref:System.Data.Common.DbConnectionStringBuilder.Add%2A> method by passing a null value removes the key/value pair.
 
-
-
-## Examples
- The following example creates a new <xref:System.Data.Common.DbConnectionStringBuilder> and adds items. The code also demonstrates overwriting an existing item using the <xref:System.Data.Common.DbConnectionStringBuilder.Add%2A> method, and includes a commented block that would throw an <xref:System.ArgumentNullException>.
-
-> [!NOTE]
->  This example includes a password to demonstrate how <xref:System.Data.Common.DbConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.
-
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/VB/source.vb" id="Snippet1":::
-
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Data.EntityClient/EntityConnectionStringBuilder.xml b/xml/System.Data.EntityClient/EntityConnectionStringBuilder.xml
index dc30eb1f20d..fec11ab1fbc 100644
--- a/xml/System.Data.EntityClient/EntityConnectionStringBuilder.xml
+++ b/xml/System.Data.EntityClient/EntityConnectionStringBuilder.xml
@@ -115,17 +115,11 @@
  The invariant Provider name must be specified in the `connectionString` parameter. Supported providers include the following:
 
 -   `System.Data.Odbc`
-
 -   `System.Data.OleDb`
-
 -   `System.Data.OracleClient`
-
 -   `System.Data.SqlClient`
-
 -   `Microsoft.SqlServerCe.Client`
 
-
-
 ## Examples
  The following example demonstrates how to use the <xref:System.Data.EntityClient.EntityConnectionStringBuilder> in conjunction with a <xref:System.Data.SqlClient.SqlConnectionStringBuilder>. The code sets properties of a `SqlConnectionStringBuilder` to create a <xref:System.Data.SqlClient.SqlConnection> connection string that supplies part of the underlying provider connection string. Note that the Provider name cannot be set using the `SqlConnectionStringBuilder` because it is not valid `SqlConnection` connection string syntax. The code creates the <xref:System.Data.EntityClient.EntityConnection> connection string by setting `EntityConnectionStringBuilder` properties. It does not use the `connectionString` overload.
 
diff --git a/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml b/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml
index 655c55c8a0e..1ffc5b4e4ca 100644
--- a/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml
+++ b/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml
@@ -82,8 +82,6 @@ Console.WriteLine(builder.ConnectionString);
 Driver={SQL Server};Server="MyServer;NewValue=Bad"
 ```
 
-
-
 ## Examples
  The following console application builds connection strings for several ODBC databases. First, the example creates a connection string for a Microsoft Access database. It then creates a connection string for an IBM DB2 database. The example also parses an existing connection string, and demonstrates various ways of manipulating the contents of the connection string.
 
diff --git a/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml b/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml
index 49ffe1f162d..329b474dcc4 100644
--- a/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml
+++ b/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml
@@ -231,17 +231,6 @@ Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Sample.mdb;User ID="Admin;NewVal
 ## Remarks
  The <xref:System.Data.OleDb.OleDbConnectionStringBuilder.Clear%2A> method removes all key/value pairs from the <xref:System.Data.OleDb.OleDbConnectionStringBuilder>, and resets all corresponding properties to their default values. This includes setting the <xref:System.Data.Common.DbConnectionStringBuilder.Count%2A> property to 0, and setting the <xref:System.Data.Common.DbConnectionStringBuilder.ConnectionString%2A> property to an empty string.
 
-
-
-## Examples
- The following example demonstrates the effect of calling the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.Clear%2A> method. This example populates the <xref:System.Data.OleDb.OleDbConnectionStringBuilder> with some key/value pairs, and then calls the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.Clear%2A> method and shows the results.
-
-> [!NOTE]
->  This example includes a password to demonstrate how <xref:System.Data.OleDb.OleDbConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.
-
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/VB/source.vb" id="Snippet1":::
-
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Connection String Builders</related>
diff --git a/xml/System.Data.OracleClient/OracleConnectionStringBuilder.xml b/xml/System.Data.OracleClient/OracleConnectionStringBuilder.xml
index 28fb325e03b..a2d039681a5 100644
--- a/xml/System.Data.OracleClient/OracleConnectionStringBuilder.xml
+++ b/xml/System.Data.OracleClient/OracleConnectionStringBuilder.xml
@@ -31,54 +31,45 @@
   <Docs>
     <summary>Provides a simple way to create and manage the contents of connection strings used by the <see cref="T:System.Data.OracleClient.OracleConnection" /> class.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This type is deprecated and will be removed in a future version of the .NET Framework. For more information, see [Oracle and ADO.NET](/dotnet/framework/data/adonet/oracle-and-adonet).  
-  
- The connection string builders allow developers to programmatically create syntactically correct connection strings, and to parse and rebuild existing connection strings, using properties and methods of the class. The connection string builder provides strongly typed properties corresponding to the known key/value pairs allowed by Oracle. The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class implements the <xref:System.ComponentModel.ICustomTypeDescriptor> interface. This means that the class works with Visual Studio .NET designers at design time. When developers use the designer to build strongly typed **DataSets** and strongly typed connections within Visual Studio .NET, the strongly typed connection string builder class will display the properties associated with its type and will also have converters that can map common values for known keys.  
-  
- Developers needing to create connection strings as part of applications can use the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class to build and modify connection strings. The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class also makes it easy to manage connection strings stored in an application configuration file.  
-  
- The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> performs checks for valid key/value pairs. Therefore, this class cannot be used to create invalid connection strings. Trying to add invalid pairs will throw an exception. The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class maintains a fixed collection of synonyms, and when required, can perform the required translation to convert from a synonym to the corresponding well-known key name. For example, when you use the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property to retrieve a value, you can specify a string that contains any synonym for the key you need. See the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property for a full list of acceptable synonyms.  
-  
- The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> handles attempts to insert malicious entries. For example, the following code, using the default <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property (the indexer, in C#) correctly escapes the nested key/value pair.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This type is deprecated and will be removed in a future version of .NET Framework. For more information, see [Oracle and ADO.NET](/dotnet/framework/data/adonet/oracle-and-adonet).
+
+ The connection string builders allow developers to programmatically create syntactically correct connection strings, and to parse and rebuild existing connection strings, using properties and methods of the class. The connection string builder provides strongly typed properties corresponding to the known key/value pairs allowed by Oracle. The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class implements the <xref:System.ComponentModel.ICustomTypeDescriptor> interface. This means that the class works with Visual Studio .NET designers at design time. When developers use the designer to build strongly typed **DataSets** and strongly typed connections within Visual Studio .NET, the strongly typed connection string builder class will display the properties associated with its type and will also have converters that can map common values for known keys.
+
+ Developers needing to create connection strings as part of applications can use the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class to build and modify connection strings. The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class also makes it easy to manage connection strings stored in an application configuration file.
+
+ The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> performs checks for valid key/value pairs. Therefore, this class cannot be used to create invalid connection strings. Trying to add invalid pairs will throw an exception. The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class maintains a fixed collection of synonyms, and when required, can perform the required translation to convert from a synonym to the corresponding well-known key name. For example, when you use the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property to retrieve a value, you can specify a string that contains any synonym for the key you need. See the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property for a full list of acceptable synonyms.
+
+ The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> handles attempts to insert malicious entries. For example, the following code, using the default <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property (the indexer, in C#), correctly escapes the nested key/value pair.
+
 ```vb
-Dim builder As New System.Data. _  
-    OracleClient.OracleConnectionStringBuilder  
-builder("Data Source") = "OracleDemo"  
-builder("Integrated Security") = True  
-builder("User ID") = "Mary;NewValue=Bad"  
-System.Diagnostics.Debug.WriteLine(builder.ConnectionString)  
-```  
-  
+Dim builder As New System.Data. _
+    OracleClient.OracleConnectionStringBuilder
+builder("Data Source") = "OracleDemo;NewValue=Bad"
+builder("Integrated Security") = True
+builder("User ID") = "Mary;NewValue=Bad"
+System.Diagnostics.Debug.WriteLine(builder.ConnectionString)
+```
+
 ```csharp
-System.Data.OracleClient.OracleConnectionStringBuilder builder =  
-   new System.Data.OracleClient.OracleConnectionStringBuilder();  
-builder["Data Source"] = "OracleDemo";  
-builder["integrated Security"] = true;  
-builder["User ID"] = "Mary;NewValue=Bad";  
-System.Diagnostics.Debug.WriteLine(builder.ConnectionString);  
-```  
-  
- The result is the following connection string that handles the invalid value in a safe manner by enclosing the User ID value in quotes:  
-  
-```  
-Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"  
-```  
-  
-   
-  
-## Examples  
- The following console application builds connection strings for an Oracle database. The code uses an <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class to create the connection string, and then passes the <xref:System.Data.OracleClient.OracleConnection.ConnectionString%2A> property of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> instance to the constructor of the connection class. The example also parses an existing connection string, and demonstrates various ways of manipulating the connection string's contents.  
-  
-> [!NOTE]
->  This example includes a password to demonstrate how <xref:System.Data.OracleClient.OracleConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder/VB/source.vb" id="Snippet1":::  
-  
+System.Data.OracleClient.OracleConnectionStringBuilder builder =
+   new System.Data.OracleClient.OracleConnectionStringBuilder();
+builder["Data Source"] = "OracleDemo";
+builder["integrated Security"] = true;
+builder["User ID"] = "Mary;NewValue=Bad";
+System.Diagnostics.Debug.WriteLine(builder.ConnectionString);
+```
+
+ The result is the following connection string that handles the invalid value in a safe manner by enclosing the User ID value in quotes:
+
+```
+Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
+```
+
+[!INCLUDE[ROPC warning](~/includes/ropc-warning.md)]
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -132,22 +123,22 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <param name="connectionString">The basis for the object's internal connection information. Parsed into name/value pairs. Invalid key names raise a <see cref="T:System.Collections.Generic.KeyNotFoundException" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" /> class. The provided connection string provides the data for the instance's internal connection information.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class provides a fixed internal collection of key/value pairs. Even if you supply only a small subset of the possible connection string values in the constructor, the object always provides default values for each key/value pair. When the <xref:System.Data.Common.DbConnection.ConnectionString%2A> property of the object is retrieved, the string contains only key/value pairs in which the value is different from the default value for the item.  
-  
-   
-  
-## Examples  
- The following example supplies a simple connection string in the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> object's constructor, and then iterates through all the key/value pairs within the object. Note that the collection provides default values for each items. Also note that the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class converts synonyms for the well-known keys so that they are consistent with the well-known names.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class provides a fixed internal collection of key/value pairs. Even if you supply only a small subset of the possible connection string values in the constructor, the object always provides default values for each key/value pair. When the <xref:System.Data.Common.DbConnection.ConnectionString%2A> property of the object is retrieved, the string contains only key/value pairs in which the value is different from the default value for the item.
+
+
+
+## Examples
+ The following example supplies a simple connection string in the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> object's constructor, and then iterates through all the key/value pairs within the object. Note that the collection provides default values for each items. Also note that the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class converts synonyms for the well-known keys so that they are consistent with the well-known names.
+
 > [!NOTE]
->  This example includes a password to demonstrate how <xref:System.Data.OracleClient.OracleConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.  
-  
+>  This example includes a password to demonstrate how <xref:System.Data.OracleClient.OracleConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Ctor/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Ctor/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Ctor/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.Collections.Generic.KeyNotFoundException">Invalid key name within the connection string.</exception>
@@ -175,19 +166,19 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
       <Docs>
         <summary>Clears the contents of the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Clear%2A> method removes all key/value pairs from the <xref:System.Data.OracleClient.OracleConnectionStringBuilder>, and resets all corresponding properties. This includes resetting the connection string to an empty string.  
-  
-   
-  
-## Examples  
- The following example demonstrates the effect of calling the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Clear%2A> method. This example populates the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> with some key/value pairs, and then calls the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Clear%2A> method and shows the results.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Clear%2A> method removes all key/value pairs from the <xref:System.Data.OracleClient.OracleConnectionStringBuilder>, and resets all corresponding properties. This includes resetting the connection string to an empty string.
+
+
+
+## Examples
+ The following example demonstrates the effect of calling the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Clear%2A> method. This example populates the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> with some key/value pairs, and then calls the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Clear%2A> method and shows the results.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Clear/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Clear/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Clear/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -218,19 +209,19 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <returns>
           <see langword="true" /> if the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" /> contains an element that has the specified key; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> contains a fixed-size collection of key/value pairs, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.ContainsKey%2A> method determines only if a particular key name is valid.  
-  
-   
-  
-## Examples  
- The following example creates an <xref:System.Data.OracleClient.OracleConnectionStringBuilder> instance, sets some of its properties, and then tries to determine whether various keys exist within the object by calling the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.ContainsKey%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> contains a fixed-size collection of key/value pairs, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.ContainsKey%2A> method determines only if a particular key name is valid.
+
+
+
+## Examples
+ The following example creates an <xref:System.Data.OracleClient.OracleConnectionStringBuilder> instance, sets some of its properties, and then tries to determine whether various keys exist within the object by calling the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.ContainsKey%2A> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -268,19 +259,19 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets the name of the Oracle data source to connect to.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.DataSource" /> property, or <see cref="F:System.String.Empty" /> if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Data Source" and "Server" keys within the connection string. Regardless of which of these values has been supplied within the supplied connection string, the connection string created by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> will use the well-known "Data Source" key. If the value passed in is null when you try to set the property, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.DataSource%2A> property is reset. If the value has not been set and the developer tries to retrieve the property, the return value is <xref:System.String.Empty>.  
-  
-   
-  
-## Examples  
- The following example demonstrates that the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class converts synonyms for the "Data Source" connection string key into the well-known key.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Data Source" and "Server" keys within the connection string. Regardless of which of these values has been supplied within the supplied connection string, the connection string created by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> will use the well-known "Data Source" key. If the value passed in is null when you try to set the property, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.DataSource%2A> property is reset. If the value has not been set and the developer tries to retrieve the property, the return value is <xref:System.String.Empty>.
+
+
+
+## Examples
+ The following example demonstrates that the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> class converts synonyms for the "Data Source" connection string key into the well-known key.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.DataSource/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.DataSource/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.DataSource/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -316,11 +307,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets a value that indicates whether the pooler automatically enlists the connection in the creation thread's current transaction context.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.Enlist" /> property, or <see langword="true" /> if the property has not been previously set.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Enlist" key within the connection string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Enlist" key within the connection string.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -381,22 +372,22 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets a value that indicates whether "User ID" and "Password" are specified in the connection (when <see langword="false" />) or whether the current Windows account credentials are used for authentication (when <see langword="true" />).</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.IntegratedSecurity" /> property, or a <see langword="false" /> if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Integrated Security" key within the connection string.  
-  
-   
-  
-## Examples  
- The following example converts an existing connection string from using Windows Authentication to using integrated security. The example works by removing the user name and password from the connection string, and then setting the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.IntegratedSecurity%2A> property of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> object.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Integrated Security" key within the connection string.
+
+
+
+## Examples
+ The following example converts an existing connection string from using Windows Authentication to using integrated security. The example works by removing the user name and password from the connection string, and then setting the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.IntegratedSecurity%2A> property of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> object.
+
 > [!NOTE]
->  This example includes a password to demonstrate how <xref:System.Data.OracleClient.OracleConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.  
-  
+>  This example includes a password to demonstrate how <xref:System.Data.OracleClient.OracleConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.IntegratedSecurity/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.IntegratedSecurity/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.IntegratedSecurity/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -449,34 +440,34 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets the value associated with the specified key. In C#, this property is the indexer.</summary>
         <value>The value associated with the specified key.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> contains a fixed-size dictionary, trying to add a key that does not exist within the dictionary throws a <xref:System.Collections.Generic.KeyNotFoundException>. The following table lists all the possible keys within the connection string, and the default value for each.  
-  
-|Key|Property|Default value|  
-|---------|--------------|-------------------|  
-|Data Source (or server)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.DataSource%2A>|Empty string|  
-|Persist Security Info (or persistsecurityinfo)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.PersistSecurityInfo%2A>|False|  
-|Integrated Security|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.IntegratedSecurity%2A>|False|  
-|User ID (or user or uid)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.UserID%2A>|Empty string|  
-|Password|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Password%2A>|Empty string|  
-|Enlist|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Enlist%2A>|True|  
-|Pooling|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Pooling%2A>|True|  
-|Min Pool Size|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.MinPoolSize%2A>|0|  
-|Max Pool Size|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.MaxPoolSize%2A>|100|  
-|Omit Oracle Connection Name|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.OmitOracleConnectionName%2A>|False|  
-|Unicode|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Unicode%2A>|False|  
-|Load Balance Timeout (or connection lifetime)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.LoadBalanceTimeout%2A>|0|  
-  
-   
-  
-## Examples  
- The following code, in a console application, creates a new <xref:System.Data.OracleClient.OracleConnectionStringBuilder> and adds key/value pairs to its connection string, using the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> contains a fixed-size dictionary, trying to add a key that does not exist within the dictionary throws a <xref:System.Collections.Generic.KeyNotFoundException>. The following table lists all the possible keys within the connection string, and the default value for each.
+
+|Key|Property|Default value|
+|---------|--------------|-------------------|
+|Data Source (or server)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.DataSource%2A>|Empty string|
+|Persist Security Info (or persistsecurityinfo)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.PersistSecurityInfo%2A>|False|
+|Integrated Security|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.IntegratedSecurity%2A>|False|
+|User ID (or user or uid)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.UserID%2A>|Empty string|
+|Password|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Password%2A>|Empty string|
+|Enlist|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Enlist%2A>|True|
+|Pooling|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Pooling%2A>|True|
+|Min Pool Size|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.MinPoolSize%2A>|0|
+|Max Pool Size|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.MaxPoolSize%2A>|100|
+|Omit Oracle Connection Name|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.OmitOracleConnectionName%2A>|False|
+|Unicode|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.Unicode%2A>|False|
+|Load Balance Timeout (or connection lifetime)|<xref:System.Data.OracleClient.OracleConnectionStringBuilder.LoadBalanceTimeout%2A>|0|
+
+
+
+## Examples
+ The following code, in a console application, creates a new <xref:System.Data.OracleClient.OracleConnectionStringBuilder> and adds key/value pairs to its connection string, using the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Item%2A> property.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Item/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Item/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Item/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -506,19 +497,19 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets an <see cref="T:System.Collections.ICollection" /> that contains the keys in the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" />.</summary>
         <value>An <see cref="T:System.Collections.ICollection" /> that contains the keys in the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The order of the values in the <xref:System.Collections.ICollection> is unspecified, but it is the same order as the associated values in the <xref:System.Collections.ICollection> returned by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Values%2A> property.  
-  
-   
-  
-## Examples  
- The following console application example creates a new <xref:System.Data.OracleClient.OracleConnectionStringBuilder>. The code loops through the <xref:System.Collections.ICollection> returned by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Keys%2A> property displaying the key/value pairs.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The order of the values in the <xref:System.Collections.ICollection> is unspecified, but it is the same order as the associated values in the <xref:System.Collections.ICollection> returned by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Values%2A> property.
+
+
+
+## Examples
+ The following console application example creates a new <xref:System.Data.OracleClient.OracleConnectionStringBuilder>. The code loops through the <xref:System.Collections.ICollection> returned by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Keys%2A> property displaying the key/value pairs.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Keys/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Keys/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Keys/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.Values" />
@@ -556,11 +547,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets the minimum time, in seconds, for the connection to live in the connection pool before it is removed.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.LoadBalanceTimeout" /> property, or 0 if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Load Balance Timeout" and "Connection Lifetime" keys within the connection string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Load Balance Timeout" and "Connection Lifetime" keys within the connection string.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -596,11 +587,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets the maximum number of connections allowed in the connection pool for this specific connection string.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.MaxPoolSize" /> property, or 100 if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Max Pool Size" key within the connection string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Max Pool Size" key within the connection string.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -636,11 +627,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets the minimum number of connections allowed in the connection pool for this specific connection string.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.MinPoolSize" /> property, or 0 if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Min Pool Size" key within the connection string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Min Pool Size" key within the connection string.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -677,11 +668,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <value>
           <see langword="true" /> if transaction rollbacks are enabled; otherwise <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When set to `true`, this property prevents certain errors from occurring when attempting to roll back transactions in earlier versions of Oracle (prior to 8.1.7.4.1).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When set to `true`, this property prevents certain errors from occurring when attempting to roll back transactions in earlier versions of Oracle (prior to 8.1.7.4.1).
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -721,16 +712,16 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets the password for the Oracle account.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.Password" /> property, or <see cref="F:System.String.Empty" /> if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Password" and "pwd" keys within the connection string.  
-  
-   
-  
-## Examples  
- If the value passed in is null when you try to set the property, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Password%2A> property is reset. If the value has not been set and the developer tries to retrieve the property, the return value is <xref:System.String.Empty>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Password" and "pwd" keys within the connection string.
+
+
+
+## Examples
+ If the value passed in is null when you try to set the property, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Password%2A> property is reset. If the value has not been set and the developer tries to retrieve the property, the return value is <xref:System.String.Empty>.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -766,11 +757,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets a Boolean value that indicates if security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has ever been in an open state.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.PersistSecurityInfo" /> property, or <see langword="false" /> if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Persist Security Info" and "persistsecurityinfo" keys within the connection string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Persist Security Info" and "persistsecurityinfo" keys within the connection string.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -806,11 +797,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets a Boolean value that indicates whether the connection will be pooled, or whether each connection will be explicitly opened every time that the connection is requested.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.Pooling" /> property, or <see langword="true" /> if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Pooling" key within the connection string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Pooling" key within the connection string.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -841,41 +832,41 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <returns>
           <see langword="true" /> if the key existed within the connection string and was removed, <see langword="false" /> if the key did not exist.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Remove%2A> method returns a value that indicates its success, it is not necessary to look for the existence of a key before trying to remove the key/value pair from the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> instance. Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> maintains a fixed-size collection of key/value pairs, calling the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Remove%2A> method just resets the value of the key/value pair back to its default value.  
-  
- Because the collection of keys supported by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> is fixed, every item within the collection has a known default value.  
-  
- The following table lists the keys, and the value for each when the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> is first initialized, or after the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Remove%2A> method has been called:  
-  
-|Key|Default value|  
-|---------|-------------------|  
-|Data Source|Empty string|  
-|Persist Security Info|False|  
-|Integrated Security|False|  
-|User ID|Empty string|  
-|Password|Empty string|  
-|Enlist|True|  
-|Pooling|True|  
-|Min Pool Size|0|  
-|Max Pool Size|100|  
-|Unicode|False|  
-|Load Balance Timeout|0|  
-|Omit Oracle Connection Name|False|  
-  
-   
-  
-## Examples  
- The following example converts an existing connection string from using Windows Authentication to using integrated security. The example works by removing the user name and password from the connection string, and then setting the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.IntegratedSecurity%2A> property of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> object.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Remove%2A> method returns a value that indicates its success, it is not necessary to look for the existence of a key before trying to remove the key/value pair from the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> instance. Because the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> maintains a fixed-size collection of key/value pairs, calling the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Remove%2A> method just resets the value of the key/value pair back to its default value.
+
+ Because the collection of keys supported by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> is fixed, every item within the collection has a known default value.
+
+ The following table lists the keys, and the value for each when the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> is first initialized, or after the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Remove%2A> method has been called:
+
+|Key|Default value|
+|---------|-------------------|
+|Data Source|Empty string|
+|Persist Security Info|False|
+|Integrated Security|False|
+|User ID|Empty string|
+|Password|Empty string|
+|Enlist|True|
+|Pooling|True|
+|Min Pool Size|0|
+|Max Pool Size|100|
+|Unicode|False|
+|Load Balance Timeout|0|
+|Omit Oracle Connection Name|False|
+
+
+
+## Examples
+ The following example converts an existing connection string from using Windows Authentication to using integrated security. The example works by removing the user name and password from the connection string, and then setting the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.IntegratedSecurity%2A> property of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> object.
+
 > [!NOTE]
->  This example includes a password to demonstrate how <xref:System.Data.OracleClient.OracleConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.  
-  
+>  This example includes a password to demonstrate how <xref:System.Data.OracleClient.OracleConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Remove/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Remove/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Remove/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -908,11 +899,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <returns>
           <see langword="true" /> if the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" /> contains an entry with the specified key; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method behaves identically to the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.ContainsKey%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method behaves identically to the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.ContainsKey%2A> method.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -945,19 +936,19 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <returns>
           <see langword="true" /> if <paramref name="keyword" /> was found within the connection string; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> method lets developers safely retrieve a value from an <xref:System.Data.OracleClient.OracleConnectionStringBuilder> without needing to verify that the supplied key name is a valid key name. Because <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> gracefully handles searching for a non-existent key, there is no need to look for the existence of a key before retrieving its value. Calling <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> with a nonexistent key will place the value null (`Nothing` in Visual Basic) in the `value` parameter.  
-  
-   
-  
-## Examples  
- The following example demonstrates the behavior of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> method lets developers safely retrieve a value from an <xref:System.Data.OracleClient.OracleConnectionStringBuilder> without needing to verify that the supplied key name is a valid key name. Because <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> gracefully handles searching for a non-existent key, there is no need to look for the existence of a key before retrieving its value. Calling <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> with a nonexistent key will place the value null (`Nothing` in Visual Basic) in the `value` parameter.
+
+
+
+## Examples
+ The following example demonstrates the behavior of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.TryGetValue%2A> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.TryGetValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.TryGetValue/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.TryGetValue/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -993,11 +984,11 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets a Boolean value that indicates if the client supports the Unicode functionality available in later Oracle clients, or if it is non-Unicode aware.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.Unicode" /> property, or <see langword="false" /> if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "Unicode" key within the connection string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "Unicode" key within the connection string.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -1033,13 +1024,13 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets or sets the user ID to be used when connecting to Oracle.</summary>
         <value>The value of the <see cref="P:System.Data.OracleClient.OracleConnectionStringBuilder.UserID" /> property, or <see cref="F:System.String.Empty" /> if none has been supplied.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the "User ID", "user", and "uid" keys within the connection string.  
-  
- If the value passed in is null when you try to set the property, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.UserID%2A> property is reset. If the value has not been set and the developer tries to retrieve the property, the return value is <xref:System.String.Empty>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the "User ID", "user", and "uid" keys within the connection string.
+
+ If the value passed in is null when you try to set the property, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.UserID%2A> property is reset. If the value has not been set and the developer tries to retrieve the property, the return value is <xref:System.String.Empty>.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
@@ -1065,19 +1056,19 @@ Data Source=OracleDemo;Integrated Security=True;User ID="Mary;NewValue=Bad"
         <summary>Gets an <see cref="T:System.Collections.ICollection" /> that contains the values in the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" />.</summary>
         <value>An <see cref="T:System.Collections.ICollection" /> that contains the values in the <see cref="T:System.Data.OracleClient.OracleConnectionStringBuilder" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The order of the values in the <xref:System.Collections.ICollection> is unspecified, but it is the same order as the associated keys in the <xref:System.Collections.ICollection> returned by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Keys%2A> property. Because each instance of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> always contains the same fixed set of keys, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Values%2A> property always returns the values corresponding to the fixed set of keys, in the same order as the keys.  
-  
-   
-  
-## Examples  
- The following example first creates a new <xref:System.Data.OracleClient.OracleConnectionStringBuilder>, and then iterates through all the values within the object.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The order of the values in the <xref:System.Collections.ICollection> is unspecified, but it is the same order as the associated keys in the <xref:System.Collections.ICollection> returned by the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Keys%2A> property. Because each instance of the <xref:System.Data.OracleClient.OracleConnectionStringBuilder> always contains the same fixed set of keys, the <xref:System.Data.OracleClient.OracleConnectionStringBuilder.Values%2A> property always returns the values corresponding to the fixed set of keys, in the same order as the keys.
+
+
+
+## Examples
+ The following example first creates a new <xref:System.Data.OracleClient.OracleConnectionStringBuilder>, and then iterates through all the values within the object.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Values/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Values/VB/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.Values/VB/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/connection-string-builders">Building Connection Strings</related>
diff --git a/xml/System.Data.SqlClient/SqlCredential.xml b/xml/System.Data.SqlClient/SqlCredential.xml
index d9e398ab48c..09da7544ec6 100644
--- a/xml/System.Data.SqlClient/SqlCredential.xml
+++ b/xml/System.Data.SqlClient/SqlCredential.xml
@@ -26,57 +26,18 @@
   <Interfaces />
   <Docs>
     <summary>
-      <see cref="T:System.Data.SqlClient.SqlCredential" /> provides a more secure way to specify the password for a login attempt using SQL Server Authentication.  
-  
- <see cref="T:System.Data.SqlClient.SqlCredential" /> is comprised of a user id and a password that will be used for SQL Server Authentication. The password in a <see cref="T:System.Data.SqlClient.SqlCredential" /> object is of type <see cref="T:System.Security.SecureString" />.  
-  
- <see cref="T:System.Data.SqlClient.SqlCredential" /> cannot be inherited.  
-  
+      <see cref="T:System.Data.SqlClient.SqlCredential" /> provides a more secure way to specify the password for a login attempt using SQL Server Authentication.
+
+ <see cref="T:System.Data.SqlClient.SqlCredential" /> is comprised of a user id and a password that will be used for SQL Server Authentication. The password in a <see cref="T:System.Data.SqlClient.SqlCredential" /> object is of type <see cref="T:System.Security.SecureString" />.
+
+ <see cref="T:System.Data.SqlClient.SqlCredential" /> cannot be inherited.
+
  Windows Authentication (<see langword="Integrated Security = true" />) remains the most secure way to log in to a SQL Server database.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use <xref:System.Data.SqlClient.SqlConnection.Credential%2A> to get or set a connection's <xref:System.Data.SqlClient.SqlCredential> object. Use <xref:System.Data.SqlClient.SqlConnection.ChangePassword%2A> to change the password for a user via an <xref:System.Data.SqlClient.SqlCredential> object. For information on how a <xref:System.Data.SqlClient.SqlCredential> object affects connection pool behavior, see [SQL Server Connection Pooling (ADO.NET)](/dotnet/framework/data/adonet/sql-server-connection-pooling).  
-  
- An <xref:System.InvalidOperationException> exception will be raised if a non-null <xref:System.Data.SqlClient.SqlCredential> object is used in a connection with any of the following connection string keywords:  
-  
--   `Integrated Security = true`  
-  
--   `Password`  
-  
--   `User ID`  
-  
--   `Context Connection = true`  
-  
- The following sample connects to a SQL Server database using <xref:System.Data.SqlClient.SqlConnection.Credential%2A>:  
-  
-```  
-// change connection string in the APP.CONFIG file  
-<connectionStrings>  
-  <add name="MyConnString"  
-       connectionString="Initial Catalog=myDB;Server=myServer"  
-       providerName="System.Data.SqlClient" />  
-</connectionStrings>  
-  
-// then use the following snippet:  
-using System.Configuration;  
-  
-System.Windows.Controls.TextBox txtUserId = new System.Windows.Controls.TextBox();  
-System.Windows.Controls.PasswordBox txtPwd = new System.Windows.Controls.PasswordBox();  
-  
-Configuration config = Configuration.WebConfigurationManager.OpenWebConfiguration(Null);  
-ConnectionStringSettings connString = config.ConnectionStrings.ConnectionString["MyConnString"];  
-  
-using (SqlConnection conn = new SqlConnection(connString.ConnectionString))  
-{  
-SecureString pwd = txtPwd.SecurePassword;  
-pwd.MakeReadOnly();  
-SqlCredential cred = new SqlCredential(txtUserId.Text, pwd);  
-conn.Credential = cred;  
-conn.Open();  
-```  
-  
+      <format type="text/markdown"><![CDATA[
+
+[!INCLUDE[ROPC warning](~/includes/ropc-warning.md)]
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/framework/data/adonet/ado-net-overview">ADO.NET Overview</related>
@@ -112,11 +73,11 @@ conn.Open();
         <param name="password">The password; a <see cref="T:System.Security.SecureString" /> value marked as read-only.  Passing a read/write <see cref="T:System.Security.SecureString" /> parameter will raise an <see cref="T:System.ArgumentException" />.</param>
         <summary>Creates an object of type <see cref="T:System.Data.SqlClient.SqlCredential" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The constructor does not accept null parameters. A <xref:System.String.Empty> value is allowed. An attempt to pass a null parameter in the constructor will raise an <xref:System.ArgumentNullException> exception.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The constructor does not accept null parameters. A <xref:System.String.Empty> value is allowed. An attempt to pass a null parameter in the constructor will raise an <xref:System.ArgumentNullException> exception.
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/framework/data/adonet/ado-net-overview">ADO.NET Overview</related>
diff --git a/xml/System.Web.Caching/SqlCacheDependency.xml b/xml/System.Web.Caching/SqlCacheDependency.xml
index e1ce0122af7..fd1a1dcfeaa 100644
--- a/xml/System.Web.Caching/SqlCacheDependency.xml
+++ b/xml/System.Web.Caching/SqlCacheDependency.xml
@@ -33,7 +33,7 @@
 
  The following example shows an ASP.NET Web.config file that enables table-based dependencies on a SQL Server database table.
 
-```
+```xml
 <configuration>
   <connectionStrings>
     <add name="Northwind" connectionString="Data Source=(local); Initial Catalog=northwind; Integrated Security=true"; providerName="System.Data.SqlClient" />
@@ -53,8 +53,6 @@
 </configuration>
 ```
 
-
-
 ## Examples
  The following code example uses the <xref:System.Web.UI.WebControls.SqlDataSource> and <xref:System.Web.UI.WebControls.GridView> controls to display a database table. When the page is loaded, the page attempts to create a <xref:System.Web.Caching.SqlCacheDependency> object. After the <xref:System.Web.Caching.SqlCacheDependency> object is created, the page adds an item to the `Cache` with a dependency on the <xref:System.Web.Caching.SqlCacheDependency> object. You should use exception handling similar to that shown here.
 
diff --git a/xml/System.Web.UI.WebControls/Parameter.xml b/xml/System.Web.UI.WebControls/Parameter.xml
index 49ceef82742..4f194d85973 100644
--- a/xml/System.Web.UI.WebControls/Parameter.xml
+++ b/xml/System.Web.UI.WebControls/Parameter.xml
@@ -30,54 +30,54 @@
   <Docs>
     <summary>Provides a mechanism that data source controls use to bind to application variables, user identities and choices, and other data. Serves as the base class for all ASP.NET parameter types.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter> class represents a parameter in a parameterized SQL query, a filtering expression, or a business object method call that an ASP.NET data source control uses to select, filter, or modify data. <xref:System.Web.UI.WebControls.Parameter> objects are contained in a <xref:System.Web.UI.WebControls.ParameterCollection> object. <xref:System.Web.UI.WebControls.Parameter> objects are evaluated at run time, to bind the values of the variables they represent to whatever method is used by a data source control to interact with data.  
-  
- Use classes that derive from <xref:System.Web.UI.WebControls.Parameter> with data source and data-bound controls to build Web-based data applications. These parameter classes are used by data source controls to bind specific kinds of values found in Web applications to placeholders in SQL query strings, business object method parameters, and more. The following table lists parameter types that are included in ASP.NET.  
-  
-|||  
-|-|-|  
-|<xref:System.Web.UI.WebControls.ControlParameter>|Binds any public property of a Web server control.|  
-|<xref:System.Web.UI.WebControls.FormParameter>|Binds a form field.|  
-|<xref:System.Web.UI.WebControls.SessionParameter>|Binds a session-state field.|  
-|<xref:System.Web.UI.WebControls.RouteParameter>|Binds a route URL parameter.|  
-|<xref:System.Web.UI.WebControls.CookieParameter>|Binds a cookie field.|  
-|<xref:System.Web.UI.WebControls.QueryStringParameter>|Binds a query-string parameter.|  
-|<xref:System.Web.UI.WebControls.ProfileParameter>|Binds a profile field.|  
-  
- Extend the base <xref:System.Web.UI.WebControls.Parameter> class when you want to implement your own custom parameter types.  
-  
- <xref:System.Web.UI.WebControls.Parameter> objects are very simple: they have a <xref:System.Web.UI.WebControls.Parameter.Name%2A> and a <xref:System.Web.UI.WebControls.Parameter.Type%2A> property, can be represented declaratively, and can track state across multiple HTTP requests. All parameters support a <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property, for cases when a parameter is bound to a value, but the value evaluates to `null` at run time.  
-  
- When using a collection of <xref:System.Web.UI.WebControls.Parameter> objects with a data source control, their order in the collection might matter. For more information on how parameters are used, see [Using Parameters with the SqlDataSource Control](https://learn.microsoft.com/previous-versions/aspnet/z72eefad(v=vs.100)) and [Using Parameters with the ObjectDataSource Control](https://msdn.microsoft.com/library/45fb67ee-9be7-49b7-9421-e242203dafa4).  
-  
-   
-  
-## Examples  
- The following example shows how to use the selected value of a <xref:System.Web.UI.WebControls.DropDownList> control in the W`here` clause of a SQL query. The example uses the <xref:System.Web.UI.WebControls.ControlParameter> class, which derives from the <xref:System.Web.UI.WebControls.ControlParameter> class.  
-  
- The <xref:System.Web.UI.WebControls.SqlDataSourceView.SelectCommand%2A> element defines the query with a parameter named "@Title" where the value from `DropDownList1` should go. The <xref:System.Web.UI.WebControls.ControlParameter> element specifies that the "@Title" placeholder will be replaced by the value of the <xref:System.Web.UI.WebControls.ListControl.SelectedValue%2A> property of the `DropDownList1` control. The <xref:System.Web.UI.WebControls.ControlParameter> element is added to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection of the <xref:System.Web.UI.WebControls.SqlDataSource> control.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter> class represents a parameter in a parameterized SQL query, a filtering expression, or a business object method call that an ASP.NET data source control uses to select, filter, or modify data. <xref:System.Web.UI.WebControls.Parameter> objects are contained in a <xref:System.Web.UI.WebControls.ParameterCollection> object. <xref:System.Web.UI.WebControls.Parameter> objects are evaluated at run time, to bind the values of the variables they represent to whatever method is used by a data source control to interact with data.
+
+ Use classes that derive from <xref:System.Web.UI.WebControls.Parameter> with data source and data-bound controls to build Web-based data applications. These parameter classes are used by data source controls to bind specific kinds of values found in Web applications to placeholders in SQL query strings, business object method parameters, and more. The following table lists parameter types that are included in ASP.NET.
+
+|||
+|-|-|
+|<xref:System.Web.UI.WebControls.ControlParameter>|Binds any public property of a Web server control.|
+|<xref:System.Web.UI.WebControls.FormParameter>|Binds a form field.|
+|<xref:System.Web.UI.WebControls.SessionParameter>|Binds a session-state field.|
+|<xref:System.Web.UI.WebControls.RouteParameter>|Binds a route URL parameter.|
+|<xref:System.Web.UI.WebControls.CookieParameter>|Binds a cookie field.|
+|<xref:System.Web.UI.WebControls.QueryStringParameter>|Binds a query-string parameter.|
+|<xref:System.Web.UI.WebControls.ProfileParameter>|Binds a profile field.|
+
+ Extend the base <xref:System.Web.UI.WebControls.Parameter> class when you want to implement your own custom parameter types.
+
+ <xref:System.Web.UI.WebControls.Parameter> objects are very simple: they have a <xref:System.Web.UI.WebControls.Parameter.Name%2A> and a <xref:System.Web.UI.WebControls.Parameter.Type%2A> property, can be represented declaratively, and can track state across multiple HTTP requests. All parameters support a <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property, for cases when a parameter is bound to a value, but the value evaluates to `null` at run time.
+
+ When using a collection of <xref:System.Web.UI.WebControls.Parameter> objects with a data source control, their order in the collection might matter. For more information on how parameters are used, see [Using Parameters with the SqlDataSource Control](https://learn.microsoft.com/previous-versions/aspnet/z72eefad(v=vs.100)) and [Using Parameters with the ObjectDataSource Control](https://msdn.microsoft.com/library/45fb67ee-9be7-49b7-9421-e242203dafa4).
+
+
+
+## Examples
+ The following example shows how to use the selected value of a <xref:System.Web.UI.WebControls.DropDownList> control in the W`here` clause of a SQL query. The example uses the <xref:System.Web.UI.WebControls.ControlParameter> class, which derives from the <xref:System.Web.UI.WebControls.ControlParameter> class.
+
+ The <xref:System.Web.UI.WebControls.SqlDataSourceView.SelectCommand%2A> element defines the query with a parameter named "@Title" where the value from `DropDownList1` should go. The <xref:System.Web.UI.WebControls.ControlParameter> element specifies that the "@Title" placeholder will be replaced by the value of the <xref:System.Web.UI.WebControls.ListControl.SelectedValue%2A> property of the `DropDownList1` control. The <xref:System.Web.UI.WebControls.ControlParameter> element is added to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection of the <xref:System.Web.UI.WebControls.SqlDataSource> control.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_2sql/CS/sql2cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_2sql/VB/sql2vb.aspx" id="Snippet1":::  
-  
- The following example is like the previous one, but uses code instead of markup. When the page loads the first time, the <xref:System.Web.UI.WebControls.DropDownList> control has no selected value, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property of the <xref:System.Web.UI.WebControls.Parameter> object is used.  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_2sql/VB/sql2vb.aspx" id="Snippet1":::
+
+ The following example is like the previous one, but uses code instead of markup. When the page loads the first time, the <xref:System.Web.UI.WebControls.DropDownList> control has no selected value, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property of the <xref:System.Web.UI.WebControls.Parameter> object is used.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_3/CS/param1acs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_3/VB/param1avb.aspx" id="Snippet1":::  
-  
- The following code shows the code-behind class for the page in the previous example.  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_3/VB/param1avb.aspx" id="Snippet1":::
+
+ The following code shows the code-behind class for the page in the previous example.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_3/CS/param1acs.aspx.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_3/VB/param1avb.aspx.vb" id="Snippet4":::  
-  
- The following code example demonstrates how to extend the <xref:System.Web.UI.WebControls.Parameter> class to create a new parameter type that can be used by data source controls and other controls in data-binding scenarios. A data source control can use a `StaticParameter` parameter to bind to the value of any object, typically a string, declared on a Web Forms page.  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_3/VB/param1avb.aspx.vb" id="Snippet4":::
+
+ The following code example demonstrates how to extend the <xref:System.Web.UI.WebControls.Parameter> class to create a new parameter type that can be used by data source controls and other controls in data-binding scenarios. A data source control can use a `StaticParameter` parameter to bind to the value of any object, typically a string, declared on a Web Forms page.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet1":::
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Web.UI.WebControls.ControlParameter" />
@@ -123,11 +123,11 @@
       <Docs>
         <summary>Initializes a new default instance of the <see cref="T:System.Web.UI.WebControls.Parameter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor> constructor is initialized with default values for all its properties. The <xref:System.Web.UI.WebControls.Parameter.Name%2A> property is initialized to <xref:System.String.Empty?displayProperty=nameWithType>, the <xref:System.Web.UI.WebControls.Parameter.Type%2A> property is initialized to <xref:System.TypeCode.Object?displayProperty=nameWithType>, the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor> constructor is initialized with default values for all its properties. The <xref:System.Web.UI.WebControls.Parameter.Name%2A> property is initialized to <xref:System.String.Empty?displayProperty=nameWithType>, the <xref:System.Web.UI.WebControls.Parameter.Type%2A> property is initialized to <xref:System.TypeCode.Object?displayProperty=nameWithType>, the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -152,19 +152,19 @@
         <param name="name">The name of the parameter.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Web.UI.WebControls.Parameter" /> class, using the specified name.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%29> constructor is initialized with the specified `name` and default values for its other properties. The <xref:System.Web.UI.WebControls.Parameter.Type%2A> property is initialized to <xref:System.TypeCode.Object?displayProperty=nameWithType>, the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to initialize the <xref:System.Web.UI.WebControls.Parameter.Name%2A> property of the instance. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%29> constructor is initialized with the specified `name` and default values for its other properties. The <xref:System.Web.UI.WebControls.Parameter.Type%2A> property is initialized to <xref:System.TypeCode.Object?displayProperty=nameWithType>, the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.
+
+
+
+## Examples
+ The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to initialize the <xref:System.Web.UI.WebControls.Parameter.Name%2A> property of the instance. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet2":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet2":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Name" />
@@ -190,19 +190,19 @@
         <param name="original">A <see cref="T:System.Web.UI.WebControls.Parameter" /> instance from which the current instance is initialized.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Web.UI.WebControls.Parameter" /> class with the values of the original, specified instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor is a `protected` copy constructor used to clone a <xref:System.Web.UI.WebControls.Parameter> instance. The values of the <xref:System.Web.UI.WebControls.Parameter.Name%2A>, <xref:System.Web.UI.WebControls.Parameter.Type%2A>, <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A>, <xref:System.Web.UI.WebControls.Parameter.Direction%2A>, and <xref:System.Web.UI.WebControls.Parameter.ConvertEmptyStringToNull%2A> properties are all transferred to the new instance.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to implement correct object cloning behavior for the class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor is a `protected` copy constructor used to clone a <xref:System.Web.UI.WebControls.Parameter> instance. The values of the <xref:System.Web.UI.WebControls.Parameter.Name%2A>, <xref:System.Web.UI.WebControls.Parameter.Type%2A>, <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A>, <xref:System.Web.UI.WebControls.Parameter.Direction%2A>, and <xref:System.Web.UI.WebControls.Parameter.ConvertEmptyStringToNull%2A> properties are all transferred to the new instance.
+
+
+
+## Examples
+ The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to implement correct object cloning behavior for the class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet4":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet4":::
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Web.UI.WebControls.Parameter.Clone" />
@@ -230,11 +230,11 @@
         <param name="dbType">The database type of the parameter.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Web.UI.WebControls.Parameter" /> class, using the specified name and database type.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.Data.DbType%29> constructor is initialized with the specified `name` and `dbType` parameters, and with default values for other properties. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.Data.DbType%29> constructor is initialized with the specified `name` and `dbType` parameters, and with default values for other properties. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -261,19 +261,19 @@
         <param name="type">A <see cref="T:System.TypeCode" /> that describes the type of the parameter.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Web.UI.WebControls.Parameter" /> class, using the specified name and type.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.TypeCode%29> constructor is initialized with the specified `name` and `type` parameters, and default values for other properties. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.TypeCode%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to initialize the <xref:System.Web.UI.WebControls.Parameter.Name%2A> and <xref:System.Web.UI.WebControls.Parameter.Type%2A> properties of the instance. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.TypeCode%29> constructor is initialized with the specified `name` and `type` parameters, and default values for other properties. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>, and the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is initialized to `null`.
+
+
+
+## Examples
+ The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.TypeCode%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to initialize the <xref:System.Web.UI.WebControls.Parameter.Name%2A> and <xref:System.Web.UI.WebControls.Parameter.Type%2A> properties of the instance. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet3":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet3":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Name" />
@@ -304,11 +304,11 @@
         <param name="defaultValue">The default value for the <see cref="T:System.Web.UI.WebControls.Parameter" /> instance, if the <see cref="T:System.Web.UI.WebControls.Parameter" /> is bound to a value that is not yet initialized when <see cref="M:System.Web.UI.WebControls.Parameter.Evaluate(System.Web.HttpContext,System.Web.UI.Control)" /> is called.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Web.UI.WebControls.Parameter" /> class, using the specified name, the specified database type, and the specified value for its <see cref="P:System.Web.UI.WebControls.Parameter.DefaultValue" /> property.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property of the <xref:System.Web.UI.WebControls.Parameter> instance is initialized to <xref:System.Data.ParameterDirection.Input>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property of the <xref:System.Web.UI.WebControls.Parameter> instance is initialized to <xref:System.Data.ParameterDirection.Input>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -337,19 +337,11 @@
         <param name="defaultValue">A string that serves as a default value for the parameter, if the <see cref="T:System.Web.UI.WebControls.Parameter" /> is bound to a value that is not yet initialized when <see cref="M:System.Web.UI.WebControls.Parameter.Evaluate(System.Web.HttpContext,System.Web.UI.Control)" /> is called.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Web.UI.WebControls.Parameter" /> class, using the specified name, the specified type, and the specified string for its <see cref="P:System.Web.UI.WebControls.Parameter.DefaultValue" /> property.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.TypeCode%2CSystem.String%29> constructor is initialized with the specified `name` parameter and `type` parameter, and assigned a <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property value. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to use the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.TypeCode%2CSystem.String%29> constructor to add update parameter objects to the <xref:System.Web.UI.WebControls.SqlDataSource.UpdateParameters%2A> collection of an <xref:System.Web.UI.WebControls.AccessDataSource> control before calling the <xref:System.Web.UI.WebControls.SqlDataSource.Update%2A> method.  
-  
- :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx" id="Snippet2":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx" id="Snippet2":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.Parameter> object created with the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.String%2CSystem.TypeCode%2CSystem.String%29> constructor is initialized with the specified `name` parameter and `type` parameter, and assigned a <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property value. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is initialized to <xref:System.Data.ParameterDirection.Input>.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Name" />
@@ -378,21 +370,21 @@
         <summary>Returns a duplicate of the current <see cref="T:System.Web.UI.WebControls.Parameter" /> instance.</summary>
         <returns>A <see cref="T:System.Web.UI.WebControls.Parameter" /> that is an exact duplicate of the current one.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method calls the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> copy constructor to initialize a new instance of the <xref:System.Web.UI.WebControls.Parameter> class with the values of the current instance.  
-  
- If you extend the <xref:System.Web.UI.WebControls.Parameter> class, you can override the <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method to include any state that should be copied to a new instance of your derived class.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to implement correct object cloning behavior for the class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method calls the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> copy constructor to initialize a new instance of the <xref:System.Web.UI.WebControls.Parameter> class with the values of the current instance.
+
+ If you extend the <xref:System.Web.UI.WebControls.Parameter> class, you can override the <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method to include any state that should be copied to a new instance of your derived class.
+
+
+
+## Examples
+ The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor from a class that extends the <xref:System.Web.UI.WebControls.Parameter> class to implement correct object cloning behavior for the class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet4":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet4":::
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Web.UI.WebControls.Parameter.#ctor(System.Web.UI.WebControls.Parameter)" />
@@ -422,11 +414,11 @@
         <summary>Converts a <see cref="T:System.Data.DbType" /> value to an equivalent <see cref="T:System.TypeCode" /> value.</summary>
         <returns>A <see cref="T:System.TypeCode" /> value that is equivalent to the specified <see cref="T:System.Data.DbType" /> value.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method returns an <xref:System.TypeCode.Object> instance if no equivalent for the <xref:System.Data.DbType> value is found. Database types without equivalent types include <xref:System.Data.DbType.Guid>, <xref:System.Data.DbType.Binary>, and <xref:System.Data.DbType.DateTimeOffset>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method returns an <xref:System.TypeCode.Object> instance if no equivalent for the <xref:System.Data.DbType> value is found. Database types without equivalent types include <xref:System.Data.DbType.Guid>, <xref:System.Data.DbType.Binary>, and <xref:System.Data.DbType.DateTimeOffset>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -458,11 +450,11 @@
         <value>
           <see langword="true" /> if the value that the <see cref="T:System.Web.UI.WebControls.Parameter" /> is bound to should be converted to <see langword="null" /> when it is <see cref="F:System.String.Empty" />; otherwise, <see langword="false" />. The default value is <see langword="true" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the <xref:System.Web.UI.WebControls.Parameter.ConvertEmptyStringToNull%2A> property of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the <xref:System.Web.UI.WebControls.Parameter.ConvertEmptyStringToNull%2A> property of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -491,11 +483,11 @@
         <summary>Converts a <see cref="T:System.TypeCode" /> value to an equivalent <see cref="T:System.Data.DbType" /> value.</summary>
         <returns>A <see cref="T:System.Data.DbType" /> value that is equivalent to the specified <see cref="T:System.TypeCode" /> value.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method returns an <xref:System.Data.DbType.Object> instance if no equivalent is found. Types without equivalent database types include <xref:System.TypeCode.DBNull> and <xref:System.TypeCode.Empty>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method returns an <xref:System.Data.DbType.Object> instance if no equivalent is found. Types without equivalent database types include <xref:System.TypeCode.DBNull> and <xref:System.TypeCode.Empty>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -526,13 +518,13 @@
         <summary>Gets or sets the database type of the parameter.</summary>
         <value>The database type of the <see cref="T:System.Web.UI.WebControls.Parameter" /> instance. The default value is <see cref="F:System.Data.DbType.Object" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The database type can be used to create strongly typed parameters, so that values are converted correctly between your Web application and underlying code or values from database tables.  
-  
- If the database type of the parameter is changed by setting the <xref:System.Web.UI.WebControls.Parameter.DbType%2A> property, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The database type can be used to create strongly typed parameters, so that values are converted correctly between your Web application and underlying code or values from database tables.
+
+ If the database type of the parameter is changed by setting the <xref:System.Web.UI.WebControls.Parameter.DbType%2A> property, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">An attempt was made to set this property to a value that is not in the <see cref="T:System.Data.DbType" /> enumeration.</exception>
@@ -564,23 +556,23 @@
         <summary>Specifies a default value for the parameter, should the value that the parameter is bound to be uninitialized when the <see cref="M:System.Web.UI.WebControls.Parameter.Evaluate(System.Web.HttpContext,System.Web.UI.Control)" /> method is called.</summary>
         <value>A string that serves as a default value for the <see cref="T:System.Web.UI.WebControls.Parameter" /> when the value it is bound to cannot be resolved or is uninitialized.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is used in scenarios where the parameter is bound to a value, but the value is `null` or cannot be resolved when the <xref:System.Web.UI.WebControls.Parameter> object is evaluated.  
-  
- If the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to retrieve a single data record using an <xref:System.Web.UI.WebControls.ObjectDataSource> control and display it in a <xref:System.Web.UI.WebControls.DetailsView> control. The <xref:System.Web.UI.WebControls.ObjectDataSource> control retrieves a specific employee record by calling the `GetEmployee` method of the `EmployeeLogic` class. The `GetEmployee` method requires an employee ID parameter. The <xref:System.Web.UI.WebControls.ObjectDataSource> control uses a <xref:System.Web.UI.WebControls.QueryStringParameter> object in its <xref:System.Web.UI.WebControls.ObjectDataSource.SelectParameters%2A> collection to pass an ID to the `GetEmployee` method in this example.  
-  
- To view the example implementation of the `EmployeeLogic` class and the `GetEmployee` method, see the <xref:System.Web.UI.WebControls.ObjectDataSource> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is used in scenarios where the parameter is bound to a value, but the value is `null` or cannot be resolved when the <xref:System.Web.UI.WebControls.Parameter> object is evaluated.
+
+ If the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.
+
+
+
+## Examples
+ The following code example demonstrates how to retrieve a single data record using an <xref:System.Web.UI.WebControls.ObjectDataSource> control and display it in a <xref:System.Web.UI.WebControls.DetailsView> control. The <xref:System.Web.UI.WebControls.ObjectDataSource> control retrieves a specific employee record by calling the `GetEmployee` method of the `EmployeeLogic` class. The `GetEmployee` method requires an employee ID parameter. The <xref:System.Web.UI.WebControls.ObjectDataSource> control uses a <xref:System.Web.UI.WebControls.QueryStringParameter> object in its <xref:System.Web.UI.WebControls.ObjectDataSource.SelectParameters%2A> collection to pass an ID to the `GetEmployee` method in this example.
+
+ To view the example implementation of the `EmployeeLogic` class and the `GetEmployee` method, see the <xref:System.Web.UI.WebControls.ObjectDataSource> class overview.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.ObjectDataSource_3/CS/objds3cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.ObjectDataSource_3/VB/objds3vb.aspx" id="Snippet1":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.ObjectDataSource_3/VB/objds3vb.aspx" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -611,23 +603,23 @@
         <summary>Indicates whether the <see cref="T:System.Web.UI.WebControls.Parameter" /> object is used to bind a value to a control, or the control can be used to change the value.</summary>
         <value>One of the <see cref="T:System.Data.ParameterDirection" /> values. <see cref="P:System.Web.UI.WebControls.Parameter.Direction" /> is set to <see cref="F:System.Data.ParameterDirection.Input" /> by default.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is currently not used by the <xref:System.Web.UI.WebControls.Parameter> class and is reserved for future use.  
-  
- The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property describes the direction of the flow of data between the value that a <xref:System.Web.UI.WebControls.Parameter> instance is bound to and the <xref:System.Web.UI.WebControls.Parameter> object itself. The default value for the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property, <xref:System.Data.ParameterDirection.Input>, describes the most common scenario where the flow of data is always in one direction: from the value to which the <xref:System.Web.UI.WebControls.Parameter> object is bound to the <xref:System.Web.UI.WebControls.Parameter> object. Any changes made to the underlying value are reflected by the <xref:System.Web.UI.WebControls.Parameter> object, but any changes to the <xref:System.Web.UI.WebControls.Parameter> object are not reflected by the underlying data. You can set the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property to <xref:System.Data.ParameterDirection.InputOutput> or <xref:System.Data.ParameterDirection.Output> when working with output parameters, or <xref:System.Data.ParameterDirection.ReturnValue> when working with a return value from a stored procedure.  
-  
- If the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to set the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A>, <xref:System.Web.UI.WebControls.Parameter.Type%2A>, and <xref:System.Web.UI.WebControls.Parameter.Direction%2A> properties of <xref:System.Web.UI.WebControls.Parameter> objects when using them as output parameters and return value parameters with a stored procedure. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.SqlDataSourceStatusEventArgs> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property is currently not used by the <xref:System.Web.UI.WebControls.Parameter> class and is reserved for future use.
+
+ The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property describes the direction of the flow of data between the value that a <xref:System.Web.UI.WebControls.Parameter> instance is bound to and the <xref:System.Web.UI.WebControls.Parameter> object itself. The default value for the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property, <xref:System.Data.ParameterDirection.Input>, describes the most common scenario where the flow of data is always in one direction: from the value to which the <xref:System.Web.UI.WebControls.Parameter> object is bound to the <xref:System.Web.UI.WebControls.Parameter> object. Any changes made to the underlying value are reflected by the <xref:System.Web.UI.WebControls.Parameter> object, but any changes to the <xref:System.Web.UI.WebControls.Parameter> object are not reflected by the underlying data. You can set the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property to <xref:System.Data.ParameterDirection.InputOutput> or <xref:System.Data.ParameterDirection.Output> when working with output parameters, or <xref:System.Data.ParameterDirection.ReturnValue> when working with a return value from a stored procedure.
+
+ If the <xref:System.Web.UI.WebControls.Parameter.Direction%2A> property of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.
+
+
+
+## Examples
+ The following code example demonstrates how to set the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A>, <xref:System.Web.UI.WebControls.Parameter.Type%2A>, and <xref:System.Web.UI.WebControls.Parameter.Direction%2A> properties of <xref:System.Web.UI.WebControls.Parameter> objects when using them as output parameters and return value parameters with a stored procedure. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.SqlDataSourceStatusEventArgs> class overview.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/CS/sql21cs.aspx" id="Snippet2":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/VB/sql21vb.aspx" id="Snippet2":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/VB/sql21vb.aspx" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -662,19 +654,19 @@
         <summary>Updates and returns the value of the <see cref="T:System.Web.UI.WebControls.Parameter" /> object.</summary>
         <returns>An <see langword="object" /> that represents the updated and current value of the parameter.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default implementation of the <xref:System.Web.UI.WebControls.Parameter.Evaluate%2A> method is to return `null` in all cases. Classes that derive from the <xref:System.Web.UI.WebControls.Parameter> class override the <xref:System.Web.UI.WebControls.Parameter.Evaluate%2A> method to return an updated parameter value. For example, the <xref:System.Web.UI.WebControls.ControlParameter> object returns the value of the control that it is bound to, while the <xref:System.Web.UI.WebControls.QueryStringParameter> object retrieves the current name/value pair from the <xref:System.Web.HttpRequest> object.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to override the <xref:System.Web.UI.WebControls.Parameter.Evaluate%2A> method to return the correct value in a class that is derived from the <xref:System.Web.UI.WebControls.Parameter> class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default implementation of the <xref:System.Web.UI.WebControls.Parameter.Evaluate%2A> method is to return `null` in all cases. Classes that derive from the <xref:System.Web.UI.WebControls.Parameter> class override the <xref:System.Web.UI.WebControls.Parameter.Evaluate%2A> method to return an updated parameter value. For example, the <xref:System.Web.UI.WebControls.ControlParameter> object returns the value of the control that it is bound to, while the <xref:System.Web.UI.WebControls.QueryStringParameter> object retrieves the current name/value pair from the <xref:System.Web.HttpRequest> object.
+
+
+
+## Examples
+ The following code example demonstrates how to override the <xref:System.Web.UI.WebControls.Parameter.Evaluate%2A> method to return the correct value in a class that is derived from the <xref:System.Web.UI.WebControls.Parameter> class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet6":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet6":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -700,11 +692,11 @@
         <summary>Gets the <see cref="T:System.Data.DbType" /> value that is equivalent to the CLR type of the current <see cref="T:System.Web.UI.WebControls.Parameter" /> instance.</summary>
         <returns>The <see cref="T:System.Data.DbType" /> value that is equivalent to the CLR type of the current <see cref="T:System.Web.UI.WebControls.Parameter" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.DbType%2A> property must not already have been set, or must be set to <xref:System.Data.DbType.Object>. This method is intended for use only when the CLR type is set but the <xref:System.Web.UI.WebControls.Parameter.DbType%2A> property is not.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.DbType%2A> property must not already have been set, or must be set to <xref:System.Data.DbType.Object>. This method is intended for use only when the CLR type is set but the <xref:System.Web.UI.WebControls.Parameter.DbType%2A> property is not.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The <see cref="P:System.Web.UI.WebControls.Parameter.DbType" /> property is already set to a value other than <see cref="F:System.Data.DbType.Object" />.</exception>
@@ -766,13 +758,13 @@
         <param name="savedState">An <see cref="T:System.Object" /> that represents the <see cref="T:System.Web.UI.WebControls.Parameter" /> state to restore.</param>
         <summary>Restores the data source view's previously saved view state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is used primarily by the .NET Framework infrastructure and is not intended to be used directly from your code. However, control developers can override this method to specify how a custom server control restores its view state. For more information, see [ASP.NET State Management Overview](https://learn.microsoft.com/previous-versions/aspnet/75x4ha6s(v=vs.100)).  
-  
- This method restores view-state information for the <xref:System.Web.UI.WebControls.Parameter> object from a previous page request that was saved by the <xref:System.Web.UI.WebControls.Parameter.SaveViewState%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is used primarily by the .NET Framework infrastructure and is not intended to be used directly from your code. However, control developers can override this method to specify how a custom server control restores its view state. For more information, see [ASP.NET State Management Overview](https://learn.microsoft.com/previous-versions/aspnet/75x4ha6s(v=vs.100)).
+
+ This method restores view-state information for the <xref:System.Web.UI.WebControls.Parameter> object from a previous page request that was saved by the <xref:System.Web.UI.WebControls.Parameter.SaveViewState%2A> method.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.IsTrackingViewState" />
@@ -807,25 +799,25 @@
         <summary>Gets or sets the name of the parameter.</summary>
         <value>The name of the parameter. The default value is <see cref="F:System.String.Empty" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Web.UI.WebControls.Parameter> objects are not required to have a name; however, data source controls might use the parameter name to match a <xref:System.Web.UI.WebControls.Parameter> object in a collection with a parameter in a SQL query or business method signature. For example, the <xref:System.Web.UI.WebControls.SqlDataSource> control can use the name of the <xref:System.Web.UI.WebControls.Parameter> object to match a placeholder in a parameterized SQL query. Similarly, the <xref:System.Web.UI.WebControls.SqlDataSource> control can use the name of a <xref:System.Web.UI.WebControls.Parameter> object in the <xref:System.Web.UI.WebControls.SqlDataSource.FilterParameters%2A> collection to match a placeholder in the <xref:System.Web.UI.WebControls.SqlDataSource.FilterExpression%2A> property. In some cases, the name is not used and the order in which the <xref:System.Web.UI.WebControls.Parameter> object is added to a <xref:System.Web.UI.WebControls.ParameterCollection> collection is more important. For more information, see [Using Parameters with the SqlDataSource Control](https://learn.microsoft.com/previous-versions/aspnet/z72eefad(v=vs.100)) and [Using Parameters with the ObjectDataSource Control](https://msdn.microsoft.com/library/45fb67ee-9be7-49b7-9421-e242203dafa4).  
-  
- If the name of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to display filtered data using an <xref:System.Web.UI.WebControls.ObjectDataSource> control to retrieve data from a middle-tier business object and a <xref:System.Web.UI.WebControls.GridView> control to display the results. The code example consists of a <xref:System.Web.UI.WebControls.TextBox> control, a <xref:System.Web.UI.WebControls.GridView> control, the <xref:System.Web.UI.WebControls.ObjectDataSource> control, and a Submit button. By default, the <xref:System.Web.UI.WebControls.TextBox> control is populated with the name of one of the `Northwind` employees. The <xref:System.Web.UI.WebControls.GridView> control displays information about the employee identified by the name in the <xref:System.Web.UI.WebControls.TextBox> control. To retrieve data on another employee, enter the full name of the employee in the <xref:System.Web.UI.WebControls.TextBox> control and click the button.  
-  
- The <xref:System.Web.UI.WebControls.ObjectDataSource.FilterExpression%2A> property specifies an expression used to filter the data retrieved by the <xref:System.Web.UI.WebControls.ObjectDataSource.SelectMethod%2A> property. It uses parameter placeholders that are evaluated to the parameters contained in the <xref:System.Web.UI.WebControls.ObjectDataSource.FilterParameters%2A> collection. In this example, the parameter placeholder is bounded by single quotation marks because the type of the parameter is a string type that might contain spaces. If the type of the parameter is a numeric or date type, bounding quotation marks are not needed.  
-  
- This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.ObjectDataSource.FilterExpression%2A> property of the <xref:System.Web.UI.WebControls.ObjectDataSource> class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Web.UI.WebControls.Parameter> objects are not required to have a name; however, data source controls might use the parameter name to match a <xref:System.Web.UI.WebControls.Parameter> object in a collection with a parameter in a SQL query or business method signature. For example, the <xref:System.Web.UI.WebControls.SqlDataSource> control can use the name of the <xref:System.Web.UI.WebControls.Parameter> object to match a placeholder in a parameterized SQL query. Similarly, the <xref:System.Web.UI.WebControls.SqlDataSource> control can use the name of a <xref:System.Web.UI.WebControls.Parameter> object in the <xref:System.Web.UI.WebControls.SqlDataSource.FilterParameters%2A> collection to match a placeholder in the <xref:System.Web.UI.WebControls.SqlDataSource.FilterExpression%2A> property. In some cases, the name is not used and the order in which the <xref:System.Web.UI.WebControls.Parameter> object is added to a <xref:System.Web.UI.WebControls.ParameterCollection> collection is more important. For more information, see [Using Parameters with the SqlDataSource Control](https://learn.microsoft.com/previous-versions/aspnet/z72eefad(v=vs.100)) and [Using Parameters with the ObjectDataSource Control](https://msdn.microsoft.com/library/45fb67ee-9be7-49b7-9421-e242203dafa4).
+
+ If the name of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.
+
+
+
+## Examples
+ The following code example demonstrates how to display filtered data using an <xref:System.Web.UI.WebControls.ObjectDataSource> control to retrieve data from a middle-tier business object and a <xref:System.Web.UI.WebControls.GridView> control to display the results. The code example consists of a <xref:System.Web.UI.WebControls.TextBox> control, a <xref:System.Web.UI.WebControls.GridView> control, the <xref:System.Web.UI.WebControls.ObjectDataSource> control, and a Submit button. By default, the <xref:System.Web.UI.WebControls.TextBox> control is populated with the name of one of the `Northwind` employees. The <xref:System.Web.UI.WebControls.GridView> control displays information about the employee identified by the name in the <xref:System.Web.UI.WebControls.TextBox> control. To retrieve data on another employee, enter the full name of the employee in the <xref:System.Web.UI.WebControls.TextBox> control and click the button.
+
+ The <xref:System.Web.UI.WebControls.ObjectDataSource.FilterExpression%2A> property specifies an expression used to filter the data retrieved by the <xref:System.Web.UI.WebControls.ObjectDataSource.SelectMethod%2A> property. It uses parameter placeholders that are evaluated to the parameters contained in the <xref:System.Web.UI.WebControls.ObjectDataSource.FilterParameters%2A> collection. In this example, the parameter placeholder is bounded by single quotation marks because the type of the parameter is a string type that might contain spaces. If the type of the parameter is a numeric or date type, bounding quotation marks are not needed.
+
+ This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.ObjectDataSource.FilterExpression%2A> property of the <xref:System.Web.UI.WebControls.ObjectDataSource> class.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.ObjectDataSource_9/CS/objds9cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.ObjectDataSource_9/VB/objds9vb.aspx" id="Snippet1":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.ObjectDataSource_9/VB/objds9vb.aspx" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Type" />
@@ -851,25 +843,25 @@
       <Docs>
         <summary>Calls the <see cref="M:System.Web.UI.WebControls.ParameterCollection.OnParametersChanged(System.EventArgs)" /> method of the <see cref="T:System.Web.UI.WebControls.ParameterCollection" /> collection that contains the <see cref="T:System.Web.UI.WebControls.Parameter" /> object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the <xref:System.Web.UI.WebControls.Parameter> object is not contained by a <xref:System.Web.UI.WebControls.ParameterCollection> collection, calling the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method has no effect. If the <xref:System.Web.UI.WebControls.Parameter> object is contained by a <xref:System.Web.UI.WebControls.ParameterCollection> collection, <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> raises the <xref:System.Web.UI.WebControls.ParameterCollection.ParametersChanged?displayProperty=nameWithType> event of the collection.  
-  
- If the <xref:System.Web.UI.WebControls.ParameterCollection> collection is contained by a data source control, the <xref:System.Web.UI.WebControls.ParameterCollection.ParametersChanged?displayProperty=nameWithType> event raises the data source control's <xref:System.Web.UI.IDataSource.DataSourceChanged> event, causing any data-bound controls to rebind.  
-  
- Raising an event invokes the event handler through a delegate. For more information, see [Handling and Raising Events](/dotnet/standard/events/).  
-  
- The <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method to raise the <xref:System.Web.UI.WebControls.ParameterCollection.ParametersChanged> event when the state of a parameter changes. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the <xref:System.Web.UI.WebControls.Parameter> object is not contained by a <xref:System.Web.UI.WebControls.ParameterCollection> collection, calling the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method has no effect. If the <xref:System.Web.UI.WebControls.Parameter> object is contained by a <xref:System.Web.UI.WebControls.ParameterCollection> collection, <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> raises the <xref:System.Web.UI.WebControls.ParameterCollection.ParametersChanged?displayProperty=nameWithType> event of the collection.
+
+ If the <xref:System.Web.UI.WebControls.ParameterCollection> collection is contained by a data source control, the <xref:System.Web.UI.WebControls.ParameterCollection.ParametersChanged?displayProperty=nameWithType> event raises the data source control's <xref:System.Web.UI.IDataSource.DataSourceChanged> event, causing any data-bound controls to rebind.
+
+ Raising an event invokes the event handler through a delegate. For more information, see [Handling and Raising Events](/dotnet/standard/events/).
+
+ The <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.
+
+
+
+## Examples
+ The following code example demonstrates how to call the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method to raise the <xref:System.Web.UI.WebControls.ParameterCollection.ParametersChanged> event when the state of a parameter changes. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet7":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet7":::
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -899,15 +891,15 @@
         <summary>Saves the changes to the <see cref="T:System.Web.UI.WebControls.Parameter" /> object's view state since the time the page was posted back to the server.</summary>
         <returns>The <see cref="T:System.Object" /> that contains the changes to the <see cref="T:System.Web.UI.WebControls.Parameter" /> view state. If there is no view state associated with the object, this method returns <see langword="null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is used primarily by control developers.  
-  
- View state is the accumulation of the values of a server control's properties. These values are automatically placed in the server control's <xref:System.Web.UI.Control.ViewState%2A> property, which is an instance of the <xref:System.Web.UI.StateBag> class. This property's value is then persisted to a string object after the save state stage of the server control life cycle.  
-  
- When view state is saved, this string object is returned to the client as a variable that is stored in an HTML `hidden` element. When you author custom server controls, you can improve efficiency by overriding this method and modifying your server control's <xref:System.Web.UI.WebControls.Parameter.ViewState%2A> property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is used primarily by control developers.
+
+ View state is the accumulation of the values of a server control's properties. These values are automatically placed in the server control's <xref:System.Web.UI.Control.ViewState%2A> property, which is an instance of the <xref:System.Web.UI.StateBag> class. This property's value is then persisted to a string object after the save state stage of the server control life cycle.
+
+ When view state is saved, this string object is returned to the client as a variable that is stored in an HTML `hidden` element. When you author custom server controls, you can improve efficiency by overriding this method and modifying your server control's <xref:System.Web.UI.WebControls.Parameter.ViewState%2A> property.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.IsTrackingViewState" />
@@ -936,11 +928,11 @@
       <Docs>
         <summary>Marks the <see cref="T:System.Web.UI.WebControls.Parameter" /> object so its state will be recorded in view state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.SetDirty%2A> method is called directly by the <xref:System.Web.UI.WebControls.ParameterCollection.SetDirtyObject%2A?displayProperty=nameWithType> method, to mark the <xref:System.Web.UI.WebControls.Parameter> object so that its state is recorded in view state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.SetDirty%2A> method is called directly by the <xref:System.Web.UI.WebControls.ParameterCollection.SetDirtyObject%2A?displayProperty=nameWithType> method, to mark the <xref:System.Web.UI.WebControls.Parameter> object so that its state is recorded in view state.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.ViewState" />
@@ -972,11 +964,11 @@
         <summary>Gets or sets the size of the parameter.</summary>
         <value>The size of the parameter expressed as an integer.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When the value for <xref:System.Web.UI.WebControls.Parameter.Size%2A> is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When the value for <xref:System.Web.UI.WebControls.Parameter.Size%2A> is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Type" />
@@ -1012,13 +1004,13 @@
         <summary>Returns a duplicate of the current <see cref="T:System.Web.UI.WebControls.Parameter" /> instance.</summary>
         <returns>A <see cref="T:System.Web.UI.WebControls.Parameter" /> that is a copy of the current object.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method calls the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor to initialize a new instance of the <xref:System.Web.UI.WebControls.Parameter> class with the values of the current instance.  
-  
- If you extend the <xref:System.Web.UI.WebControls.Parameter> class, you can override the <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method to include any state that should be copied to a new instance of your derived class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method calls the <xref:System.Web.UI.WebControls.Parameter.%23ctor%28System.Web.UI.WebControls.Parameter%29> constructor to initialize a new instance of the <xref:System.Web.UI.WebControls.Parameter> class with the values of the current instance.
+
+ If you extend the <xref:System.Web.UI.WebControls.Parameter> class, you can override the <xref:System.Web.UI.WebControls.Parameter.Clone%2A> method to include any state that should be copied to a new instance of your derived class.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Web.UI.WebControls.Parameter.#ctor(System.Web.UI.WebControls.Parameter)" />
@@ -1100,13 +1092,13 @@ This member is an explicit interface member implementation. It can be used only
         <param name="savedState">An <see cref="T:System.Object" /> that represents the <see cref="T:System.Web.UI.WebControls.Parameter" /> state to restore.</param>
         <summary>Restores the data source view's previously saved view state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method restores view-state information for the <xref:System.Web.UI.WebControls.Parameter> object from a previous page request that was saved by the <xref:System.Web.UI.WebControls.Parameter.SaveViewState%2A> method.  
-  
- This method is used primarily by control developers. You can override this method to control how a custom server control restores its view state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method restores view-state information for the <xref:System.Web.UI.WebControls.Parameter> object from a previous page request that was saved by the <xref:System.Web.UI.WebControls.Parameter.SaveViewState%2A> method.
+
+ This method is used primarily by control developers. You can override this method to control how a custom server control restores its view state.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.IsTrackingViewState" />
@@ -1145,15 +1137,15 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Saves the changes to the <see cref="T:System.Web.UI.WebControls.Parameter" /> object's view state since the time the page was posted back to the server.</summary>
         <returns>The <see cref="T:System.Object" /> that contains the changes to the <see cref="T:System.Web.UI.WebControls.Parameter" /> object's view state. If there is no view state associated with the object, this method returns <see langword="null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is used primarily by control developers.  
-  
- View state is the accumulation of the values of a server control's properties. These values are automatically placed in the server control's <xref:System.Web.UI.Control.ViewState%2A> property, which is an instance of the <xref:System.Web.UI.StateBag> class. This property's value is then persisted to a string object after the save state stage of the server control life cycle.  
-  
- When view state is saved, this string object is returned to the client as a variable that is stored in an HTML `hidden` element. When you author custom server controls, you can improve efficiency by overriding this method and modifying your server control's <xref:System.Web.UI.WebControls.Parameter.ViewState%2A> property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is used primarily by control developers.
+
+ View state is the accumulation of the values of a server control's properties. These values are automatically placed in the server control's <xref:System.Web.UI.Control.ViewState%2A> property, which is an instance of the <xref:System.Web.UI.StateBag> class. This property's value is then persisted to a string object after the save state stage of the server control life cycle.
+
+ When view state is saved, this string object is returned to the client as a variable that is stored in an HTML `hidden` element. When you author custom server controls, you can improve efficiency by overriding this method and modifying your server control's <xref:System.Web.UI.WebControls.Parameter.ViewState%2A> property.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.IsTrackingViewState" />
@@ -1228,19 +1220,19 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Converts the value of this instance to its equivalent string representation.</summary>
         <returns>A string representation of the value of this instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.Parameter.ToString%2A> method returns the <xref:System.Web.UI.WebControls.Parameter.Name%2A> property of the <xref:System.Web.UI.WebControls.Parameter> object. If the <xref:System.Web.UI.WebControls.Parameter> object has no name, <xref:System.Web.UI.WebControls.Parameter.ToString%2A> returns <xref:System.String.Empty?displayProperty=nameWithType>.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to access various properties of a <xref:System.Web.UI.WebControls.Parameter> object, including its <xref:System.Web.UI.WebControls.Parameter.Name%2A> and <xref:System.Web.UI.WebControls.Parameter.Type%2A> properties.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.Parameter.ToString%2A> method returns the <xref:System.Web.UI.WebControls.Parameter.Name%2A> property of the <xref:System.Web.UI.WebControls.Parameter> object. If the <xref:System.Web.UI.WebControls.Parameter> object has no name, <xref:System.Web.UI.WebControls.Parameter.ToString%2A> returns <xref:System.String.Empty?displayProperty=nameWithType>.
+
+
+
+## Examples
+ The following code example demonstrates how to access various properties of a <xref:System.Web.UI.WebControls.Parameter> object, including its <xref:System.Web.UI.WebControls.Parameter.Name%2A> and <xref:System.Web.UI.WebControls.Parameter.Type%2A> properties.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter.ToString_1/CS/parametertostringcs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter.ToString_1/VB/parametertostringvb.aspx" id="Snippet1":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter.ToString_1/VB/parametertostringvb.aspx" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Name" />
@@ -1296,21 +1288,21 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Gets or sets the type of the parameter.</summary>
         <value>The type of the <see cref="T:System.Web.UI.WebControls.Parameter" />. The default value is <see cref="F:System.TypeCode.Object" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The type can be used to create strongly typed parameters, so that values are converted correctly between your Web application and underlying code.  
-  
- If the type of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to set the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A>, <xref:System.Web.UI.WebControls.Parameter.Type%2A>, and <xref:System.Web.UI.WebControls.Parameter.Direction%2A> properties of <xref:System.Web.UI.WebControls.Parameter> objects when using them as output parameters and return value parameters with a stored procedure. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.SqlDataSourceStatusEventArgs> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The type can be used to create strongly typed parameters, so that values are converted correctly between your Web application and underlying code.
+
+ If the type of the parameter is changed, the <xref:System.Web.UI.WebControls.Parameter.OnParameterChanged%2A> method is called.
+
+
+
+## Examples
+ The following code example demonstrates how to set the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A>, <xref:System.Web.UI.WebControls.Parameter.Type%2A>, and <xref:System.Web.UI.WebControls.Parameter.Direction%2A> properties of <xref:System.Web.UI.WebControls.Parameter> objects when using them as output parameters and return value parameters with a stored procedure. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.SqlDataSourceStatusEventArgs> class overview.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/CS/sql21cs.aspx" id="Snippet2":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/VB/sql21vb.aspx" id="Snippet2":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/VB/sql21vb.aspx" id="Snippet2":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">The parameter type is not one of the <see cref="T:System.TypeCode" /> values.</exception>
@@ -1349,21 +1341,21 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Gets a dictionary of state information that allows you to save and restore the view state of a <see cref="T:System.Web.UI.WebControls.Parameter" /> object across multiple requests for the same page.</summary>
         <value>An instance of <see cref="T:System.Web.UI.StateBag" /> that contains the <see cref="T:System.Web.UI.WebControls.Parameter" /> object's view-state information.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A parameter's view state is the accumulation of all its property values. To preserve these values across HTTP requests, ASP.NET server controls use this property, which is an instance of the <xref:System.Web.UI.StateBag> class, to store the property values. The values are then passed as a variable to an HTML `hidden` input element when subsequent requests are processed. View state is enabled for all server controls by default.  
-  
- For more information about dictionaries and how to use them, see [Collections and Data Structures](/dotnet/standard/collections/).  
-  
-   
-  
-## Examples  
- The following code example demonstrates how to use the view-state object to store parameter object state in a class that extends the <xref:System.Web.UI.WebControls.Parameter> class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A parameter's view state is the accumulation of all its property values. To preserve these values across HTTP requests, ASP.NET server controls use this property, which is an instance of the <xref:System.Web.UI.StateBag> class, to store the property values. The values are then passed as a variable to an HTML `hidden` input element when subsequent requests are processed. View state is enabled for all server controls by default.
+
+ For more information about dictionaries and how to use them, see [Collections and Data Structures](/dotnet/standard/collections/).
+
+
+
+## Examples
+ The following code example demonstrates how to use the view-state object to store parameter object state in a class that extends the <xref:System.Web.UI.WebControls.Parameter> class. This code example is part of a larger example provided for the <xref:System.Web.UI.WebControls.Parameter> class overview.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/CS/staticparameter.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet5":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.Parameter_2/VB/staticparameter.vb" id="Snippet5":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.IsTrackingViewState" />
diff --git a/xml/System.Web.UI.WebControls/QueryStringParameter.xml b/xml/System.Web.UI.WebControls/QueryStringParameter.xml
index b4f38c434b1..bd6eceb90c8 100644
--- a/xml/System.Web.UI.WebControls/QueryStringParameter.xml
+++ b/xml/System.Web.UI.WebControls/QueryStringParameter.xml
@@ -23,31 +23,24 @@
   <Docs>
     <summary>Binds the value of an HTTP request query-string field to a parameter object.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can use the <xref:System.Web.UI.WebControls.QueryStringParameter> class to bind the value of a field that is passed as part of an HTTP request query string to a parameter that is used in a parameterized query or command. The field is retrieved from the <xref:System.Web.HttpRequest.QueryString%2A> collection.  
-  
- Controls that bind data to the parameter might throw an exception if a <xref:System.Web.UI.WebControls.QueryStringParameter> object is referenced, but no corresponding query-string name/value pair is passed. Similarly, they might display no data if the query-string field name is passed without a corresponding value. To avoid these situations, set the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property where appropriate.  
-  
- The <xref:System.Web.UI.WebControls.QueryStringParameter> class provides the <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property, which identifies the name of the query string value to bind to. It also provides the properties that are inherited from the <xref:System.Web.UI.WebControls.Parameter> class.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can use the <xref:System.Web.UI.WebControls.QueryStringParameter> class to bind the value of a field that is passed as part of an HTTP request query string to a parameter that is used in a parameterized query or command. The field is retrieved from the <xref:System.Web.HttpRequest.QueryString%2A> collection.
+
+ Controls that bind data to the parameter might throw an exception if a <xref:System.Web.UI.WebControls.QueryStringParameter> object is referenced, but no corresponding query-string name/value pair is passed. Similarly, they might display no data if the query-string field name is passed without a corresponding value. To avoid these situations, set the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property where appropriate.
+
+ The <xref:System.Web.UI.WebControls.QueryStringParameter> class provides the <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property, which identifies the name of the query string value to bind to. It also provides the properties that are inherited from the <xref:System.Web.UI.WebControls.Parameter> class.
+
 > [!IMPORTANT]
->  The <xref:System.Web.UI.WebControls.QueryStringParameter> class does not validate the value that is passed; it provides the raw value. However, you can validate the value of a <xref:System.Web.UI.WebControls.QueryStringParameter> object in a data source control. To do so, handle the `Selecting`, `Updating`, `Inserting`, or `Deleting` event of the data source control and check the parameter value in the event handler. If the value of the parameter does not pass the validation tests, you can cancel the data operation by setting the <xref:System.ComponentModel.CancelEventArgs.Cancel%2A> property of the associated <xref:System.ComponentModel.CancelEventArgs> class to `true`.  
-  
-   
-  
-## Examples  
- The following example shows how to create a <xref:System.Web.UI.WebControls.QueryStringParameter> object to use as a filter when you display data in a <xref:System.Web.UI.WebControls.GridView> control. You add the <xref:System.Web.UI.WebControls.QueryStringParameter> object to the <xref:System.Web.UI.WebControls.AccessDataSource> control's <xref:System.Web.UI.WebControls.SqlDataSource.FilterParameters%2A> collection. The parameter object binds the value of the query-string field named `country` to its <xref:System.Web.UI.WebControls.SqlDataSource.FilterExpression%2A> string. Because no <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is specified for the parameter, if no field named `country` is passed with the query string, the <xref:System.Web.UI.WebControls.AccessDataSource> control throws a <xref:System.NullReferenceException> exception. If a field named `country` is passed but has no value, the <xref:System.Web.UI.WebControls.GridView> control displays no data.  
-  
+>  The <xref:System.Web.UI.WebControls.QueryStringParameter> class does not validate the value that is passed; it provides the raw value. However, you can validate the value of a <xref:System.Web.UI.WebControls.QueryStringParameter> object in a data source control. To do so, handle the `Selecting`, `Updating`, `Inserting`, or `Deleting` event of the data source control and check the parameter value in the event handler. If the value of the parameter does not pass the validation tests, you can cancel the data operation by setting the <xref:System.ComponentModel.CancelEventArgs.Cancel%2A> property of the associated <xref:System.ComponentModel.CancelEventArgs> class to `true`.
+
+## Examples
+ The following example shows how to create a <xref:System.Web.UI.WebControls.QueryStringParameter> object to use as a filter when you display data in a <xref:System.Web.UI.WebControls.GridView> control. You add the <xref:System.Web.UI.WebControls.QueryStringParameter> object to the <xref:System.Web.UI.WebControls.AccessDataSource> control's <xref:System.Web.UI.WebControls.SqlDataSource.FilterParameters%2A> collection. The parameter object binds the value of the query-string field named `country` to its <xref:System.Web.UI.WebControls.SqlDataSource.FilterExpression%2A> string. Because no <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is specified for the parameter, if no field named `country` is passed with the query string, the <xref:System.Web.UI.WebControls.AccessDataSource> control throws a <xref:System.NullReferenceException> exception. If a field named `country` is passed but has no value, the <xref:System.Web.UI.WebControls.GridView> control displays no data.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_4/CS/qsp4cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_4/VB/qsp4vb.aspx" id="Snippet1":::  
-  
- The following example shows how to create a <xref:System.Web.UI.WebControls.QueryStringParameter> object to display data from an Access database by using a parameterized SQL query. The <xref:System.Web.UI.WebControls.AccessDataSource> object retrieves records that are then displayed in a <xref:System.Web.UI.WebControls.GridView> control. The <xref:System.Web.UI.WebControls.GridView> control is also editable, and lets users update the status of orders in the Northwind Traders Orders table.  
-  
- :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx" id="Snippet1":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_4/VB/qsp4vb.aspx" id="Snippet1":::
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Web.UI.WebControls.ControlParameter" />
@@ -89,34 +82,34 @@
       <Docs>
         <summary>Initializes a new unnamed instance of the <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.QueryStringParameter> object that is created by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is initialized with default values for all its properties. The properties are initialized as follows:  
-  
--   <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> is initialized to an empty string ("").  
-  
--   <xref:System.Web.UI.WebControls.Parameter.Name%2A> is initialized to an empty string ("").  
-  
--   <xref:System.Web.UI.WebControls.Parameter.Type%2A> is initialized to <xref:System.TypeCode.Object?displayProperty=nameWithType>.  
-  
--   <xref:System.Web.UI.WebControls.Parameter.Direction%2A> is initialized to <xref:System.Data.ParameterDirection.Input>.  
-  
--   <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> is initialized to `null`.  
-  
-   
-  
-## Examples  
- The following example shows how to use the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor to create a new <xref:System.Web.UI.WebControls.QueryStringParameter> parameter and add it to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection of an <xref:System.Web.UI.WebControls.AccessDataSource> control.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.QueryStringParameter> object that is created by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is initialized with default values for all its properties. The properties are initialized as follows:
+
+-   <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> is initialized to an empty string ("").
+
+-   <xref:System.Web.UI.WebControls.Parameter.Name%2A> is initialized to an empty string ("").
+
+-   <xref:System.Web.UI.WebControls.Parameter.Type%2A> is initialized to <xref:System.TypeCode.Object?displayProperty=nameWithType>.
+
+-   <xref:System.Web.UI.WebControls.Parameter.Direction%2A> is initialized to <xref:System.Data.ParameterDirection.Input>.
+
+-   <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> is initialized to `null`.
+
+
+
+## Examples
+ The following example shows how to use the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor to create a new <xref:System.Web.UI.WebControls.QueryStringParameter> parameter and add it to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection of an <xref:System.Web.UI.WebControls.AccessDataSource> control.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/CS/querystrparam1cs.aspx.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/VB/querystrparam1vb.aspx.vb" id="Snippet2":::  
-  
- The <xref:System.Web.UI.WebControls.QueryStringParameter> object is added to the <xref:System.Web.UI.WebControls.AccessDataSource> control and is declared in an ASP.NET Web page. The <xref:System.Web.UI.WebControls.ListBox> control uses the <xref:System.Web.UI.WebControls.AccessDataSource> control to bind and display data whenever the page is requested with a query string that contains a field that is named `empId` and that has a corresponding value.  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/VB/querystrparam1vb.aspx.vb" id="Snippet2":::
+
+ The <xref:System.Web.UI.WebControls.QueryStringParameter> object is added to the <xref:System.Web.UI.WebControls.AccessDataSource> control and is declared in an ASP.NET Web page. The <xref:System.Web.UI.WebControls.ListBox> control uses the <xref:System.Web.UI.WebControls.AccessDataSource> control to bind and display data whenever the page is requested with a query string that contains a field that is named `empId` and that has a corresponding value.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/CS/querystrparam1cs.aspx" id="Snippet3":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/VB/querystrparam1vb.aspx" id="Snippet3":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/VB/querystrparam1vb.aspx" id="Snippet3":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -141,11 +134,11 @@
         <param name="original">A <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> instance from which the current instance is initialized.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> class, using the values of the instance that is specified by the <paramref name="original" /> parameter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is a protected copy constructor that is used to clone a <xref:System.Web.UI.WebControls.QueryStringParameter> instance. The values of the <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A>, <xref:System.Web.UI.WebControls.Parameter.Name%2A>, and <xref:System.Web.UI.WebControls.Parameter.Type%2A> properties are transferred to the new instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is a protected copy constructor that is used to clone a <xref:System.Web.UI.WebControls.QueryStringParameter> instance. The values of the <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A>, <xref:System.Web.UI.WebControls.Parameter.Name%2A>, and <xref:System.Web.UI.WebControls.Parameter.Type%2A> properties are transferred to the new instance.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Web.UI.WebControls.QueryStringParameter.Clone" />
@@ -173,19 +166,19 @@
         <param name="queryStringField">The name of the query-string field that the parameter object is bound to. The default is an empty string ("").</param>
         <summary>Initializes a new named instance of the <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> class, using the specified string to identify which query-string field to bind to.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.QueryStringParameter> object that is created by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is initialized with the specified parameter name that identifies the query-string field that the parameter binds to. The <xref:System.Web.UI.WebControls.Parameter.Type%2A> and <xref:System.Web.UI.WebControls.Parameter.Direction%2A> properties are initialized with default values.  
-  
-   
-  
-## Examples  
- The following example shows how to create two <xref:System.Web.UI.WebControls.QueryStringParameter> objects by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor and add them to an <xref:System.Web.UI.WebControls.AccessDataSource> control's <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection. A <xref:System.Web.UI.WebControls.GridView> control displays data if the `employee` and `country` query-string fields are passed with the request and if they have valid values.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.QueryStringParameter> object that is created by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is initialized with the specified parameter name that identifies the query-string field that the parameter binds to. The <xref:System.Web.UI.WebControls.Parameter.Type%2A> and <xref:System.Web.UI.WebControls.Parameter.Direction%2A> properties are initialized with default values.
+
+
+
+## Examples
+ The following example shows how to create two <xref:System.Web.UI.WebControls.QueryStringParameter> objects by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor and add them to an <xref:System.Web.UI.WebControls.AccessDataSource> control's <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection. A <xref:System.Web.UI.WebControls.GridView> control displays data if the `employee` and `country` query-string fields are passed with the request and if they have valid values.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_2/CS/qsp2cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_2/VB/qsp2vb.aspx" id="Snippet1":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_2/VB/qsp2vb.aspx" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Name" />
@@ -242,19 +235,19 @@
         <param name="queryStringField">The name of the query-string field that the parameter object is bound to. The default is an empty string ("").</param>
         <summary>Initializes a new named and strongly typed instance of the <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> class, using the specified string to identify which query-string field to bind to.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Web.UI.WebControls.QueryStringParameter> object that is created by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is initialized with the specified parameter name, the parameter type, and a string that identifies the query-string field that the parameter binds to. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> and <xref:System.Web.UI.WebControls.Parameter.ConvertEmptyStringToNull%2A> properties are initialized with default values.  
-  
-   
-  
-## Examples  
- The following example shows how to create a <xref:System.Web.UI.WebControls.QueryStringParameter> object by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor and add it to an <xref:System.Web.UI.WebControls.AccessDataSource> control's <xref:System.Web.UI.WebControls.SqlDataSource.FilterParameters%2A> collection. A <xref:System.Web.UI.WebControls.GridView> control displays data if the `employee` and `country` query-string fields are passed with the request and if they have valid values.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Web.UI.WebControls.QueryStringParameter> object that is created by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor is initialized with the specified parameter name, the parameter type, and a string that identifies the query-string field that the parameter binds to. The <xref:System.Web.UI.WebControls.Parameter.Direction%2A> and <xref:System.Web.UI.WebControls.Parameter.ConvertEmptyStringToNull%2A> properties are initialized with default values.
+
+
+
+## Examples
+ The following example shows how to create a <xref:System.Web.UI.WebControls.QueryStringParameter> object by using the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor and add it to an <xref:System.Web.UI.WebControls.AccessDataSource> control's <xref:System.Web.UI.WebControls.SqlDataSource.FilterParameters%2A> collection. A <xref:System.Web.UI.WebControls.GridView> control displays data if the `employee` and `country` query-string fields are passed with the request and if they have valid values.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_3/CS/qsp3cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_3/VB/qsp3vb.aspx" id="Snippet1":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_3/VB/qsp3vb.aspx" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.Parameter.Name" />
@@ -282,11 +275,11 @@
         <summary>Returns a duplicate of the current <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> instance.</summary>
         <returns>A duplicate of the current instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.QueryStringParameter.Clone%2A> method calls the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor to initialize a new instance of the <xref:System.Web.UI.WebControls.QueryStringParameter> class by using the values of the current instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.QueryStringParameter.Clone%2A> method calls the <xref:System.Web.UI.WebControls.QueryStringParameter.%23ctor%2A> constructor to initialize a new instance of the <xref:System.Web.UI.WebControls.QueryStringParameter> class by using the values of the current instance.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Web.UI.WebControls.QueryStringParameter.#ctor(System.Web.UI.WebControls.QueryStringParameter)" />
@@ -318,19 +311,19 @@
       </Parameters>
       <Docs>
         <param name="context">The current <see cref="T:System.Web.HttpContext" /> instance of the request.</param>
-        <param name="control">A Web server control that is associated with the ASP.NET Web page where the <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> object is used.  
-  
+        <param name="control">A Web server control that is associated with the ASP.NET Web page where the <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> object is used.
+
  **Note** This parameter is not used.</param>
         <summary>Updates and returns the value of the <see cref="T:System.Web.UI.WebControls.QueryStringParameter" /> object.</summary>
         <returns>An object that represents the current value of the parameter. If the context or the request is <see langword="null" />, the <see cref="M:System.Web.UI.WebControls.QueryStringParameter.Evaluate(System.Web.HttpContext,System.Web.UI.Control)" /> method returns <see langword="null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.QueryStringParameter> object tries to bind to the query-string field every time that the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method is called.  
-  
- The `context` parameter is used by the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method to retrieve the value of the specified query-string field from the query string. The `control` parameter is ignored.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.QueryStringParameter> object tries to bind to the query-string field every time that the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method is called.
+
+ The `context` parameter is used by the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method to retrieve the value of the specified query-string field from the query string. The `control` parameter is ignored.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.QueryStringParameter.QueryStringField" />
@@ -362,24 +355,24 @@
         <summary>Gets or sets the name of the query-string field that the parameter binds to.</summary>
         <value>The name of the query-string field that the parameter binds to.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property identifies a name/value pair that is passed with the query string. The <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property identifies the name of the pair, whereas the <xref:System.Web.UI.WebControls.QueryStringParameter> property binds to its corresponding value at run time. If the expected query-string name/value pair is not passed to the page with the query string, the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method then tries to bind the parameter to the value of the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property. If the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is not set, the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method fails to bind the parameter to a value.  
-  
-   
-  
-## Examples  
- The following example shows how to use a <xref:System.Web.UI.WebControls.QueryStringParameter> object together with a <xref:System.Web.UI.WebControls.SqlDataSource> control to display data in a <xref:System.Web.UI.WebControls.ListBox> control. The <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property is set to the name of the expected query-string field, and the parameter is added to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection. A <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is provided in case the name/value pair is not passed with the query string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property identifies a name/value pair that is passed with the query string. The <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property identifies the name of the pair, whereas the <xref:System.Web.UI.WebControls.QueryStringParameter> property binds to its corresponding value at run time. If the expected query-string name/value pair is not passed to the page with the query string, the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method then tries to bind the parameter to the value of the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property. If the <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is not set, the <xref:System.Web.UI.WebControls.QueryStringParameter.Evaluate%2A> method fails to bind the parameter to a value.
+
+
+
+## Examples
+ The following example shows how to use a <xref:System.Web.UI.WebControls.QueryStringParameter> object together with a <xref:System.Web.UI.WebControls.SqlDataSource> control to display data in a <xref:System.Web.UI.WebControls.ListBox> control. The <xref:System.Web.UI.WebControls.QueryStringParameter.QueryStringField%2A> property is set to the name of the expected query-string field, and the parameter is added to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection. A <xref:System.Web.UI.WebControls.Parameter.DefaultValue%2A> property is provided in case the name/value pair is not passed with the query string.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/CS/querystrparam1cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/VB/querystrparam1vb.aspx" id="Snippet1":::  
-  
- The following example shows how to use a <xref:System.Web.UI.WebControls.QueryStringParameter> object together with a <xref:System.Web.UI.WebControls.SqlDataSource> control to display data in a <xref:System.Web.UI.WebControls.GridView> control. The <xref:System.Web.UI.WebControls.QueryStringParameter> object is added to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection, together with other parameter objects that are used for the output parameter and return value. To retrieve data, handle the values that are returned from the stored procedure. This code example is part of a larger example that is provided for the <xref:System.Web.UI.WebControls.SqlDataSourceStatusEventArgs> class.  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.QueryStringParameter_1/VB/querystrparam1vb.aspx" id="Snippet1":::
+
+ The following example shows how to use a <xref:System.Web.UI.WebControls.QueryStringParameter> object together with a <xref:System.Web.UI.WebControls.SqlDataSource> control to display data in a <xref:System.Web.UI.WebControls.GridView> control. The <xref:System.Web.UI.WebControls.QueryStringParameter> object is added to the <xref:System.Web.UI.WebControls.SqlDataSource.SelectParameters%2A> collection, together with other parameter objects that are used for the output parameter and return value. To retrieve data, handle the values that are returned from the stored procedure. This code example is part of a larger example that is provided for the <xref:System.Web.UI.WebControls.SqlDataSourceStatusEventArgs> class.
+
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/CS/sql21cs.aspx" id="Snippet2":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/VB/sql21vb.aspx" id="Snippet2":::  
-  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSourceStatusEventArgs_1/VB/sql21vb.aspx" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -410,11 +403,11 @@
         <value>
           <see langword="true" /> if the value of the query parameter is being validated; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the page property <xref:System.Web.UI.Page.SkipFormActionValidation%2A> is set to `true`, and the <xref:System.Web.UI.WebControls.QueryStringParameter.ValidateInput%2A> property is set to `false`, the query string parameter will not be validated. However, if the page property <xref:System.Web.UI.Page.SkipFormActionValidation%2A> is set to `true`, and the <xref:System.Web.UI.WebControls.QueryStringParameter.ValidateInput%2A> property is set to `true`, the query string parameter will be validated. If the page property <xref:System.Web.UI.Page.SkipFormActionValidation%2A> is set to `false`, the query string parameter will be validated regardless of whether the <xref:System.Web.UI.WebControls.QueryStringParameter.ValidateInput%2A> property is set to `true` or `false`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the page property <xref:System.Web.UI.Page.SkipFormActionValidation%2A> is set to `true`, and the <xref:System.Web.UI.WebControls.QueryStringParameter.ValidateInput%2A> property is set to `false`, the query string parameter will not be validated. However, if the page property <xref:System.Web.UI.Page.SkipFormActionValidation%2A> is set to `true`, and the <xref:System.Web.UI.WebControls.QueryStringParameter.ValidateInput%2A> property is set to `true`, the query string parameter will be validated. If the page property <xref:System.Web.UI.Page.SkipFormActionValidation%2A> is set to `false`, the query string parameter will be validated regardless of whether the <xref:System.Web.UI.WebControls.QueryStringParameter.ValidateInput%2A> property is set to `true` or `false`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Web.UI.WebControls/SqlDataSource.xml b/xml/System.Web.UI.WebControls/SqlDataSource.xml
index bc28b3884dd..94e478cc838 100644
--- a/xml/System.Web.UI.WebControls/SqlDataSource.xml
+++ b/xml/System.Web.UI.WebControls/SqlDataSource.xml
@@ -1040,29 +1040,12 @@ This section contains four code examples:
 > [!IMPORTANT]
 >  For information about storing a connection string, see [How To: Secure Connection Strings when Using Data Source Controls](https://learn.microsoft.com/previous-versions/aspnet/ms178372(v=vs.100)).
 
-
-
 ## Examples
- This section contains two code examples. The first code example demonstrates how to set the <xref:System.Web.UI.WebControls.SqlDataSource.ConnectionString%2A> property to connect to a Microsoft SQL Server database and display the results of the <xref:System.Web.UI.WebControls.SqlDataSource.SelectCommand%2A> property in a <xref:System.Web.UI.WebControls.GridView> control. The second code example demonstrates a more complex scenario, where a <xref:System.Web.UI.WebControls.SqlDataSource> control is used to display and update data in a password-protected Microsoft Access database. In each case, the `connectionStrings` element of the Web.config file is shown first, followed by the ASP.NET page that contains the <xref:System.Web.UI.WebControls.SqlDataSource> control.
-
- The following code example demonstrates how to set the <xref:System.Web.UI.WebControls.SqlDataSource.ConnectionString%2A> property to connect to a SQL Server database and display the results of the <xref:System.Web.UI.WebControls.SqlDataSource.SelectCommand%2A> property in a <xref:System.Web.UI.WebControls.GridView> control.
-
 
+The following code example demonstrates how to set the <xref:System.Web.UI.WebControls.SqlDataSource.ConnectionString%2A> property to connect to a SQL Server database and display the results of the <xref:System.Web.UI.WebControls.SqlDataSource.SelectCommand%2A> property in a <xref:System.Web.UI.WebControls.GridView> control.
 
  :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_3sql/CS/sql3cs.aspx" id="Snippet1":::
  :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_3sql/VB/sql3vb.aspx" id="Snippet1":::
-
- The following code example demonstrates a more complex scenario than the preceding code example, where a <xref:System.Web.UI.WebControls.SqlDataSource> control is used to display and update data in a password-protected Access database. Because the <xref:System.Web.UI.WebControls.SqlDataSource> is used with Access, the <xref:System.Web.UI.WebControls.SqlDataSource.ProviderName%2A> property is set to the <xref:System.Data.OleDb> provider, and the <xref:System.Web.UI.WebControls.SqlDataSource.ConnectionString%2A> property is set to an appropriate connection string for a UNC-shared Access database. A <xref:System.Web.UI.WebControls.GridView> control displays orders with shipment dates. You can update an order by checking the appropriate check box, and then clicking the **Update** button.
-
-> [!IMPORTANT]
->  This example includes a password in plain text only for illustration purposes. In a production application, connection strings that include passwords should be encrypted. For more information, see [Protecting Connection Information](/dotnet/framework/data/adonet/protecting-connection-information).
-
- :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx" id="Snippet1":::
-
- :::code language="aspx-csharp" source="~/snippets/csharp/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/CS/sql22cs.aspx" id="Snippet2":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx" id="Snippet2":::
-
  ]]></format>
         </remarks>
         <altmember cref="P:System.Web.UI.WebControls.SqlDataSource.ProviderName" />

From 517862c69c01c759c79089db0594434f16ffb40a Mon Sep 17 00:00:00 2001
From: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:04:33 -0700
Subject: [PATCH 3/7] ROPC fixes in VB files (#10480)

---
 .../VB/Project.vbproj                         | 12 +++
 .../Classic WebData OdbcCommand/VB/source.vb  |  5 -
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  7 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              | 11 +--
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  9 +-
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              | 10 +-
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  5 -
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../Project.vbproj                            | 12 +++
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  7 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  5 -
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  4 -
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/Project.vbproj                         | 12 +++
 .../VB/Project.vbproj                         | 12 +++
 .../VB/Project.vbproj                         | 12 +++
 .../VB/Project.vbproj                         |  2 +-
 .../VB/source.vb                              |  7 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  7 --
 .../VB/Project.vbproj                         |  2 +-
 .../VB/source.vb                              |  7 --
 .../VB/Project.vbproj                         |  2 +-
 .../VB/source.vb                              |  7 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  5 -
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  6 --
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              | 13 +--
 .../VB/source.vb                              | 36 -------
 .../VB/Project.vbproj                         |  8 ++
 .../VB/source.vb                              | 15 ++-
 .../VB/Project.vbproj                         |  8 ++
 .../VB/source.vb                              | 30 ++----
 .../VB/source.vb                              | 48 ---------
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              |  7 +-
 .../VB/Project.vbproj                         | 12 +++
 .../VB/source.vb                              | 49 ++++------
 .../idatareader_nextresult/vb/Project.vbproj  | 14 +++
 .../idatareader_nextresult/vb/source.vb       | 10 +-
 .../VB/sql22vb.aspx                           | 97 -------------------
 70 files changed, 441 insertions(+), 422 deletions(-)
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/Project.vbproj
 delete mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/VB/source.vb
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/Project.vbproj
 delete mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/VB/source.vb
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/Project.vbproj
 create mode 100644 snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/Project.vbproj
 delete mode 100644 snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx

diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/source.vb
index 08d6e08525b..f234389233b 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/source.vb	
@@ -6,11 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-    End Sub
-
     ' <Snippet1>
     Public Sub InsertRow(ByVal connectionString As String, _
         ByVal insertSQL As String)
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/source.vb
index 144197cbd47..f479299fa81 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/source.vb	
@@ -6,13 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String
-
-        connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        Call ExecuteTransaction(connectionString)
-    End Sub
-
     ' <Snippet1>
     Public Sub ExecuteTransaction(ByVal connectionString As String)
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb
index 144197cbd47..824def31958 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb	
@@ -6,13 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String
-
-        connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        Call ExecuteTransaction(connectionString)
-    End Sub
-
     ' <Snippet1>
     Public Sub ExecuteTransaction(ByVal connectionString As String)
 
@@ -35,10 +28,10 @@ Module Module1
                 command.Transaction = transaction
 
                 ' Execute the commands.
-                command.CommandText = _
+                command.CommandText =
                     "Insert into Region (RegionID, RegionDescription) VALUES (100, 'Description')"
                 command.ExecuteNonQuery()
-                command.CommandText = _
+                command.CommandText =
                     "Insert into Region (RegionID, RegionDescription) VALUES (101, 'Description')"
                 command.ExecuteNonQuery()
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/source.vb
index 34d0928a414..78ee6d5f9e5 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/source.vb	
@@ -2,13 +2,6 @@
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String
-
-        connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        Call CreateOdbcConnection(connectionString)
-    End Sub
-
     ' <Snippet1>
     Private Sub CreateOdbcConnection(ByVal connectionString As String)
         Using connection As New OdbcConnection(connectionString)
@@ -20,7 +13,7 @@ Module Module1
 
             ' The connection is automatically closed
             ' at the end of the Using block.
-        End Using 
+        End Using
     End Sub
     ' </Snippet1>
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/source.vb
index a97befb4d1c..bd92d77f0c0 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/source.vb	
@@ -2,12 +2,6 @@
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String
-        connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        Call InsertRow(connectionString)
-    End Sub
-
     ' <Snippet1>
     Private Sub InsertRow(ByVal connectionString As String)
 
@@ -20,10 +14,10 @@ Module Module1
             connection.Open()
             command.ExecuteNonQuery()
 
-            ' The connection is automatically closed at 
+            ' The connection is automatically closed at
             ' the end of the Using block.
         End Using
     End Sub
     ' </Snippet1>
 
-End Module
\ No newline at end of file
+End Module
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/source.vb
index f915f44057d..4066e50adb1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function CreateDataAdapter( _
         ByVal connection As OdbcConnection) As OdbcDataAdapter
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/source.vb
index 4c366399468..77928cc23eb 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/source.vb	
@@ -6,11 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-    End Sub
-
     ' <Snippet1>
     Public Function GetDataSetFromAdapter( _
         ByVal dataSet As DataSet, ByVal connectionString As String, _
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/Project.vbproj
new file mode 100644
index 00000000000..2026ecb0ada
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/source.vb
index 32e5af7efa6..fbd8b7f1871 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.Odbc
 
 Module Module1
 
-    Sub Main()
-        'Dim connectionString As String = _
-        '"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Samples\Northwind.mdb"
-        'dim x as String="DRIVER={SQL Server};SERVER=MyServer;Trusted_connection=yes;DATABASE=Northwind;"
-    End Sub
-
     ' <Snippet1>
     Public Function GetDataSetFromAdapter( _
         ByVal dataSet As DataSet, ByVal connectionString As String, _
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/Project.vbproj
new file mode 100644
index 00000000000..ccdf2c3dbe0
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.OleDb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/Project.vbproj
new file mode 100644
index 00000000000..546c755387d
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.OleDb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb
index fff8d1f636c..adf1857a6f4 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb	
@@ -5,13 +5,6 @@ Imports System.Data.OleDb
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String = "Provider=sqloledb;Data Source=(local);Initial Catalog=Northwind;" _
-                & "Integrated Security=SSPI"
-        OleDbCommandPrepare(connectionString)
-        Console.ReadLine()
-    End Sub
-
     ' <Snippet1>
     Public Sub OleDbCommandPrepare(ByVal connectionString As String)
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/Project.vbproj
new file mode 100644
index 00000000000..546c755387d
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.OleDb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/source.vb
index fe0888cb04e..a01b096afbb 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/source.vb	
@@ -7,11 +7,6 @@ Imports System.IO
 
 Module Module1
 
-    Sub Main()
-        Dim x As String = "Provider=SQLOLEDB;Data Source=(local);Integrated Security=SSPI;Initial Catalog=Northwind"
-        ReadData(x)
-    End Sub
-
     ' <Snippet1>
     Public Sub ReadData(ByVal connectionString As String)
         Dim queryString As String = "SELECT DISTINCT CustomerID FROM Orders"
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/Project.vbproj
new file mode 100644
index 00000000000..546c755387d
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.OleDb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb
index d725273c0ba..659f24c69d1 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb	
@@ -7,10 +7,6 @@ Imports System.IO
 
 Module Module1
 
-    Sub Main()
-        '       Dim x As String = "Provider=SQLOLEDB;Data Source=(local);Integrated Security=SSPI;Initial Catalog=Northwind"
-    End Sub
-
     ' <Snippet1>
     Public Function GetDataSetFromAdapter( _
         ByVal dataSet As DataSet, ByVal connectionString As String, _
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/Project.vbproj
new file mode 100644
index 00000000000..484c85eac09
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb
index 915e6cf365f..f903942d4ab 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim str As String = "Data Source=(local);Initial Catalog=Northwind;" _
-       & "Integrated Security=SSPI;"
-        ReadOrderData(str)
-    End Sub
-
     ' <Snippet1>
     Public Sub ReadOrderData(ByVal connectionString As String)
         Dim queryString As String = _
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/Project.vbproj
new file mode 100644
index 00000000000..84455e1397c
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/Project.vbproj
new file mode 100644
index 00000000000..84455e1397c
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/Project.vbproj
new file mode 100644
index 00000000000..84455e1397c
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Project.vbproj
new file mode 100644
index 00000000000..84455e1397c
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/Project.vbproj
index 9de5f49321c..b8fcb56ef9d 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/Project.vbproj	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/Project.vbproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb
index 672612b5420..cade2cf5c85 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb	
@@ -6,13 +6,6 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String = _
-           "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)"
-        ExecuteSqlTransaction(connectionString)
-        Console.ReadLine()
-
-    End Sub
     ' <Snippet1>
     Private Sub ExecuteSqlTransaction(ByVal connectionString As String)
         Using connection As New SqlConnection(connectionString)
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/Project.vbproj
new file mode 100644
index 00000000000..484c85eac09
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/source.vb
index 912cfe818e7..a6ea09aa1fc 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/source.vb	
@@ -6,13 +6,6 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String = _
-           "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)"
-        ExecuteSqlTransaction(connectionString)
-        Console.ReadLine()
-
-    End Sub
     ' <Snippet1>
     Private Sub ExecuteSqlTransaction(ByVal connectionString As String)
         Using connection As New SqlConnection(connectionString)
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/Project.vbproj
index 9de5f49321c..b8fcb56ef9d 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/Project.vbproj	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/Project.vbproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb
index 0cc04ffecee..35e474a1937 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb	
@@ -6,13 +6,6 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String = _
-           "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)"
-        ExecuteSqlTransaction(connectionString)
-        Console.ReadLine()
-
-    End Sub
     ' <Snippet1>
     Private Sub ExecuteSqlTransaction(ByVal connectionString As String)
         Using connection As New SqlConnection(connectionString)
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/Project.vbproj
index 9de5f49321c..b8fcb56ef9d 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/Project.vbproj	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/Project.vbproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/source.vb
index 1ef6991cc1f..458e3b99d52 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/source.vb	
@@ -6,13 +6,6 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim connectionString As String = _
-           "Persist Security Info=False;Integrated Security=SSPI;database=Northwind;server=(local)"
-        ExecuteSqlTransaction(connectionString)
-        Console.ReadLine()
-
-    End Sub
     ' <Snippet1>
     Private Sub ExecuteSqlTransaction(ByVal connectionString As String)
         Using connection As New SqlConnection(connectionString)
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/Project.vbproj
new file mode 100644
index 00000000000..484c85eac09
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/source.vb
index 436406a097f..780f1f46c96 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/source.vb	
@@ -6,11 +6,6 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim str As String = "Data Source=(local);Initial Catalog=Northwind;" _
-       & "Integrated Security=SSPI;"
-        ReadOrderData(str)
-    End Sub
     ' <Snippet1>
     Private Sub ReadOrderData(ByVal connectionString As String)
         Dim queryString As String = _
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/Project.vbproj
new file mode 100644
index 00000000000..484c85eac09
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/source.vb
index d0bf9e8fbfc..4a3fd33863d 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/source.vb	
@@ -6,12 +6,6 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim str As String = "Data Source=(local);Initial Catalog=Northwind;" _
-       & "Integrated Security=SSPI;"
-        ReadGetOrdinal(str)
-    End Sub
-
     ' <Snippet1>
     Private Sub ReadGetOrdinal(ByVal connectionString As String)
         Dim queryString As String = _
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/Project.vbproj
new file mode 100644
index 00000000000..484c85eac09
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb
index b65366b3ed0..084d093e223 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb	
@@ -1,5 +1,4 @@
-' <Snippet1>
-Option Explicit On
+Option Explicit On
 Option Strict On
 
 Imports System.Data
@@ -7,12 +6,7 @@ Imports System.Data.SqlClient
 
 Module Module1
 
-    Sub Main()
-        Dim str As String = "Data Source=(local);Initial Catalog=Northwind;" _
-       & "Integrated Security=SSPI;"
-        ReadOrderData(str)
-    End Sub
-
+    ' <Snippet1>
     Private Sub ReadOrderData(ByVal connectionString As String)
         Dim queryString As String = _
             "SELECT OrderID, CustomerID FROM dbo.Orders;"
@@ -35,8 +29,7 @@ Module Module1
 
     Private Sub ReadSingleRow(ByVal record As IDataRecord)
        Console.WriteLine(String.Format("{0}, {1}", record(0), record(1)))
-
     End Sub
+    ' </Snippet1>
 
 End Module
-' </Snippet1>
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/VB/source.vb
deleted file mode 100644
index f71dd4caf2a..00000000000
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Add/VB/source.vb	
+++ /dev/null
@@ -1,36 +0,0 @@
-Option Explicit On
-Option Strict On
-
-Imports System.Data
-Imports System.Data.Common
-
-Module Module1
-    ' <Snippet1>
-    Sub Main()
-        Try
-            Dim builder As New DbConnectionStringBuilder
-            builder.Add("Data Source", "ServerName")
-            builder.Add("Initial Catalog", "TheDatabase")
-            builder.Add("User ID", "UserName")
-            builder.Add("Password", "*******")
-            builder.Add("Command Logging", False)
-
-            ' Overwrite the existing "User ID" value.
-            builder.Add("User ID", "NewUserName")
-
-            ' The following code would trigger 
-            ' an ArgumentNullException.
-            ' builder.Add(Nothing, "Some Value")
-
-            Console.WriteLine(builder.ConnectionString)
-
-        Catch ex As ArgumentNullException
-            Console.WriteLine("Null key values are not allowed.")
-        End Try
-
-        Console.WriteLine("Press Enter to continue.")
-        Console.ReadLine()
-    End Sub
-    ' </Snippet1>
-End Module
-
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/Project.vbproj
new file mode 100644
index 00000000000..706cd0177f4
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/Project.vbproj	
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/source.vb
index dfbeb49c37c..689e6367026 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/source.vb	
@@ -1,7 +1,5 @@
 Option Explicit On
 Option Strict On
-
-Imports System.Data
 Imports System.Data.Common
 
 Module Module1
@@ -13,8 +11,7 @@ Module Module1
         Dim builder As New DbConnectionStringBuilder()
         builder.Add("Data Source", "c:\MyData\MyDb.mdb")
         builder.Add("Provider", "Microsoft.Jet.Oledb.4.0")
-        builder.Add("Jet OLEDB:Database Password", "*******")
-        builder.Add("Jet OLEDB:System Database", _
+        builder.Add("Jet OLEDB:System Database",
             "c:\MyData\Workgroup.mdb")
         ' Set up row-level locking.
         builder.Add("Jet OLEDB:Database Locking Mode", 1)
@@ -29,24 +26,24 @@ Module Module1
         ' connection string to it, to demonstrate how
         ' the class parses connection strings.
         builder.Clear()
-        builder.ConnectionString = _
-            "Data Source=(local);Initial Catalog=AdventureWorks;" & _
+        builder.ConnectionString =
+            "Data Source=(local);Initial Catalog=AdventureWorks;" &
             "Integrated Security=SSPI"
 
-        ' The DbConnectionStringBuilder class has parsed the contents, 
+        ' The DbConnectionStringBuilder class has parsed the contents,
         ' so you can work with any individual key/value pair.
         builder("Data Source") = "."
         Console.WriteLine(builder.ConnectionString)
         Console.WriteLine()
 
-        ' Because the DbConnectionStringBuilder class doesn't 
+        ' Because the DbConnectionStringBuilder class doesn't
         ' validate its key/value pairs, you can use this class
         ' to store any semicolon-delimited list. The following
         ' snippet places an arbitrary string into the ConnectionString
         ' property, changes one of the values, and then displays the
         ' resulting string.
         builder.Clear()
-        builder.ConnectionString = _
+        builder.ConnectionString =
             "Value1=10;Value2=20;Value3=30;Value4=40"
         builder("Value2") = 25
         Console.WriteLine(builder.ConnectionString)
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/Project.vbproj
new file mode 100644
index 00000000000..706cd0177f4
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/Project.vbproj	
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb
index 65a4c5b17fd..62a468327ee 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb	
@@ -14,25 +14,22 @@ Module Module1
         Dim builder As New DbConnectionStringBuilder()
         builder.ConnectionString = "Data Source=c:\MyData\MyDb.mdb"
         builder.Add("Provider", "Microsoft.Jet.Oledb.4.0")
-        builder.Add("Jet OLEDB:Database Password", "*******")
-        builder.Add("Jet OLEDB:System Database", _
-            "c:\MyData\Workgroup.mdb")
 
         ' Set up row-level locking.
         builder.Add("Jet OLEDB:Database Locking Mode", 1)
 
-        ' Note that the DbConnectionStringBuilder class 
-        ' is database agnostic, and it's possible to 
-        ' build any type of connection string using 
+        ' Note that the DbConnectionStringBuilder class
+        ' is database agnostic, and it's possible to
+        ' build any type of connection string using
         ' this class.
-        ' Notice that the ConnectionString property may have been 
+        ' Notice that the ConnectionString property may have been
         ' formatted by the DbConnectionStringBuilder class.
 
         Dim oledbConnect As New _
             OleDbConnection(builder.ConnectionString)
         Console.WriteLine(oledbConnect.ConnectionString)
 
-        ' Use the same DbConnectionStringBuilder to create 
+        ' Use the same DbConnectionStringBuilder to create
         ' a SqlConnection object.
         builder.Clear()
         builder.Add("integrated security", True)
@@ -42,25 +39,16 @@ Module Module1
         Dim sqlConnect As New SqlConnection(builder.ConnectionString)
         Console.WriteLine(sqlConnect.ConnectionString)
 
-        ' Pass the DbConnectionStringBuilder an existing 
+        ' Pass the DbConnectionStringBuilder an existing
         ' connection string, and you can retrieve and
         ' modify any of the elements.
-        builder.ConnectionString = _
-            "server=(local);user id=*******;" & _
-            "password=*******;initial catalog=AdventureWorks"
+        builder.ConnectionString = "server=(local);initial catalog=AdventureWorks"
         builder.Item("Server") = "."
-        builder.Remove("User ID")
 
-        ' Note that calling Remove on a nonexistent item doesn't
-        ' throw an exception.
-        builder.Remove("BadItem")
-
-        ' The Item property is the default for the class, 
-        ' and setting the Item property adds the value if 
+        ' The Item property is the default for the class,
+        ' and setting the Item property adds the value if
         ' necessary.
         builder("Integrated Security") = True
-        builder.Remove("password")
-        builder.Item("User ID") = "Hello"
         Console.WriteLine(builder.ConnectionString)
 
         Console.WriteLine("Press Enter to finish.")
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/VB/source.vb
deleted file mode 100644
index 4c699e5f6da..00000000000
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Clear/VB/source.vb	
+++ /dev/null
@@ -1,48 +0,0 @@
-Option Explicit
-Option Strict
-
-Imports System.Data
-' <Snippet1>
-Imports System.Data.OleDb    
-
-Module Module1
-  Sub Main()
-    Dim builder As New OleDbConnectionStringBuilder()
-    builder.ConnectionString = "Data Source=C:\Sample.mdb"
-
-    ' Call the Add method to explicitly add key/value
-    ' pairs to the internal collection.
-    builder.Add("Provider", "Microsoft.Jet.Oledb.4.0")
-    builder.Add("Jet OLEDB:Database Password", "MyPassword!")
-    builder.Add("Jet OLEDB:System Database", "C:\Workgroup.mdb")
-
-    ' Set up row-level locking.
-    builder.Add("Jet OLEDB:Database Locking Mode", 1)
-
-    ' Dump the contents of the "filled-in" OleDbConnectionStringBuilder
-    ' to the console window.
-    DumpBuilderContents(builder)
-
-    ' Clear current values and reset known keywords to their
-    ' default values.
-    builder.Clear()
-
-    ' Dump the contents of the newly emptied 
-    ' OleDbConnectionStringBuilder
-    ' to the console window.
-    DumpBuilderContents(builder)
-
-    Console.WriteLine("Press Enter to continue.")
-    Console.ReadLine()
-  End Sub
-
-  Private Sub DumpBuilderContents(ByVal builder As OleDbConnectionStringBuilder)
-    Console.WriteLine("=================")
-    Console.WriteLine("builder.ConnectionString = " & builder.ConnectionString)
-    For Each key As String In builder.Keys
-      Console.WriteLine(key & "=" & builder.Item(key).ToString)
-    Next
-  End Sub
-End Module
-' </Snippet1>
-
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/Project.vbproj
new file mode 100644
index 00000000000..9db400aecea
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.OleDb" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/source.vb
index 10d17931832..cc729944b68 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/source.vb	
@@ -3,7 +3,7 @@ Option Strict
 
 Imports System.Data
 ' <Snippet1>
-Imports System.Data.OleDb    
+Imports System.Data.OleDb
 
 Module Module1
   Sub Main()
@@ -11,7 +11,6 @@ Module Module1
     builder.Provider = "Microsoft.Jet.Oledb.4.0"
     builder.DataSource = "C:\Sample.mdb"
     ' Set properties using the Item property.
-    builder.Item("Jet OLEDB:Database Password") = "DataPassword"
     builder.Item("Jet OLEDB:Encrypt Database") = True
 
     ' Because Item is the default property, you can leave out
@@ -25,8 +24,8 @@ Module Module1
     Console.WriteLine(builder.Item("Jet OLEDB:System database"))
     Console.WriteLine(builder("Jet OLEDB:Encrypt Database"))
 
-    ' You can set or retrieve any of the "default" values for the 
-    ' provider, as well, even if you did not set their values. Again, 
+    ' You can set or retrieve any of the "default" values for the
+    ' provider, as well, even if you did not set their values. Again,
     ' explicitly specifying the Item property name is optional.
     Console.WriteLine(builder.Item("Jet OLEDB:Database Locking Mode"))
     Console.WriteLine(builder("Jet OLEDB:Global Partial Bulk Ops"))
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/Project.vbproj
new file mode 100644
index 00000000000..1564968cb6e
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/Project.vbproj	
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Data.OracleClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/source.vb
index 96e172add38..78dcf2592bf 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OracleConnectionStringBuilder.ContainsKey/VB/source.vb	
@@ -1,42 +1,33 @@
 Option Explicit
-Option Strict
+Option Strict On
 
-Imports System.Data
-' <Snippet1>
-' You may need to set a reference to the System.Data.OracleClient
-' assembly before you can run this sample.
 Imports System.Data.OracleClient
 
 Module Module1
-  Sub Main()
-    Dim builder As _
+    ' <Snippet1>
+    Sub Main()
+        Dim builder As _
      New OracleConnectionStringBuilder(GetConnectionString())
-    Console.WriteLine("Connection string = " & builder.ConnectionString)
+        Console.WriteLine("Connection string = " & builder.ConnectionString)
 
-    ' Keys you have provided return true.
-    Console.WriteLine(builder.ContainsKey("Integrated Security"))
+        ' Keys you have provided return true.
+        Console.WriteLine(builder.ContainsKey("Integrated Security"))
 
-    ' Comparison is case insensitive, and synonyms for the 
-    ' keywords are translated to well-known names.
-    ' The following returns True because "PWD" is a 
-    ' synonym for "Password", a valid key.
-    Console.WriteLine(builder.ContainsKey("PWD"))
+        ' Keys that are valid but have not been set return true.
+        Console.WriteLine(builder.ContainsKey("Unicode"))
 
-    ' Keys that are valid but have not been set return true.
-    Console.WriteLine(builder.ContainsKey("Unicode"))
+        ' Keys that don't exist return false.
+        Console.WriteLine(builder.ContainsKey("MyKey"))
 
-    ' Keys that don't exist return false.
-    Console.WriteLine(builder.ContainsKey("MyKey"))
+        Console.WriteLine("Press Enter to continue.")
+        Console.ReadLine()
+    End Sub
 
-    Console.WriteLine("Press Enter to continue.")
-    Console.ReadLine()
-  End Sub
-
-  Private Function GetConnectionString() As String
-    ' To avoid storing the connection string in your code,
-    ' you can retrieve it from a configuration file. 
-    Return "Server=OracleDemo;Integrated Security=True"
-  End Function
+    Private Function GetConnectionString() As String
+        ' To avoid storing the connection string in your code,
+        ' you can retrieve it from a configuration file.
+        Return "Server=OracleDemo;Integrated Security=True"
+    End Function
+    ' </Snippet1>
 End Module
-' </Snippet1>
 
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/Project.vbproj
new file mode 100644
index 00000000000..3280bd119bf
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/Project.vbproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" />
+    <PackageReference Include="System.Data.OleDb" />
+    <PackageReference Include="System.Data.SqlClient" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/source.vb
index 66eb2bd0809..58b60ca7d04 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/source.vb
+++ b/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/source.vb
@@ -8,18 +8,12 @@ Module Module1
    Dim connectionTypeName As String = "SqlClient"
    Dim connectionString As String = "Data Source=(local);Initial Catalog=AdventureWorks2012;Integrated Security=SSPI"
 
-   ' Dim connectionTypeName As String = "Odbc"
-   ' Dim connectionString As String = "Driver={SQL Server Native Client 11.0};Server=(local);Database=AdventureWorks2012;Trusted_Connection=Yes"
-
-   ' Dim connectionTypeName As String = "OleDb"
-   ' Dim connectionString As String = "Provider=SQLNCLI11;Data Source=(local);Initial Catalog=AdventureWorks2012;Integrated Security=SSPI"
-
    Sub Main()
       Using connection As IDbConnection = DatabaseConnectionFactory.GetConnection(connectionTypeName, connectionString)
          Dim command As IDbCommand = connection.CreateCommand()
          command.Connection = connection
 
-         'these 2 queries are executed as a single batch and return 2 separate results
+         'These 2 queries are executed as a single batch and return 2 separate results.
          command.CommandText =
              "SELECT CountryRegionCode, Name FROM Person.CountryRegion;" +
              "SELECT CountryRegionCode, StateProvinceCode, Name, StateProvinceID FROM Person.StateProvince;"
@@ -101,4 +95,4 @@ Module Module1
       End Function
    End Class
 End Module
-' </Snippet1>
\ No newline at end of file
+' </Snippet1>
diff --git a/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx b/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx
deleted file mode 100644
index 37d9a17424b..00000000000
--- a/snippets/visualbasic/VS_Snippets_WebNet/System.Web.UI.WebControls.SqlDataSource_22sql/VB/sql22vb.aspx
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- <Snippet1> -->
-<%@Page  Language="VB" %>
-<%@Import Namespace="System.Data" %>
-<%@Import Namespace="System.Data.Common" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- <Snippet2> -->
-<script runat="server">
-Private Sub UpdateRecords(source As Object, e As EventArgs)
-
-  ' This method is an example of batch updating using a
-  ' data source control. The method iterates through the rows
-  ' of the GridView, extracts each CheckBox from the row and, if
-  ' the CheckBox is checked, updates data by calling the Update
-  ' method of the data source control, adding required parameters
-  ' to the UpdateParameters collection.
-
-  Dim cb As CheckBox
-  Dim row As GridViewRow
-
-  For Each row In GridView1.Rows
-
-    cb = CType(row.Cells(0).Controls(1), CheckBox)
-    If cb.Checked Then
-
-      Dim oid As String
-      oid = CType(row.Cells(1).Text, String)
-
-      Dim param1 As New Parameter("date", TypeCode.DateTime, DateTime.Now.ToString())
-      MyAccessDataSource.UpdateParameters.Add(param1)
-
-      Dim param2 As New Parameter("orderid", TypeCode.String, oid)
-      MyAccessDataSource.UpdateParameters.Add(param2)
-
-      MyAccessDataSource.Update()
-      MyAccessDataSource.UpdateParameters.Clear()
-    End If
-  Next
-End Sub ' UpdateRecords
-</script>
-<!-- </Snippet2> -->
-<html xmlns="http://www.w3.org/1999/xhtml" >
-  <head runat="server">
-    <title>ASP.NET Example</title>
-</head>
-<body>
-    <form id="form1" runat="server">
-<!-- <Snippet3> -->
-
-<!-- Security Note: The SqlDataSource uses a QueryStringParameter,
-     Security Note: which does not perform validation of input from the client.
-     Security Note: To validate the value of the QueryStringParameter, handle the Selecting event. -->
-
-      <asp:SqlDataSource
-        id="MyAccessDataSource"
-        runat="server"
-        ProviderName="<%$ ConnectionStrings:MyPasswordProtectedAccess.providerName%>"
-        ConnectionString="<%$ ConnectionStrings:MyPasswordProtectedAccess%>"
-        SelectCommand="SELECT OrderID, OrderDate, RequiredDate, ShippedDate FROM Orders WHERE EmployeeID=?"
-        UpdateCommand="UPDATE Orders SET ShippedDate=? WHERE OrderID = ?">
-        <SelectParameters>
-          <asp:QueryStringParameter Name="empId" QueryStringField="empId" />
-        </SelectParameters>
-      </asp:SqlDataSource>
-
-<!-- </Snippet3> -->
-      <asp:GridView
-        id ="GridView1"
-        runat="server"
-        DataSourceID="MyAccessDataSource"
-        AllowPaging="True"
-        PageSize="10"
-        AutoGenerateColumns="False">
-          <columns>
-            <asp:TemplateField HeaderText="">
-              <ItemTemplate>
-                <asp:CheckBox runat="server" />
-              </ItemTemplate>
-            </asp:TemplateField>
-            <asp:BoundField HeaderText="Order" DataField="OrderID" />
-            <asp:BoundField HeaderText="Order Date" DataField="OrderDate" />
-            <asp:BoundField HeaderText="Required Date" DataField="RequiredDate" />
-            <asp:BoundField HeaderText="Shipped Date" DataField="ShippedDate" />
-          </columns>
-      </asp:GridView>
-
-      <asp:Button
-        id="Button1"
-        runat="server"
-        Text="Update the Selected Records As Shipped"
-        OnClick="UpdateRecords" />
-
-      <asp:Label id="Label1" runat="server" />
-
-    </form>
-  </body>
-</html>
-<!-- </Snippet1> -->
\ No newline at end of file

From 1e1ae05bd5f773c411080a9da6b63751a1cd18e5 Mon Sep 17 00:00:00 2001
From: Kevin Jones <kevin@vcsjones.com>
Date: Tue, 1 Oct 2024 17:13:03 -0400
Subject: [PATCH 4/7] Purge use of RNGCryptoServiceProvider in examples
 (#10476)

---
 .../cpp/sample.cpp                            |  8 +--
 .../HMACRIPEMD160/CPP/hmacripemd160.cpp       |  3 +-
 .../HMACRIPEMD160/CPP/makefile                |  2 +
 .../HMACSHA256/CPP/hmacsha256.cpp             |  3 +-
 .../VS_Snippets_CLR/HMACSHA256/CPP/makefile   |  2 +
 .../HMACSHA384/CPP/hmacsha384.cpp             |  3 +-
 .../VS_Snippets_CLR/HMACSHA384/CPP/makefile   |  2 +
 .../HMACSHA512/CPP/hmacsha512.cpp             |  5 +-
 .../VS_Snippets_CLR/HMACSHA512/CPP/makefile   |  2 +
 .../VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp |  4 +-
 .../CPP/source.cpp                            |  3 +-
 .../CPP/source.cpp                            |  3 +-
 .../CPP/rsaencoder.cpp                        |  4 +-
 .../HMACRIPEMD160/Overview/hmacripemd160.cs   |  4 +-
 .../HMACSHA256/Overview/hmacsha256.cs         |  4 +-
 .../HMACSHA384/Overview/hmacsha384.cs         |  4 +-
 .../HMACSHA512/Overview/hmacsha512.cs         |  4 +-
 .../MACTripleDES/Overview/program.cs          |  4 +-
 .../PasswordDeriveBytes/Overview/sample.cs    | 10 +--
 .../Parameters/rsaencoder.cs                  |  4 +-
 .../RandomNumberGenerator/GetBytes/source.cs  | 15 +++--
 .../GetNonZeroBytes/source.cs                 | 10 +--
 .../Rfc2898DeriveBytes/Overview/rfc28981.cs   |  5 +-
 .../samlattribute/cs/Project.csproj           | 14 ++++
 .../VS_Snippets_CFX/samlattribute/cs/makefile |  4 --
 .../samlattribute/cs/source.cs                | 64 +++++++++++--------
 .../samlattribute/vb/source.vb                | 20 ++++--
 .../VB/sample.vb                              | 10 +--
 .../HMACRIPEMD160/vb/hmacripemd160.vb         |  4 +-
 .../HMACSHA256/vb/hmacsha256.vb               |  4 +-
 .../HMACSHA384/vb/hmacsha384.vb               |  4 +-
 .../HMACSHA512/vb/hmacsha512.vb               |  4 +-
 .../VS_Snippets_CLR/MAC3DES/VB/program.vb     |  4 +-
 .../VS_Snippets_CLR/rfc28981/vb/rfc28981.vb   |  4 +-
 .../VB/source.vb                              |  6 +-
 .../VB/source.vb                              |  7 +-
 .../VB/rsaencoder.vb                          |  4 +-
 37 files changed, 147 insertions(+), 114 deletions(-)
 create mode 100644 snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/makefile
 create mode 100644 snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/makefile
 create mode 100644 snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/makefile
 create mode 100644 snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/makefile
 create mode 100644 snippets/csharp/VS_Snippets_CFX/samlattribute/cs/Project.csproj
 delete mode 100644 snippets/csharp/VS_Snippets_CFX/samlattribute/cs/makefile

diff --git a/snippets/cpp/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/cpp/sample.cpp b/snippets/cpp/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/cpp/sample.cpp
index eba4a79c828..06b5a8483db 100644
--- a/snippets/cpp/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/cpp/sample.cpp
+++ b/snippets/cpp/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/cpp/sample.cpp
@@ -18,12 +18,12 @@ array<Byte>^ CreateRandomSalt(int length)
         randomBytes = gcnew array <Byte>(1);
     }
 
-    // Create a new RNGCryptoServiceProvider.
-    RNGCryptoServiceProvider^ cryptoRNGProvider =
-        gcnew RNGCryptoServiceProvider();
+    // Create a new RandomNumberGenerator.
+    RandomNumberGenerator^ randomNumberGenerator =
+        RandomNumberGenerator::Create();
 
     // Fill the buffer with random bytes.
-    cryptoRNGProvider->GetBytes(randomBytes);
+    randomNumberGenerator->GetBytes(randomBytes);
 
     // return the bytes.
     return randomBytes;
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/hmacripemd160.cpp b/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/hmacripemd160.cpp
index 3a6a3d6403c..0f9f1c2f6ac 100644
--- a/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/hmacripemd160.cpp
+++ b/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/hmacripemd160.cpp
@@ -111,8 +111,7 @@ int main()
          //  secret key shared by sender and receiver.
          array<Byte>^secretkey = gcnew array<Byte>(64);
          
-         //RNGCryptoServiceProvider is an implementation of a random number generator.
-         RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
+         RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
          
          // The array is now filled with cryptographically strong random bytes.
          rng->GetBytes( secretkey );
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/makefile b/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/makefile
new file mode 100644
index 00000000000..35f08e9adb2
--- /dev/null
+++ b/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/makefile
@@ -0,0 +1,2 @@
+System.Security.Cryptography.HMACRIPEMD160.exe: hmacripemd160.cpp
+    cl /FeSystem.Security.Cryptography.HMACRIPEMD160.exe /clr:pure hmacripemd160.cpp
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/hmacsha256.cpp b/snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/hmacsha256.cpp
index 72688544c68..d26844e8082 100644
--- a/snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/hmacsha256.cpp
+++ b/snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/hmacsha256.cpp
@@ -111,8 +111,7 @@ int main()
          //  secret key shared by sender and receiver.
          array<Byte>^secretkey = gcnew array<Byte>(64);
          
-         //RNGCryptoServiceProvider is an implementation of a random number generator.
-         RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
+         RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
          
          // The array is now filled with cryptographically strong random bytes.
          rng->GetBytes( secretkey );
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/makefile b/snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/makefile
new file mode 100644
index 00000000000..c5caba97392
--- /dev/null
+++ b/snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/makefile
@@ -0,0 +1,2 @@
+System.Security.Cryptography.HMACSHA256.exe: hmacsha256.cpp 
+    cl /FeSystem.Security.Cryptography.HMACSHA256.exe /clr:pure hmacsha256.cpp
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/hmacsha384.cpp b/snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/hmacsha384.cpp
index 0ae778597be..6dfcd8a29fa 100644
--- a/snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/hmacsha384.cpp
+++ b/snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/hmacsha384.cpp
@@ -111,8 +111,7 @@ int main()
          //  secret key shared by sender and receiver.
          array<Byte>^secretkey = gcnew array<Byte>(64);
          
-         //RNGCryptoServiceProvider is an implementation of a random number generator.
-         RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
+         RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
          
          // The array is now filled with cryptographically strong random bytes.
          rng->GetBytes( secretkey );
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/makefile b/snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/makefile
new file mode 100644
index 00000000000..3e26e510700
--- /dev/null
+++ b/snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/makefile
@@ -0,0 +1,2 @@
+System.Security.Cryptography.HMACSHA384.exe: hmacsha384.cpp 
+    cl /FeSystem.Security.Cryptography.HMACSHA384.exe /clr:pure hmacsha384.cpp
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/hmacsha512.cpp b/snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/hmacsha512.cpp
index 4683aaa6838..4f83ce4b8b5 100644
--- a/snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/hmacsha512.cpp
+++ b/snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/hmacsha512.cpp
@@ -110,9 +110,8 @@ int main()
          // Create a random key using a random number generator. This would be the
          //  secret key shared by sender and receiver.
          array<Byte>^secretkey = gcnew array<Byte>(64);
-         
-         //RNGCryptoServiceProvider is an implementation of a random number generator.
-         RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
+
+         RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
          
          // The array is now filled with cryptographically strong random bytes.
          rng->GetBytes( secretkey );
diff --git a/snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/makefile b/snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/makefile
new file mode 100644
index 00000000000..24ac11a57ac
--- /dev/null
+++ b/snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/makefile
@@ -0,0 +1,2 @@
+System.Security.Cryptography.HMACSHA512.exe: hmacsha512.cpp 
+    cl /FeSystem.Security.Cryptography.HMACSHA512.exe /clr:pure hmacsha512.cpp
diff --git a/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp b/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp
index cd03e6be098..0494e4ad274 100644
--- a/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp
+++ b/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp
@@ -27,8 +27,8 @@ int main()
       String^ pwd1 = passwordargs[ 1 ];
       
       array<Byte>^salt1 = gcnew array<Byte>(8);
-	  RNGCryptoServiceProvider ^ rngCsp = gcnew RNGCryptoServiceProvider();
-		 rngCsp->GetBytes(salt1);
+      RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
+      rng->GetBytes(salt1);
       //data1 can be a string or contents of a file.
       String^ data1 = "Some test data";
 
diff --git a/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/CPP/source.cpp b/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/CPP/source.cpp
index 8fa7d638842..9d881778d4a 100644
--- a/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/CPP/source.cpp	
+++ b/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/CPP/source.cpp	
@@ -16,8 +16,7 @@ public ref class Form1: public Form
       // <Snippet1>
       array<Byte>^ random = gcnew array<Byte>(100);
       
-      //RNGCryptoServiceProvider is an implementation of a random number generator.
-      RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
+      RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
       rng->GetBytes( random ); // The array is now filled with cryptographically strong random bytes.
       // </Snippet1>
    }
diff --git a/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/CPP/source.cpp b/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/CPP/source.cpp
index 81410bf4726..c9dcb18468c 100644
--- a/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/CPP/source.cpp	
+++ b/snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/CPP/source.cpp	
@@ -15,8 +15,7 @@ public ref class Form1: public Form
    {
       // <Snippet1>
       array<Byte>^ random = gcnew array<Byte>(100);
-      //RNGCryptoServiceProvider is an implementation of a random number generator.
-      RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
+      RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
       rng->GetNonZeroBytes( random ); // The array is now filled with cryptographically strong random bytes, and none are zero.
       // </Snippet1>
    }
diff --git a/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/CPP/rsaencoder.cpp b/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/CPP/rsaencoder.cpp
index 204cd71a3fd..cb8ce0d69c9 100644
--- a/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/CPP/rsaencoder.cpp
+++ b/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/CPP/rsaencoder.cpp
@@ -122,7 +122,7 @@ ref class RSAEncoder
 
       // Create a random number using the RNGCryptoServiceProvider provider.
       //<Snippet6>
-      RNGCryptoServiceProvider^ ring = gcnew RNGCryptoServiceProvider;
+      RandomNumberGenerator^ ring = RandomNumberGenerator::Create();
       rsaFormatter->Rng = ring;
       //</Snippet6>
 
@@ -190,7 +190,7 @@ int main()
 //
 // Encoding the following message:
 // A phrase to be encoded.
-// Resulting message encoded: %?}T:v??xu?eD)YucItjwu¦ALH HB,Uj??2xq?.?s45
+// Resulting message encoded: %?}T:v??xu?eD)YucItjwu¦ALH HB,Uj??2xq?.?s45
 // ?f?L2?=X?CPzWx???"q5?6&N"AE,Z+T?(]S?_7~,?G{?VV!:S?df?
 // Resulting message decoded:
 // A phrase to be encoded.
diff --git a/snippets/csharp/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.cs b/snippets/csharp/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.cs
index 86565762842..c7d7252d9ca 100644
--- a/snippets/csharp/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.cs
+++ b/snippets/csharp/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.cs
@@ -35,8 +35,8 @@ public static void Main(string[] Fileargs)
             // Create a random key using a random number generator. This would be the
             //  secret key shared by sender and receiver.
             byte[] secretkey = new Byte[64];
-            //RNGCryptoServiceProvider is an implementation of a random number generator.
-            using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
+
+            using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
             {
                 // The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey);
diff --git a/snippets/csharp/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.cs b/snippets/csharp/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.cs
index d5ca7e5780c..ef5f5b8c10c 100644
--- a/snippets/csharp/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.cs
+++ b/snippets/csharp/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.cs
@@ -35,8 +35,8 @@ public static void Main(string[] Fileargs)
             // Create a random key using a random number generator. This would be the
             //  secret key shared by sender and receiver.
             byte[] secretkey = new Byte[64];
-            //RNGCryptoServiceProvider is an implementation of a random number generator.
-            using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
+
+            using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
             {
                 // The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey);
diff --git a/snippets/csharp/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.cs b/snippets/csharp/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.cs
index 8a6479c66e1..deccc5c0426 100644
--- a/snippets/csharp/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.cs
+++ b/snippets/csharp/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.cs
@@ -35,8 +35,8 @@ public static void Main(string[] Fileargs)
             // Create a random key using a random number generator. This would be the
             //  secret key shared by sender and receiver.
             byte[] secretkey = new Byte[64];
-            //RNGCryptoServiceProvider is an implementation of a random number generator.
-            using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
+
+            using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
             {
                 // The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey);
diff --git a/snippets/csharp/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.cs b/snippets/csharp/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.cs
index 8852867494c..fc1581c835f 100644
--- a/snippets/csharp/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.cs
+++ b/snippets/csharp/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.cs
@@ -35,8 +35,8 @@ public static void Main(string[] Fileargs)
             // Create a random key using a random number generator. This would be the
             //  secret key shared by sender and receiver.
             byte[] secretkey = new Byte[64];
-            //RNGCryptoServiceProvider is an implementation of a random number generator.
-            using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
+
+            using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
             {
                 // The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey);
diff --git a/snippets/csharp/System.Security.Cryptography/MACTripleDES/Overview/program.cs b/snippets/csharp/System.Security.Cryptography/MACTripleDES/Overview/program.cs
index 6a4614398b5..3990c201e8c 100644
--- a/snippets/csharp/System.Security.Cryptography/MACTripleDES/Overview/program.cs
+++ b/snippets/csharp/System.Security.Cryptography/MACTripleDES/Overview/program.cs
@@ -35,8 +35,8 @@ public static void Main(string[] Fileargs)
             // Create a random key using a random number generator. This would be the
             //  secret key shared by sender and receiver.
             byte[] secretkey = new Byte[24];
-            //RNGCryptoServiceProvider is an implementation of a random number generator.
-            using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
+
+            using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
             {
                 // The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey);
diff --git a/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs b/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs
index 7fad81cff78..429ac597a62 100644
--- a/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs
+++ b/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs
@@ -79,11 +79,11 @@ public static byte[] CreateRandomSalt(int length)
             randBytes = new byte[1];
         }
 
-        // Create a new RNGCryptoServiceProvider.
-        RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
-
-        // Fill the buffer with random bytes.
-        rand.GetBytes(randBytes);
+        using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
+        {
+            // Fill the buffer with random bytes.
+            rng.GetBytes(randBytes);
+        }
 
         // return the bytes.
         return randBytes;
diff --git a/snippets/csharp/System.Security.Cryptography/RSAOAEPKeyExchangeDeformatter/Parameters/rsaencoder.cs b/snippets/csharp/System.Security.Cryptography/RSAOAEPKeyExchangeDeformatter/Parameters/rsaencoder.cs
index abf7ebac076..5aab9d4c1cb 100644
--- a/snippets/csharp/System.Security.Cryptography/RSAOAEPKeyExchangeDeformatter/Parameters/rsaencoder.cs
+++ b/snippets/csharp/System.Security.Cryptography/RSAOAEPKeyExchangeDeformatter/Parameters/rsaencoder.cs
@@ -122,9 +122,9 @@ private void ConstructFormatter()
         rsaFormatter.SetKey(key);
         //</Snippet5>
 
-        // Create a random number using the RNGCryptoServiceProvider provider.
+        // Create a random number using the RandomNumberGenerator
         //<Snippet6>
-        RNGCryptoServiceProvider ring = new RNGCryptoServiceProvider(); 
+        RandomNumberGenerator ring = RandomNumberGenerator.Create(); 
         rsaFormatter.Rng = ring;
         //</Snippet6>
 
diff --git a/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.cs b/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.cs
index a81469c2fe2..a090085f5bd 100644
--- a/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.cs
+++ b/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.cs
@@ -1,18 +1,19 @@
 using System;
 using System.Data;
-using System.Security.Cryptography ;
+using System.Security.Cryptography;
 using System.Windows.Forms;
 
 public class Form1: Form
 {
    public static void Main()
    {
-      // <Snippet1>
-      byte[] random = new Byte[100];
+        // <Snippet1>
+        byte[] random = new byte[100];
 
-      //RNGCryptoServiceProvider is an implementation of a random number generator.
-      RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
-      rng.GetBytes(random); // The array is now filled with cryptographically strong random bytes.
-      // </Snippet1>
+        using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
+        {
+            rng.GetBytes(random); // The array is now filled with cryptographically strong random bytes.
+        }
+        // </Snippet1>
    }
 }
diff --git a/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.cs b/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.cs
index c0c4650faed..99bd717cc20 100644
--- a/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.cs
+++ b/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.cs
@@ -8,10 +8,12 @@ public class Form1: Form
  public void Method()
  {
 // <Snippet1>
-    byte[] random = new Byte[100];
-    //RNGCryptoServiceProvider is an implementation of a random number generator.
-    RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
-    rng.GetNonZeroBytes(random); // The array is now filled with cryptographically strong random bytes, and none are zero.
+    byte[] random = new byte[100];
+    
+    using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
+    {
+        rng.GetNonZeroBytes(random); // The array is now filled with cryptographically strong random bytes, and none are zero.
+    }
 // </Snippet1>
  }
 }
diff --git a/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs b/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs
index 4f3849c8289..cae652faeff 100644
--- a/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs
+++ b/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs
@@ -26,11 +26,10 @@ public static void Main(string[] passwordargs)
             string pwd1 = passwordargs[0];
             // Create a byte array to hold the random value.
             byte[] salt1 = new byte[8];
-            using (RNGCryptoServiceProvider rngCsp = new
-RNGCryptoServiceProvider())
+            using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
             {
                 // Fill the array with a random value.
-                rngCsp.GetBytes(salt1);
+                rng.GetBytes(salt1);
             }
 
             //data1 can be a string or contents of a file.
diff --git a/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/Project.csproj b/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/Project.csproj
new file mode 100644
index 00000000000..0f78fd26319
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/Project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net4.8</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/makefile b/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/makefile
deleted file mode 100644
index bddebecd28f..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: source.exe
- 
-source.exe: source.cs 
- csc /t:exe *.cs /r:System.dll,System.Configuration.dll,System.ServiceModel.dll,System.Runtime.Serialization.dll,System.IdentityModel.dll,System.Xml.dll, /lib:c:\whidbey\assemblies
diff --git a/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/source.cs b/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/source.cs
index 89bcb0a6d7e..2b238e5a29b 100644
--- a/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/source.cs
+++ b/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/source.cs
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 //-----------------------------------------------------------------------------
 using System;
@@ -80,7 +80,7 @@ protected override Collection<SamlAttribute> GetIssuedClaims(RequestSecurityToke
             return samlAttributes;
         }
         //</snippet1>
-        public static void Main() {}
+        public static void Main() { }
 
         #region Helper Methods
         /// <summary>
@@ -139,7 +139,7 @@ private static bool CheckIfPurchaseLimitMet(string bookID)
                 return false;
 
             List<ClaimSet> claimsets = new List<ClaimSet>(authContext.ClaimSets);
-            ClaimSet myClaimSet = claimsets.Find((Predicate<ClaimSet>)delegate(ClaimSet target)
+            ClaimSet myClaimSet = claimsets.Find((Predicate<ClaimSet>)delegate (ClaimSet target)
             {
                 X509CertificateClaimSet certClaimSet = target.Issuer as X509CertificateClaimSet;
                 return certClaimSet != null && certClaimSet.X509Certificate.Subject == "CN=HomeRealmSTS.com";
@@ -247,8 +247,8 @@ private static bool IssuedByHomeRealmSTS(ClaimSet myClaimSet)
     /// Abstract base class for STS implementations.
     /// </summary>
 	public abstract class SecurityTokenService : ISecurityTokenService
-	{
-		string stsName; // The name of the STS. Used to populate saml:Assertion/@Issuer
+    {
+        string stsName; // The name of the STS. Used to populate saml:Assertion/@Issuer
         SecurityToken issuerToken; // The SecurityToken used to sign issued tokens
         SecurityToken proofKeyEncryptionToken; // The SecurityToken used to encrypt the proof key in the issued token.
 
@@ -289,7 +289,7 @@ protected SecurityToken ProofKeyEncryptionToken
             get { return this.proofKeyEncryptionToken; }
         }
 
-		#region Abstract methods
+        #region Abstract methods
 
         /// <summary>
         /// Abstract method for setting up claims in the SAML Token issued by the STS
@@ -322,10 +322,14 @@ protected static void EnsureRequestSecurityTokenAction(Message message)
         protected static BinarySecretSecurityToken CreateProofToken(int keySize)
         {
             // Create an array to store the key bytes.
-            byte[] key = new byte[keySize/8];
+            byte[] key = new byte[keySize / 8];
+
             // Create some random bytes.
-            RNGCryptoServiceProvider random = new RNGCryptoServiceProvider();
-            random.GetNonZeroBytes(key);
+            using (RandomNumberGenerator random = RandomNumberGenerator.Create())
+            {
+                random.GetNonZeroBytes(key);
+            }
+
             // Create a BinarySecretSecurityToken from the random bytes and return it.
             return new BinarySecretSecurityToken(key);
         }
@@ -409,9 +413,12 @@ public virtual Message ProcessRequestSecurityToken(Message message)
             {
                 // Create an array to store the entropy bytes.
                 stsEntropy = new byte[keySize / 8];
+
                 // Create some random bytes.
-                RNGCryptoServiceProvider random = new RNGCryptoServiceProvider();
-                random.GetNonZeroBytes(stsEntropy);
+                using (RandomNumberGenerator random = RandomNumberGenerator.Create())
+                {
+                    random.GetNonZeroBytes(stsEntropy);
+                }
                 // Compute the combined key.
                 key = RequestSecurityTokenResponse.ComputeCombinedKey(senderEntropy, stsEntropy, keySize);
             }
@@ -419,9 +426,12 @@ public virtual Message ProcessRequestSecurityToken(Message message)
             {
                 // Create an array to store the entropy bytes.
                 key = new byte[keySize / 8];
+
                 // Create some random bytes.
-                RNGCryptoServiceProvider random = new RNGCryptoServiceProvider();
-                random.GetNonZeroBytes(key);
+                using (RandomNumberGenerator random = RandomNumberGenerator.Create())
+                {
+                    random.GetNonZeroBytes(key);
+                }
             }
 
             // Create a BinarySecretSecurityToken to be the proof token, based on the key material
@@ -846,14 +856,14 @@ private static EndpointAddress ProcessAppliesToElement(XmlReader xr)
                     !xr.IsEmptyElement &&
                     XmlNodeType.Element == xr.NodeType)
                 {
-		    // <Snippet11>
+                    // <Snippet11>
                     // Create a DataContractSerializer for an EndpointAddress10.
                     DataContractSerializer dcs = new DataContractSerializer(typeof(EndpointAddress10));
                     // Read the EndpointAddress10 from the DataContractSerializer.
                     EndpointAddress10 ea10 = (EndpointAddress10)dcs.ReadObject(xr, false);
                     // Convert the EndpointAddress10 into an EndpointAddress.
                     ea = ea10.ToEndpointAddress();
-		    // </Snippet11>
+                    // </Snippet11>
                 }
 
                 // Look for the end-tag that corresponds to the start-tag that the reader was positioned
@@ -1064,7 +1074,7 @@ public static byte[] ComputeCombinedKey(byte[] requestorEntropy, byte[] issuerEn
             byte[] a = issuerEntropy; // A(0)
             byte[] b = new byte[kha.HashSize / 8 + a.Length]; // Buffer for A(i) + seed
 
-            for (int i = 0; i < key.Length; )
+            for (int i = 0; i < key.Length;)
             {
                 // Calculate A(i+1).
                 kha.Initialize();
@@ -1348,20 +1358,20 @@ class ServiceConstants
         /// </summary>
         public static void LoadAppSettings()
         {
-/*		
-            BookDB = ConfigurationManager.AppSettings["bookDB"];
-            CheckIfLoaded(BookDB);
-            BookDB = string.Format("{0}\\{1}", System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath, BookDB);
+            /*		
+                        BookDB = ConfigurationManager.AppSettings["bookDB"];
+                        CheckIfLoaded(BookDB);
+                        BookDB = string.Format("{0}\\{1}", System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath, BookDB);
 
-            CertDistinguishedName = ConfigurationManager.AppSettings["certDistinguishedName"];
-            CheckIfLoaded(CertDistinguishedName);
+                        CertDistinguishedName = ConfigurationManager.AppSettings["certDistinguishedName"];
+                        CheckIfLoaded(CertDistinguishedName);
 
-            TargetDistinguishedName = ConfigurationManager.AppSettings["targetDistinguishedName"];
-            CheckIfLoaded(TargetDistinguishedName);
+                        TargetDistinguishedName = ConfigurationManager.AppSettings["targetDistinguishedName"];
+                        CheckIfLoaded(TargetDistinguishedName);
 
-            IssuerDistinguishedName = ConfigurationManager.AppSettings["issuerDistinguishedName"];
-            CheckIfLoaded(IssuerDistinguishedName);
-            */
+                        IssuerDistinguishedName = ConfigurationManager.AppSettings["issuerDistinguishedName"];
+                        CheckIfLoaded(IssuerDistinguishedName);
+                        */
         }
 
         /// <summary>
diff --git a/snippets/visualbasic/VS_Snippets_CFX/samlattribute/vb/source.vb b/snippets/visualbasic/VS_Snippets_CFX/samlattribute/vb/source.vb
index 6871053d457..3edb9024cca 100644
--- a/snippets/visualbasic/VS_Snippets_CFX/samlattribute/vb/source.vb
+++ b/snippets/visualbasic/VS_Snippets_CFX/samlattribute/vb/source.vb
@@ -320,9 +320,12 @@ Namespace Microsoft.ServiceModel.Samples.Federation
         Protected Shared Function CreateProofToken(ByVal keySize As Integer) As BinarySecretSecurityToken
             ' Create an array to store the key bytes.
             Dim key(keySize / 8 - 1) As Byte
+
             ' Create some random bytes.
-            Dim random As New RNGCryptoServiceProvider()
-            random.GetNonZeroBytes(key)
+            Using random As RandomNumberGenerator = RandomNumberGenerator.Create()
+                random.GetNonZeroBytes(key)
+            End Using
+
             ' Create a BinarySecretSecurityToken from the random bytes and return it.
             Return New BinarySecretSecurityToken(key)
         End Function
@@ -398,18 +401,23 @@ Namespace Microsoft.ServiceModel.Samples.Federation
             If Not (senderEntropy Is Nothing) Then
                 ' Create an array to store the entropy bytes.
                 stsEntropy = New Byte(keySize / 8) {}
+
                 ' Create some random bytes.
-                Dim random As New RNGCryptoServiceProvider()
-                random.GetNonZeroBytes(stsEntropy)
+                Using random As RandomNumberGenerator = RandomNumberGenerator.Create()
+                    random.GetNonZeroBytes(stsEntropy)
+                End Using
+
                 ' Compute the combined key.
                 key = RequestSecurityTokenResponse.ComputeCombinedKey(senderEntropy, stsEntropy, keySize)
                 ' Issuer entropy only...
             Else
                 ' Create an array to store the entropy bytes.
                 key = New Byte(keySize / 8) {}
+
                 ' Create some random bytes.
-                Dim random As New RNGCryptoServiceProvider()
-                random.GetNonZeroBytes(key)
+                Using random As RandomNumberGenerator = RandomNumberGenerator.Create()
+                    random.GetNonZeroBytes(key)
+                End Using
             End If
 
             ' Create a BinarySecretSecurityToken to be the proof token, based on the key material
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb b/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb
index 2344af9234b..611a25a8663 100644
--- a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb
@@ -71,11 +71,11 @@ Module PasswordDerivedBytesExample
             randBytes = New Byte(0) {}
         End If
 
-        ' Create a new RNGCryptoServiceProvider.
-        Dim rand As New RNGCryptoServiceProvider()
-
-        ' Fill the buffer with random bytes.
-        rand.GetBytes(randBytes)
+        ' Create a new RandomNumberGenerator.
+        Using rand As RandomNumberGenerator = RandomNumberGenerator.Create()
+            ' Fill the buffer with random bytes.
+            rand.GetBytes(randBytes)
+        End Using
 
         ' return the bytes.
         Return randBytes
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACRIPEMD160/vb/hmacripemd160.vb b/snippets/visualbasic/VS_Snippets_CLR/HMACRIPEMD160/vb/hmacripemd160.vb
index 8e4eadd9ab7..0150a05e210 100644
--- a/snippets/visualbasic/VS_Snippets_CLR/HMACRIPEMD160/vb/hmacripemd160.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR/HMACRIPEMD160/vb/hmacripemd160.vb
@@ -27,8 +27,8 @@ Public Class HMACRIPEMD160example
             ' Create a random key using a random number generator. This would be the
             '  secret key shared by sender and receiver.
             Dim secretkey() As Byte = New [Byte](63) {}
-            'RNGCryptoServiceProvider is an implementation of a random number generator.
-            Using rng As New RNGCryptoServiceProvider()
+
+            Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
                 ' The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey)
 
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA256/vb/hmacsha256.vb b/snippets/visualbasic/VS_Snippets_CLR/HMACSHA256/vb/hmacsha256.vb
index aa26942d9b2..361d5df38f0 100644
--- a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA256/vb/hmacsha256.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR/HMACSHA256/vb/hmacsha256.vb
@@ -27,8 +27,8 @@ Public Class HMACSHA256example
             ' Create a random key using a random number generator. This would be the
             '  secret key shared by sender and receiver.
             Dim secretkey() As Byte = New [Byte](63) {}
-            'RNGCryptoServiceProvider is an implementation of a random number generator.
-            Using rng As New RNGCryptoServiceProvider()
+
+            Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
                 ' The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey)
 
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA384/vb/hmacsha384.vb b/snippets/visualbasic/VS_Snippets_CLR/HMACSHA384/vb/hmacsha384.vb
index b0162858527..032f283fb19 100644
--- a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA384/vb/hmacsha384.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR/HMACSHA384/vb/hmacsha384.vb
@@ -27,8 +27,8 @@ Public Class HMACSHA384example
             ' Create a random key using a random number generator. This would be the
             '  secret key shared by sender and receiver.
             Dim secretkey() As Byte = New [Byte](63) {}
-            'RNGCryptoServiceProvider is an implementation of a random number generator.
-            Using rng As New RNGCryptoServiceProvider()
+
+            Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
                 ' The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey)
 
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA512/vb/hmacsha512.vb b/snippets/visualbasic/VS_Snippets_CLR/HMACSHA512/vb/hmacsha512.vb
index c91328f5fed..ebc9962d69f 100644
--- a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA512/vb/hmacsha512.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR/HMACSHA512/vb/hmacsha512.vb
@@ -27,8 +27,8 @@ Public Class HMACSHA5126example
             ' Create a random key using a random number generator. This would be the
             '  secret key shared by sender and receiver.
             Dim secretkey() As Byte = New [Byte](63) {}
-            'RNGCryptoServiceProvider is an implementation of a random number generator.
-            Using rng As New RNGCryptoServiceProvider()
+
+            Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
                 ' The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey)
 
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MAC3DES/VB/program.vb b/snippets/visualbasic/VS_Snippets_CLR/MAC3DES/VB/program.vb
index 8daea1441d2..717c2a2367c 100644
--- a/snippets/visualbasic/VS_Snippets_CLR/MAC3DES/VB/program.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR/MAC3DES/VB/program.vb
@@ -27,8 +27,8 @@ Public Class MACTripleDESexample
             ' Create a random key using a random number generator. This would be the
             '  secret key shared by sender and receiver.
             Dim secretkey() As Byte = New [Byte](23) {}
-            'RNGCryptoServiceProvider is an implementation of a random number generator.
-            Using rng As New RNGCryptoServiceProvider()
+
+            Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
                 ' The array is now filled with cryptographically strong random bytes.
                 rng.GetBytes(secretkey)
 
diff --git a/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb b/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb
index 653476ec08d..999cab698cb 100644
--- a/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb
@@ -22,8 +22,8 @@ Public Class rfc2898test
             Dim pwd1 As String = passwordargs(0)
 
             Dim salt1(8) As Byte
-            Using rngCsp As New RNGCryptoServiceProvider()
-                rngCsp.GetBytes(salt1)
+            Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
+                rng.GetBytes(salt1)
             End Using
             'data1 can be a string or contents of a file.
             Dim data1 As String = "Some test data"
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/VB/source.vb
index 3789927d87a..2ac319faffc 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/VB/source.vb	
@@ -9,9 +9,9 @@ Public Class Form1
 ' <Snippet1>
  Dim random() As Byte = New Byte(100) {}
         
- 'RNGCryptoServiceProvider is an implementation of an RNG
- Dim rng As New RNGCryptoServiceProvider()
- rng.GetBytes(random) ' bytes in random are now random
+ Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
+    rng.GetBytes(random) ' bytes in random are now random
+ End Using
 ' </Snippet1>
     End Sub
 End Class
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb
index 975a1d7a382..328fdee0044 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb	
+++ b/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb	
@@ -8,9 +8,10 @@ Public Class Form1
     Public Sub Method()
 ' <Snippet1>
  Dim random() As Byte = New Byte(100) {}
- 'RNGCryptoServiceProvider is an implementation of an RNG
- Dim rng As New RNGCryptoServiceProvider()
- rng.GetNonZeroBytes(random) ' bytes in random are now random and none are zero
+
+ Using rng As RandomNumberGenerator = RandomNumberGenerator.Create()
+     rng.GetNonZeroBytes(random) ' bytes in random are now random and none are zero
+ End Using
 ' </Snippet1>
     End Sub
 End Class
diff --git a/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/VB/rsaencoder.vb b/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/VB/rsaencoder.vb
index 0ef5c64e438..52f9cfad7c3 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/VB/rsaencoder.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/VB/rsaencoder.vb
@@ -116,9 +116,9 @@ Public Class Form1
         rsaFormatter.SetKey(key)
         '</Snippet5>
 
-        ' Create a random number using the RNGCryptoServiceProvider provider.
+        ' Create a random number using the RandomNumberGenerator.
         '<Snippet6>
-        Dim ring As New RNGCryptoServiceProvider
+        Dim ring As RandomNumberGenerator = RandomNumberGenerator.Create()
         rsaFormatter.Rng = ring
         '</Snippet6>
 

From 75d9d50738997b6618a764cd2d82408ea0e95958 Mon Sep 17 00:00:00 2001
From: Bill Wagner <wiwagn@microsoft.com>
Date: Tue, 1 Oct 2024 18:07:21 -0400
Subject: [PATCH 5/7] fix default parent node for selenium (#10482)

---
 quest-config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quest-config.json b/quest-config.json
index bd29a6f9b1a..438a990976d 100644
--- a/quest-config.json
+++ b/quest-config.json
@@ -24,7 +24,7 @@
         },
         {
             "Semester": "Selenium",
-            "ParentNodeId": 286016
+            "ParentNodeId": 308199
         },
         {
             "Label": "user-feedback",
@@ -45,5 +45,5 @@
             "ParentNodeId": 227485
         }
     ],
-    "DefaultParentNode": 286016
+    "DefaultParentNode": 308199
 }

From 480587aad65d35acd30ca49bb1ceef74c9127aac Mon Sep 17 00:00:00 2001
From: IngweLand <ingweland@gmail.com>
Date: Wed, 2 Oct 2024 05:10:58 +0200
Subject: [PATCH 6/7] Fix typo in HttpClientHandler.xml (#10410)

Fixed duplicated text
---
 xml/System.Net.Http/HttpClientHandler.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/System.Net.Http/HttpClientHandler.xml b/xml/System.Net.Http/HttpClientHandler.xml
index 15709145236..b31489e04c1 100644
--- a/xml/System.Net.Http/HttpClientHandler.xml
+++ b/xml/System.Net.Http/HttpClientHandler.xml
@@ -1274,7 +1274,7 @@ handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousA
       <Docs>
         <summary>Gets a value that indicates whether the handler supports automatic response content decompression.</summary>
         <value>
-          <see langword="true" /> if the if the handler supports automatic response content decompression; otherwise <see langword="false" />. The default value is <see langword="true" />.</value>
+          <see langword="true" /> if the handler supports automatic response content decompression; otherwise <see langword="false" />. The default value is <see langword="true" />.</value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>

From a2b27b0fcbcc040093f74929f74dfb02fc4e957e Mon Sep 17 00:00:00 2001
From: Jonathan <vanillajonathan@users.noreply.github.com>
Date: Wed, 2 Oct 2024 05:14:05 +0200
Subject: [PATCH 7/7] Update MediaTypeNames+Image.xml (#10366)

Fix casing of WebP from WEBP to WebP.
---
 xml/System.Net.Mime/MediaTypeNames+Image.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/System.Net.Mime/MediaTypeNames+Image.xml b/xml/System.Net.Mime/MediaTypeNames+Image.xml
index 37b548dfafb..31c70ef8083 100644
--- a/xml/System.Net.Mime/MediaTypeNames+Image.xml
+++ b/xml/System.Net.Mime/MediaTypeNames+Image.xml
@@ -285,7 +285,7 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Specifies that the <see cref="T:System.Net.Mime.MediaTypeNames.Image" /> data is in WEBP format.</summary>
+        <summary>Specifies that the <see cref="T:System.Net.Mime.MediaTypeNames.Image" /> data is in WebP format.</summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>