Merge pull request #10733 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Values/CS/source.cs

@@ -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>

snippets/csharp/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Keys/CS/source.cs

@@ -1,21 +1,19 @@
 using System;
-using System.Data;
 // <Snippet1>
 using System.Data.Odbc;
 
 class Program
 {
     static void Main()
     {
-        OdbcConnectionStringBuilder builder =
-            new OdbcConnectionStringBuilder();
-        builder.Driver = "Microsoft Access Driver (*.mdb)";
+        OdbcConnectionStringBuilder builder = new()
+            {
+                Driver = "Microsoft Access Driver (*.mdb)"
+            };
 
         // Call the Add method to explicitly add key/value
         // pairs to the internal collection.
         builder.Add("Dbq", "C:\\info.mdb");
-        builder.Add("Uid", "Admin");
-        builder.Add("Pwd", "pass!word1");
 
         Console.WriteLine(builder.ConnectionString);
         Console.WriteLine();
@@ -30,16 +28,11 @@ static void Main()
         builder.ConnectionString =
             "driver={IBM DB2 ODBC DRIVER};Database=SampleDB;" +
             "hostname=SampleServerName;port=SamplePortNum;" +
-            "protocol=TCPIP;uid=Admin;pwd=pass!word1";
+            "protocol=TCPIP";
 
-        Console.WriteLine("protocol = "
-            + builder["protocol"].ToString());
+        Console.WriteLine($"protocol = {builder["protocol"].ToString()}");
         Console.WriteLine();
 
-        // Modify existing items.
-        builder["uid"] = "NewUser";
-        builder["pwd"] = "Pass@word2";
-
         // Call the Remove method to remove items from
         // the collection of key/value pairs.
         builder.Remove("port");
@@ -54,9 +47,6 @@ static void Main()
         // necessary.
         builder["NewKey"] = "newValue";
         Console.WriteLine(builder.ConnectionString);
-
-        Console.WriteLine("Press Enter to finish.");
-        Console.ReadLine();
     }
 }
 // </Snippet1>