Skip to content

Commit 86f06f6

Browse files
committed
- Fixed missing SNI DLLs for .NET Framework in Project reference tests.
- Trying to fix test filters.
1 parent 19c0963 commit 86f06f6

4 files changed

Lines changed: 18 additions & 9 deletions

File tree

eng/pipelines/dotnet-sqlclient-ci-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ stages:
176176
dependsOn:
177177
- build_abstractions_package_stage
178178
- build_mds_akv_packages_stage
179-
dotnetVerbosity: diagnostic
179+
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
180180
mdsArtifactsName: $(mdsArtifactsName)
181181
mdsPackageVersion: $(mdsPackageVersion)
182182
referenceType: ${{ parameters.referenceType }}

eng/pipelines/jobs/test-abstractions-package-ci-job.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
$(buildArguments)
171171
--no-build
172172
-f ${{ runtime }}
173-
--filter '"category != failing & category != flaky"'
173+
--filter 'category != failing & category != flaky'
174174
175175
- task: DotNetCoreCLI@2
176176
displayName: Test Flaky [${{ runtime }}]
@@ -182,7 +182,7 @@ jobs:
182182
$(buildArguments)
183183
--no-build
184184
-f ${{ runtime }}
185-
--filter '"category = flaky"'
185+
--filter 'category = flaky'
186186
187187
# Run the tests for each .NET Framework runtime.
188188
- ${{ each runtime in parameters.netFrameworkRuntimes }}:
@@ -196,7 +196,7 @@ jobs:
196196
$(buildArguments)
197197
--no-build
198198
-f ${{ runtime }}
199-
--filter '"category != failing & category != flaky"'
199+
--filter 'category != failing & category != flaky'
200200
201201
- task: DotNetCoreCLI@2
202202
displayName: Test Flaky [${{ runtime }}]
@@ -208,4 +208,4 @@ jobs:
208208
$(buildArguments)
209209
--no-build
210210
-f ${{ runtime }}
211-
--filter '"category = flaky"'
211+
--filter 'category = flaky'

eng/pipelines/jobs/test-azure-package-ci-job.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ jobs:
305305
$(buildArguments)
306306
--no-build
307307
-f ${{ runtime }}
308-
--filter '"category != failing & category != flaky"'
308+
--filter 'category != failing & category != flaky'
309309
310310
- task: DotNetCoreCLI@2
311311
displayName: Test Flaky [${{ runtime }}]
@@ -324,7 +324,7 @@ jobs:
324324
$(buildArguments)
325325
--no-build
326326
-f ${{ runtime }}
327-
--filter '"category = flaky"'
327+
--filter 'category = flaky'
328328
329329
# Run the tests for each .NET Framework runtime.
330330
- ${{ each runtime in parameters.netFrameworkRuntimes }}:
@@ -345,7 +345,7 @@ jobs:
345345
$(buildArguments)
346346
--no-build
347347
-f ${{ runtime }}
348-
--filter '"category != failing & category != flaky"'
348+
--filter 'category != failing & category != flaky'
349349
350350
- task: DotNetCoreCLI@2
351351
displayName: Test Flaky [${{ runtime }}]
@@ -364,4 +364,4 @@ jobs:
364364
$(buildArguments)
365365
--no-build
366366
-f ${{ runtime }}
367-
--filter '"category = flaky"'
367+
--filter 'category = flaky'

src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@
4444
<!-- Conditional Project References -->
4545
<ItemGroup Condition="'$(ReferenceType)' == 'Project'">
4646
<ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
47+
48+
<!--
49+
We explicitly depend on SNI for .NET Framework due to bugs in how its DLLs get published
50+
during Project reference builds.
51+
52+
This is probably an incompatibility between the build targets that the SNI NuGet package
53+
injects into downstream projects, and how the MDS project configures its output directories.
54+
-->
55+
<PackageReference Condition="'$(TargetFramework)' == 'net462'" Include="Microsoft.Data.SqlClient.SNI" />
4756
</ItemGroup>
4857

4958
<!-- Conditional Package References -->

0 commit comments

Comments
 (0)