Skip to content

Commit 2fa8826

Browse files
committed
Addressed Copilot feedback.
1 parent ec25bc9 commit 2fa8826

6 files changed

Lines changed: 11 additions & 19 deletions

File tree

eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
parameters:
113113
buildConfiguration: ${{ parameters.buildConfiguration }}
114114
displayName: 'Create MDS NuGet Package'
115-
generateSymbolsPackage: false
115+
generateSymbolsPackage: true
116116
nuspecPath: 'tools/specs/Microsoft.Data.SqlClient.nuspec'
117117
outputDirectory: $(packagePath)
118118
packageVersion: ${{ parameters.mdsPackageVersion }}
@@ -132,7 +132,7 @@ jobs:
132132
parameters:
133133
buildConfiguration: ${{ parameters.buildConfiguration }}
134134
displayName: 'Create AKV NuGet Package'
135-
generateSymbolsPackage: false
135+
generateSymbolsPackage: true
136136
installNuget: false
137137
nuspecPath: 'tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec'
138138
outputDirectory: $(packagePath)

eng/pipelines/common/templates/jobs/ci-run-tests-job.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ parameters:
7070
type: stepList
7171
default: []
7272

73-
- name: publishTestResults
74-
type: boolean
75-
default: false
76-
7773
- name: referenceType
7874
type: string
7975
values:
@@ -316,10 +312,9 @@ jobs:
316312
abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
317313
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
318314

319-
- ${{ if eq(parameters.publishTestResults, true) }}:
320-
- template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
321-
parameters:
322-
debug: ${{ parameters.debug }}
323-
targetFramework: ${{ parameters.targetFramework }}
324-
operatingSystem: ${{ parameters.operatingSystem }}
325-
buildConfiguration: ${{ parameters.buildConfiguration }}
315+
- template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
316+
parameters:
317+
debug: ${{ parameters.debug }}
318+
targetFramework: ${{ parameters.targetFramework }}
319+
operatingSystem: ${{ parameters.operatingSystem }}
320+
buildConfiguration: ${{ parameters.buildConfiguration }}

eng/pipelines/common/templates/steps/generate-nuget-package-step.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ parameters:
2323

2424
- name: generateSymbolsPackage
2525
type: boolean
26-
default: true
2726

2827
- name: displayName
2928
type: string
@@ -55,7 +54,7 @@ steps:
5554
$Commit=git rev-parse HEAD
5655
Write-Host "##vso[task.setvariable variable=CommitHead;]$Commit"
5756
displayName: CommitHead
58-
57+
5958
- task: NuGetCommand@2
6059
displayName: ${{parameters.displayName }}
6160
inputs:

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<ObjFolder>$(Artifacts)obj\</ObjFolder>
5050
<CommonPath>$(NetCoreSource)src\Common\src</CommonPath>
5151
<CommonTestPath>$(NetCoreSource)src\Common\tests</CommonTestPath>
52-
<TestsPath>$(ProjectDir)Microsoft.Data.SqlClient\tests\</TestsPath>
52+
<TestsPath>$(ProjectDir)Microsoft.Data.SqlClient/tests/</TestsPath>
5353
<BinFolder Condition="'$(TargetsWindows)' == 'true'">$(Artifacts)bin\Windows_NT\</BinFolder>
5454
<BinFolder Condition="'$(TargetsAnyOS)' == 'true'">$(Artifacts)bin\AnyOS\</BinFolder>
5555
<BinFolder Condition="'$(TargetsUnix)' == 'true'">$(Artifacts)bin\Unix\</BinFolder>

src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222

2323
<!-- Embedded resources and content files =========================== -->
2424
<ItemGroup>
25-
<!-- This file sets some configuration setting that only apply to netfx. It cannot #if -->
26-
<!-- included into the project, so it must be included via a condition attribute. -->
25+
<!-- This file applies runtime configuration to .NET Framework that is used by the tests. -->
2726
<None Update="app.config" Condition="'$(TargetFramework)' == 'net462'">
2827
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2928
</None>

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<EnableDynamicInstrumentationForNGen>True</EnableDynamicInstrumentationForNGen>
2626
<!-- Do not include test assemblies in coverage -->
2727
<IncludeTestAssembly>False</IncludeTestAssembly>
28-
<!-- Use qualified names for functions -->
2928
<UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
3029
<AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
3130
<CollectFromChildProcesses>True</CollectFromChildProcesses>

0 commit comments

Comments
 (0)