Skip to content

Commit 9ac9188

Browse files
Remove Docker project, not aligning with core testing needs (#3428)
1 parent 5ded2e5 commit 9ac9188

File tree

13 files changed

+0
-228
lines changed

13 files changed

+0
-228
lines changed

.config/CredScanSuppressions.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"tool": "Credential Scanner",
33
"suppressions": [
4-
{
5-
"file": "src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Program.cs",
6-
"justification": "Test projects should be skipped"
7-
},
84
{
95
"file": "src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDSServerArguments.cs",
106
"justification": "Test projects should be skipped"
@@ -13,10 +9,6 @@
139
"file": "src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TdsServerCertificate.pfx",
1410
"justification": "Test projects should be skipped"
1511
},
16-
{
17-
"file": "src/docker-compose.yml",
18-
"justification": "Docker test project should be excluded"
19-
},
2012
{
2113
"file": "doc/samples/SqlConnectionStringBuilder.cs",
2214
"justification": "Documentation could include sample data and can be ignored"

.dockerignore

Lines changed: 0 additions & 25 deletions
This file was deleted.

BUILDGUIDE.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -289,26 +289,6 @@ When connecting to a server, if a protocol lower than TLS 1.2 is negotiated, a s
289289

290290
`Switch.Microsoft.Data.SqlClient.SuppressInsecureTLSWarning`
291291

292-
## Debugging SqlClient on Linux from Windows
293-
294-
For enhanced developer experience, we support debugging SqlClient on Linux from Windows, using the project "**Microsoft.Data.SqlClient.DockerLinuxTest**" that requires "Container Tools" to be enabled in Visual Studio. You may import configuration: [VS19Components.vsconfig](./tools/vsconfig/VS19Components.vsconfig) if not enabled already.
295-
296-
This project is also included in `docker-compose.yml` to demonstrate connectivity with SQL Server docker image.
297-
298-
To run the same:
299-
300-
1. Build the Solution in Visual Studio
301-
2. Set `docker-compose` as Startup Project
302-
3. Run "Docker-Compose" launch configuration.
303-
4. You will see similar message in Debug window:
304-
305-
```log
306-
Connected to SQL Server v15.00.4023 from Unix 4.19.76.0
307-
The program 'dotnet' has exited with code 0 (0x0).
308-
```
309-
310-
5. Now you can write code in [Program.cs](/src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Program.cs) to debug SqlClient on Linux!
311-
312292
### Troubleshooting Docker issues
313293

314294
There may be times where connection cannot be made to SQL Server, we found below ideas helpful:

src/.dockerignore

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/Microsoft.Data.SqlClient.sln

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlTypes", "
174174
..\doc\snippets\Microsoft.Data.SqlTypes\SqlJson.xml = ..\doc\snippets\Microsoft.Data.SqlTypes\SqlJson.xml
175175
EndProjectSection
176176
EndProject
177-
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}"
178-
EndProject
179177
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.TestUtilities", "Microsoft.Data.SqlClient\tests\tools\Microsoft.Data.SqlClient.TestUtilities\Microsoft.Data.SqlClient.TestUtilities.csproj", "{89D6D382-9B36-43C9-A912-03802FDA8E36}"
180178
EndProject
181179
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.ExtUtilities", "Microsoft.Data.SqlClient\tests\tools\Microsoft.Data.SqlClient.ExtUtilities\Microsoft.Data.SqlClient.ExtUtilities.csproj", "{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}"
@@ -185,8 +183,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomRetryLogicProvider",
185183
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
186184
EndProjectSection
187185
EndProject
188-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.DockerLinuxTest", "Microsoft.Data.SqlClient\tests\Docker\DockerLinuxTest\Microsoft.Data.SqlClient.DockerLinuxTest.csproj", "{B93A3149-67E8-491E-A1E5-19D65F9D9E98}"
189-
EndProject
190186
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.PerformanceTests", "Microsoft.Data.SqlClient\tests\PerformanceTests\Microsoft.Data.SqlClient.PerformanceTests.csproj", "{599A336B-2A5F-473D-8442-1223ED37C93E}"
191187
EndProject
192188
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4F3CD363-B1E6-4D6D-9466-97D78A56BE45}"
@@ -484,16 +480,6 @@ Global
484480
{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x64.Build.0 = Release|Any CPU
485481
{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x86.ActiveCfg = Release|Any CPU
486482
{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x86.Build.0 = Release|Any CPU
487-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
488-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|x64.ActiveCfg = Debug|Any CPU
489-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|x64.Build.0 = Debug|Any CPU
490-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|x86.ActiveCfg = Debug|Any CPU
491-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|x86.Build.0 = Debug|Any CPU
492-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Release|Any CPU.ActiveCfg = Release|Any CPU
493-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Release|x64.ActiveCfg = Release|Any CPU
494-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Release|x64.Build.0 = Release|Any CPU
495-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Release|x86.ActiveCfg = Release|Any CPU
496-
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Release|x86.Build.0 = Release|Any CPU
497483
{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
498484
{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|Any CPU.Build.0 = Debug|Any CPU
499485
{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -530,18 +516,6 @@ Global
530516
{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|x64.Build.0 = Release|x64
531517
{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|x86.ActiveCfg = Release|x86
532518
{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|x86.Build.0 = Release|x86
533-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
534-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Debug|Any CPU.Build.0 = Debug|Any CPU
535-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Debug|x64.ActiveCfg = Debug|Any CPU
536-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Debug|x64.Build.0 = Debug|Any CPU
537-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Debug|x86.ActiveCfg = Debug|Any CPU
538-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Debug|x86.Build.0 = Debug|Any CPU
539-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Release|Any CPU.ActiveCfg = Release|Any CPU
540-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Release|Any CPU.Build.0 = Release|Any CPU
541-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Release|x64.ActiveCfg = Release|Any CPU
542-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Release|x64.Build.0 = Release|Any CPU
543-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Release|x86.ActiveCfg = Release|Any CPU
544-
{B93A3149-67E8-491E-A1E5-19D65F9D9E98}.Release|x86.Build.0 = Release|Any CPU
545519
{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
546520
{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|Any CPU.Build.0 = Debug|Any CPU
547521
{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|x64.ActiveCfg = Debug|x64

src/Microsoft.Data.SqlClient/tests/Docker/Directory.Build.props

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Dockerfile

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Microsoft.Data.SqlClient.DockerLinuxTest.csproj

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Program.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/tests/Docker/DockerLinuxTest/Properties/launchSettings.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/docker-compose.dcproj

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/docker-compose.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

tools/credScan/CredScanSuppressions.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@
2020
{
2121
"file": "TDSServerArguments.cs",
2222
"_justification": "Contains dummy passwords used for internal testing"
23-
},
24-
{
25-
"file": "Program.cs",
26-
"_justification": "Contains dummy passwords used for docker testing"
27-
},
28-
{
29-
"file": "docker-compose.yml",
30-
"_justification": "Contains dummy passwords used for docker testing"
3123
}
3224
]
3325
}

0 commit comments

Comments
 (0)