Skip to content

Commit 64178f5

Browse files
committed
Added instance name prefix so can get instance name service.
1 parent 79cc245 commit 64178f5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class CertificateTest : IDisposable
3232
// InstanceName will get replaced with an instance name in the connection string
3333
private static string InstanceName = "MSSQLSERVER";
3434

35-
// InstanceNamePrefix will get replaced with MSSQL$ is there is an instance name in connection string
35+
// s_instanceNamePrefix will get replaced with MSSQL$ is there is an instance name in connection string
3636
private static string InstanceNamePrefix = "";
3737

3838
// SlashInstance is used to override IPV4 and IPV6 defined about so it includes an instance name

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,19 @@ public class CertificateTestWithTdsServer : IDisposable
2626
private static readonly string s_fullPathToClientCert = Path.Combine(Directory.GetCurrentDirectory(), "clientcert");
2727
private static bool s_windowsAdmin = true;
2828
private static string s_instanceName = "MSSQLSERVER";
29+
// s_instanceNamePrefix will get replaced with MSSQL$ is there is an instance name in the connection string
30+
private static string s_instanceNamePrefix = "";
2931
private const string LocalHost = "localhost";
3032

3133
public CertificateTestWithTdsServer()
3234
{
33-
3435
SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
3536
Assert.True(DataTestUtility.ParseDataSource(builder.DataSource, out string hostname, out _, out string instanceName));
3637

3738
if (!string.IsNullOrEmpty(instanceName))
3839
{
3940
s_instanceName = instanceName;
41+
s_instanceNamePrefix = "MSSQL$";
4042
}
4143

4244
// Confirm that user has elevated access on Windows
@@ -235,7 +237,7 @@ private static void RemoveForceEncryptionFromRegistryPath(string registryPath)
235237
RegistryKey key = Registry.LocalMachine.OpenSubKey(registryPath, true);
236238
key?.SetValue("ForceEncryption", 0, RegistryValueKind.DWord);
237239
key?.SetValue("Certificate", "", RegistryValueKind.String);
238-
ServiceController sc = new($"{s_instanceName}");
240+
ServiceController sc = new($"{s_instanceNamePrefix}{s_instanceName}");
239241
sc.Stop();
240242
sc.WaitForStatus(ServiceControllerStatus.Stopped);
241243
sc.Start();

0 commit comments

Comments
 (0)