Skip to content

Commit 224a316

Browse files
committed
- Fixed expansion of split expression in version numbers.
- Removed addition of PDBs from <AllowedOutputExtensionsInPackageBuildOutputFolder>. - Removed MDS package ref dependency on Abstractions until pipelines are ready. - Renamed AbstractionsPackage to Abstractions in targets. - Updated BUILDGUIDE based on project ref behaviour. - Added feature branches to CI pipeline triggers. - Added missing/incomplete paths to the trigger. - Added dev/* branches to the CI triggers so PRs that target other dev/ branches can run CI. - Added missing MdsPackageVersion property to signed build pipeline job. - Commented-out failing NuGet tool installer task. - Re-ordered Guardian analysis step _before_ build step to avoid clobbering versioned DLLs. - Added MDS package version to AKV build/package steps. - Restored AKV nuspec ReferenceType property for AKV Official builds. - Explicitly building tooling before analysis. - Fixing validation steps to match XML props files. - Added PR automation triggers, and documented other pipeline sections. - Added ReferenceType throughout the MDS/AKV CI build steps. - Added NuGet.config update to main CI build step for Package reference mode. - Swapped Abstractions download and NuGet.config update to ensure packages/ exists before attempting to re-configure NuGet. - Clean target no longer removes packages/ - Uncommented package refs to Abstractions. - Added separate MDS and AKV project builds to support Package mode. - Added $ReferenceType$ property to MDS .nuspec like it is for AKV. - Removed obsolete version variables from merge conflict. - Adding $ReferenceType$ back to AKV nuspec. - Moved SqlAuthenticationProvider and friends into Abstractions. - Moved ActiveDirectoryAuthenticationProvider into a new Azure package. - Moved a bunch of docs into Abstractions and Azure projects. - Updated Abstractions classes to be abstract with minimal implementation. - Added back the implementations to MDS. - Re-worked some of the docs. - SqlAuthentication* classes separated out into Base classes in Abstractions. - Updated docs accordingly. - MDS compiles. - Some Azure package code moved, but not compiling. - Added an exception class for authentication errors. - Enabled XML doc compilation and validation. - Updated MDS to handle SqlAuthenticationProviderException instead of MSAL exceptions. - Removed Azure.Identity from MDS. - Got existing tests compiling using the new Azure package. - Added Azure package build targets. - Updated docs related to ReferenceType - Got all projects properly adhering to Package reference type. - Removed TestMicrosoftDataSqlClientVersion in favour of MdsPackageVersion. - Fixed tools restore from build.proj. - Fixed missing using for dummy auth provider. - Fixed obsolete warnings for password auth. - Moved SqlAuthenticationParameters entirely into Abstractions, avoiding an empty base class. - Moved SqlAuthenticationToken entirely into Abstractions. - Moved SqlAuthenticationProvider entirely into Abstractions. - Removed SqlAuthenticationProviderBase. - Exposed SqlAuthenticationProviderManager as a public API in MDS. - Moved SetProvider() and GetProvider() to the Manager where they should have been all along (Breaking Change). - Added catch-all exception handlers in prep for proper analysis and specific exception handling. - Some improvements to avoid meaningless nulls. - Added PR/CI pipeline support for the Azure package. - Fixed Abstractions download path. - Updated SqlAuthenticationProviderException to use Method instead of Action. - Fixed NRE in SqlException. - Fixed SqlAuthenticationProviderException use in MDS. - Added chaining Add() to SqlErrorCollection. - Added a useful message when _fedAuthToken is null after attempting to acquire a token. - Fixed auth provider error handling to mimic the old code. - Removing unnecessary database checks that are hanging forever. - Fixed timestamp truncation from long to uint causing cached tokens to be erroneously expired.
1 parent c66066a commit 224a316

File tree

89 files changed

+3256
-1905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+3256
-1905
lines changed

BUILDGUIDE.md

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,47 @@ dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlCl
192192

193193
## Testing with Custom ReferenceType
194194

195-
Tests can be built and run with custom "Reference Type" property that enables different styles of testing:
195+
The MDS driver consists of several components, each of which produces its own
196+
NuGet package. During development, components reference each other via
197+
`<ProjectReference>` properties by default. This means that building
198+
and testing one component will implicitly build its project referenced
199+
dependencies.
200+
201+
Alternatively, the `ReferenceType` build property property may be specified with
202+
a value of `Package`. This will change inter-component dependencies to use
203+
`<PackageReference>` dependencies, and require that dependent components be
204+
built and packaged before building the depending component. In this scenario,
205+
the root `NuGet.Config` file must be updated to include the following entry
206+
under the `<packageSources>` element:
207+
208+
```xml
209+
<configuration>
210+
<packageSources>
211+
...
212+
<add key="local" value="packages/" />
213+
</packageSources>
214+
</configuration>
215+
```
216+
217+
Then, you can specify `Package` references be used, for example:
196218

197-
- "Project" => Build and run tests with Microsoft.Data.SqlClient as a Project Reference
198-
- "Package" => Build and run tests with Microsoft.Data.SqlClient as a Package Reference with configured "TestMicrosoftDataSqlClientVersion" in "Versions.props" file.
219+
```bash
220+
dotnet build -t:BuildAbstractions
221+
dotnet build -t:BuildAzure -p:ReferenceType=Package
222+
dotnet build -t:BuildAll -p:ReferenceType=Package
223+
dotnet build -t:BuildAKVNetCore -p:ReferenceType=Package
224+
dotnet build -t:GenerateMdsPackage
225+
dotnet build -t:GenerateAkvPackage
226+
dotnet build -t:BuildTestsNetCore -p:ReferenceType=Package
227+
```
199228

200-
> ************** IMPORTANT NOTE BEFORE PROCEEDING WITH "PACKAGE" REFERENCE TYPE ***************
201-
> CREATE A NUGET PACKAGE WITH BELOW COMMAND AND ADD TO LOCAL FOLDER + UPDATE NUGET CONFIG FILE TO READ FROM THAT LOCATION
202-
>
203-
> ```bash
204-
> msbuild -p:Configuration=Release
205-
> ```
229+
The above will build the Abstractions, Azure, MDS, and AKV components, place
230+
their NuGet packages into the `packages/` directory, and then build the tests
231+
using those packages.
206232

207-
A non-AnyCPU platform reference can only be used with package reference type. Otherwise, the specified platform will be replaced with AnyCPU in the build process.
233+
A non-AnyCPU platform reference can only be used with package reference type.
234+
Otherwise, the specified platform will be replaced with AnyCPU in the build
235+
process.
208236

209237
### Building Tests with Reference Type
210238

NuGet.config.local

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
This NuGet config is used by our Azure Pipelines builds when we need to
4+
reference packages that are not available on the public nuget.org feed.
5+
-->
6+
<configuration>
7+
<packageSources>
8+
<clear />
9+
<!-- The normal feed. -->
10+
<add key="governed" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
11+
12+
<!-- Our local packages/ directory. -->
13+
<add key="local" value="packages/" />
14+
</packageSources>
15+
<auditSources>
16+
<clear />
17+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
18+
</auditSources>
19+
</configuration>

build.proj

Lines changed: 85 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
<TargetNetCoreVersion Condition="$(TargetGroup) == 'netcoreapp' AND $(TargetNetCoreVersion) == ''">$(TF)</TargetNetCoreVersion>
2929
<TargetNetFxVersion Condition="$(TargetGroup) == 'netfx' AND $(TargetNetFxVersion) == ''">$(TF)</TargetNetFxVersion>
3030
<GenerateNuget Condition="'$(GenerateNuget)' == '' AND '$(IsEnabledWindows)' == 'true'">true</GenerateNuget>
31-
<SqlServerLibProperties>Configuration=$(Configuration);AssemblyVersion=$(SqlServerAssemblyVersion);AssemblyFileVersion=$(SqlServerAssemblyFileVersion);Version=$(SqlServerPackageVersion);</SqlServerLibProperties>
32-
<ProjectProperties>Configuration=$(Configuration);AssemblyFileVersion=$(AssemblyFileVersion);TargetsWindows=$(TargetsWindows);TargetsUnix=$(TargetsUnix);</ProjectProperties>
31+
32+
<CommonProperties>Configuration=$(Configuration);ReferenceType=$(ReferenceType)</CommonProperties>
33+
<SqlServerLibProperties>$(CommonProperties);AssemblyVersion=$(SqlServerAssemblyVersion);AssemblyFileVersion=$(SqlServerAssemblyFileVersion);Version=$(SqlServerPackageVersion);</SqlServerLibProperties>
34+
<ProjectProperties>$(CommonProperties);AssemblyFileVersion=$(AssemblyFileVersion);TargetsWindows=$(TargetsWindows);TargetsUnix=$(TargetsUnix);</ProjectProperties>
3335
<TestProjectProperties>$(ProjectProperties);BuildForRelease=false;TargetNetCoreVersion=$(TargetNetCoreVersion);TargetNetFxVersion=$(TargetNetFxVersion)</TestProjectProperties>
3436
<ResultsDirectory Condition="$(ResultsDirectory) == ''">TestResults</ResultsDirectory>
37+
3538
<!--
3639
Path to a `dotnet` version like a x86 or any especific versions in addition to a default installed version.
3740
This property is empty by default to use the default path of the system's path variable.
@@ -52,8 +55,11 @@
5255

5356
<!-- Populate all managed projects -->
5457
<ItemGroup>
58+
<Tools Include="tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj" />
5559
<Abstractions Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
5660
<AbstractionsTest Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
61+
<Azure Include="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
62+
<AzureTest Include="src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj" />
5763
<SqlServerLib Include="**/Microsoft.SqlServer.Server.csproj" />
5864
<NetFxDriver Include="**/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition="'$(IsEnabledWindows)' == 'true'" />
5965
<NetCoreDriver Include="**/netcore/**/Microsoft.Data.SqlClient*.csproj" />
@@ -101,6 +107,8 @@
101107

102108
<!-- Abstractions Targets -->
103109
<PropertyGroup>
110+
<AbstractionsProperties>$(CommonProperties)</AbstractionsProperties>
111+
104112
<!--
105113
If the AbstractionsPackageVersion property was supplied on the
106114
command-line, then pass it along to the Abstractions build. Otherwise,
@@ -116,7 +124,7 @@
116124
-->
117125
<AbstractionsProperties
118126
Condition="'$(AbstractionsPackageVersion)' != ''">
119-
AbstractionsPackageVersion=$(AbstractionsPackageVersion)
127+
$(AbstractionsProperties);AbstractionsPackageVersion=$(AbstractionsPackageVersion)
120128
</AbstractionsProperties>
121129

122130
<!-- Do the same for the AbstractionsAssemblyFileVersion property. -->
@@ -133,7 +141,7 @@
133141
Properties="$(AbstractionsProperties)" />
134142
</Target>
135143

136-
<Target Name="BuildAbstractions">
144+
<Target Name="BuildAbstractions" DependsOnTargets="RestoreAbstractions">
137145
<MSBuild
138146
Projects="@(Abstractions)"
139147
Targets="Build;Pack"
@@ -147,22 +155,78 @@
147155
Properties="$(AbstractionsProperties)" />
148156
</Target>
149157

150-
<Target Name="BuildAbstractionsTest">
158+
<Target Name="BuildAbstractionsTest" DependsOnTargets="RestoreAbstractionsTest">
151159
<MSBuild
152160
Projects="@(AbstractionsTest)"
153161
Targets="Build"
154162
Properties="$(AbstractionsProperties)" />
155163
</Target>
156164

165+
<!-- Azure Targets -->
166+
<PropertyGroup>
167+
<AzureProperties>$(CommonProperties)</AzureProperties>
168+
169+
<!--
170+
If the AzurePackageVersion property was supplied on the command-line, then
171+
pass it along to the Azure build. Otherwise, omit it entirely to avoid it
172+
expanding as empty here and thus overriding the default behaviour in the
173+
Azure project. Command-line properties take precedence over project
174+
defaults, even if their value is empty. For example:
175+
176+
dotnet build -p:AzurePackageVersion=
177+
178+
That results in $(AzurePackageVersion) being defined as empty, and cannot
179+
be overridden by the project.
180+
-->
181+
<AzureProperties
182+
Condition="'$(AzurePackageVersion)' != ''">
183+
$(AzureProperties);AzurePackageVersion=$(AzurePackageVersion)
184+
</AzureProperties>
185+
186+
<!-- Do the same for the AzureAssemblyFileVersion property. -->
187+
<AzureProperties
188+
Condition="'$(AzureAssemblyFileVersion)' != ''">
189+
$(AzureProperties);AzureAssemblyFileVersion=$(AzureAssemblyFileVersion)
190+
</AzureProperties>
191+
</PropertyGroup>
192+
193+
<Target Name="RestoreAzure">
194+
<MSBuild
195+
Projects="@(Azure)"
196+
Targets="Restore"
197+
Properties="$(AzureProperties)" />
198+
</Target>
199+
200+
<Target Name="BuildAzure" DependsOnTargets="RestoreAzure">
201+
<MSBuild
202+
Projects="@(Azure)"
203+
Targets="Build;Pack"
204+
Properties="$(AzureProperties)" />
205+
</Target>
206+
207+
<Target Name="RestoreAzureTest">
208+
<MSBuild
209+
Projects="@(AzureTest)"
210+
Targets="Restore"
211+
Properties="$(AzureProperties)" />
212+
</Target>
213+
214+
<Target Name="BuildAzureTest" DependsOnTargets="RestoreAzureTest">
215+
<MSBuild
216+
Projects="@(AzureTest)"
217+
Targets="Build"
218+
Properties="$(AzureProperties)" />
219+
</Target>
220+
157221
<!-- Other Targets -->
158222
<Target Name="RestoreSqlServerLib">
159-
<MSBuild Projects="@(SqlServerLib)" Targets="restore" />
223+
<MSBuild Projects="@(SqlServerLib)" Targets="restore" Properties="$(SqlServerLibProperties)" />
160224
</Target>
161225

162226
<Target
163227
Name="RestoreNetCore"
164228
DependsOnTargets="RestoreSqlServerLib;RestoreAbstractions">
165-
<MSBuild Projects="@(NetCoreDriver)" Targets="restore" />
229+
<MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="$(ProjectProperties)" />
166230
</Target>
167231

168232
<Target Name="RestoreTestsNetCore" DependsOnTargets="RestoreNetCore">
@@ -175,7 +239,7 @@
175239
Name="RestoreNetFx"
176240
DependsOnTargets="RestoreSqlServerLib;RestoreAbstractions"
177241
Condition="'$(IsEnabledWindows)' == 'true'">
178-
<MSBuild Projects="@(NetFxDriver)" Targets="restore" />
242+
<MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="$(ProjectProperties)" />
179243
</Target>
180244

181245
<Target
@@ -187,11 +251,12 @@
187251
<MSBuild Projects="@(UnitTests)" Targets="restore" Properties="$(TestProjectProperties)"/>
188252
</Target>
189253

190-
<Target Name="BuildTools" Condition="'$(BuildTools)' == 'true'">
191-
<PropertyGroup>
192-
<DotnetBuildCmd>dotnet build -c Release -p:ReferenceType=$(ReferenceType)</DotnetBuildCmd>
193-
</PropertyGroup>
194-
<Exec Command="$(DotnetBuildCmd)" WorkingDirectory="$(GenAPISrcDir)Microsoft.DotNet.GenAPI\" />
254+
<Target Name="RestoreTools" Condition="'$(BuildTools)' == 'true'">
255+
<MSBuild Projects="@(Tools)" Targets="restore" Properties="$(CommonProperties)" />
256+
</Target>
257+
258+
<Target Name="BuildTools" DependsOnTargets="RestoreTools" Condition="'$(BuildTools)' == 'true'">
259+
<MSBuild Projects="@(Tools)" Properties="$(CommonProperties)" />
195260
</Target>
196261

197262
<Target
@@ -206,11 +271,11 @@
206271
</Target>
207272

208273
<Target Name="BuildSqlServerLib" DependsOnTargets="RestoreSqlServerLib">
209-
<Message Text=">>> Building SqlServerLib [$(CI);$(SqlServerLibProperties);Platform=AnyCPU;ReferenceType=$(ReferenceType);] ..." Condition="!$(ReferenceType.Contains('Package'))" />
274+
<Message Text=">>> Building SqlServerLib [$(CI);$(SqlServerLibProperties);Platform=AnyCPU] ..." Condition="!$(ReferenceType.Contains('Package'))" />
210275
<MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=AnyCPU;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="!$(ReferenceType.Contains('Package'))" />
211276

212277
<!-- Only build platform specific builds for Package reference types -->
213-
<Message Text=">>> Building SqlServerLib [$(CI);$(SqlServerLibProperties);Platform=$(Platform);ReferenceType=$(ReferenceType);] ..." Condition="$(ReferenceType.Contains('Package'))" />
278+
<Message Text=">>> Building SqlServerLib [$(CI);$(SqlServerLibProperties);Platform=$(Platform)] ..." Condition="$(ReferenceType.Contains('Package'))" />
214279
<MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))" />
215280
</Target>
216281

@@ -238,29 +303,29 @@
238303
Name="BuildUnitTestsNetCore"
239304
DependsOnTargets="RestoreTestsNetCore;BuildNetCore"
240305
Condition="$(ReferenceType.Contains('Project'))">
241-
<Message Text=">>> Building UnitTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU;ReferenceType=$(ReferenceType);] ..." Condition="!$(ReferenceType.Contains('Package'))"/>
306+
<Message Text=">>> Building UnitTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU] ..." Condition="!$(ReferenceType.Contains('Package'))"/>
242307
<MSBuild Projects="@(UnitTests)" Properties="TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU;" Condition="!$(ReferenceType.Contains('Package'))" />
243308
</Target>
244309

245310
<Target
246311
Name="BuildFunctionalTestsNetCore"
247312
DependsOnTargets="RestoreTestsNetCore;BuildNetCore;BuildAKVNetCore">
248-
<Message Text=">>> Building FunctionalTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU;ReferenceType=$(ReferenceType);] ..." Condition="!$(ReferenceType.Contains('Package'))" />
313+
<Message Text=">>> Building FunctionalTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU] ..." Condition="!$(ReferenceType.Contains('Package'))" />
249314
<MSBuild Projects="@(FunctionalTests)" Properties="TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU;" Condition="!$(ReferenceType.Contains('Package'))" />
250315

251316
<!-- Only build platform specific builds for Package reference types -->
252-
<Message Text=">>> Building FunctionalTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=$(Platform);ReferenceType=$(ReferenceType);] ..." Condition="$(ReferenceType.Contains('Package'))" />
317+
<Message Text=">>> Building FunctionalTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=$(Platform)] ..." Condition="$(ReferenceType.Contains('Package'))" />
253318
<MSBuild Projects="@(FunctionalTests)" Properties="TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))" />
254319
</Target>
255320

256321
<Target
257322
Name="BuildManualTestsNetCore"
258323
DependsOnTargets="RestoreTestsNetCore;BuildNetCore;BuildAKVNetCore">
259-
<Message Text=">>> Building ManualTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU;ReferenceType=$(ReferenceType);] ..." Condition="!$(ReferenceType.Contains('Package'))" />
324+
<Message Text=">>> Building ManualTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU] ..." Condition="!$(ReferenceType.Contains('Package'))" />
260325
<MSBuild Projects="@(ManualTests)" Properties="TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=AnyCPU;" Condition="!$(ReferenceType.Contains('Package'))" />
261326

262327
<!-- Only build platform specific builds for Package reference types -->
263-
<Message Text=">>> Building ManualTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=$(Platform);ReferenceType=$(ReferenceType);] ..." Condition="$(ReferenceType.Contains('Package'))" />
328+
<Message Text=">>> Building ManualTestsNetCore [TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=$(Platform)] ..." Condition="$(ReferenceType.Contains('Package'))" />
264329
<MSBuild Projects="@(ManualTests)" Properties="TestTargetOS=$(TestOS)netcoreapp;$(TestProjectProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))" />
265330
</Target>
266331

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<docs>
2+
<members name="SqlAuthenticationProviderManager">
3+
<SqlAuthenticationProviderManager>
4+
<summary>Manages which authentication provider is used for each authentication method.</summary>
5+
</SqlAuthenticationProviderManager>
6+
<GetProvider>
7+
<param name="authenticationMethod">The authentication method.</param>
8+
<summary>Gets an authentication provider by method.</summary>
9+
<returns>The authentication provider or <see langword="null" /> if not found.</returns>
10+
</GetProvider>
11+
<SetProvider>
12+
<param name="authenticationMethod">The authentication method.</param>
13+
<param name="provider">The authentication provider.</param>
14+
<summary>Sets an authentication provider by method.</summary>
15+
<returns>
16+
<see langword="true" /> if the operation succeeded; otherwise, <see langword="false" /> (for example, the existing provider disallows overriding).
17+
</returns>
18+
</SetProvider>
19+
</members>
20+
</docs>

eng/pipelines/common/templates/jobs/build-signed-package-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
configuration: $(Configuration)
5050
msbuildArguments: -t:BuildTools
5151

52-
# Perform analysis before building, since this step will clobber build output
52+
# Perform analysis before building, since this step will clobber build output.
5353
- template: ../steps/code-analyze-step.yml@self
5454

5555
# Update the root NuGet.config to use the packages/ directory as a source.

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ parameters:
1010
- name: abstractionsPackageVersion
1111
type: string
1212

13+
- name: azureArtifactName
14+
type: string
15+
16+
- name: azurePackageVersion
17+
type: string
18+
1319
- name: configProperties
1420
type: object
1521
default: {} # - key: 'value'
@@ -121,6 +127,12 @@ jobs:
121127
artifactName: ${{ parameters.mdsArtifactName }}
122128
targetPath: $(Build.SourcesDirectory)/packages
123129

130+
- task: DownloadPipelineArtifact@2
131+
displayName: Download Azure Package Artifact
132+
inputs:
133+
artifactName: ${{ parameters.azureArtifactName }}
134+
targetPath: $(Build.SourcesDirectory)/packages
135+
124136
- ${{ if ne(parameters.prebuildSteps, '') }}:
125137
- ${{ parameters.prebuildSteps }} # extra steps to run before the build like downloading sni and the required configuration
126138

@@ -253,6 +265,7 @@ jobs:
253265
referenceType: ${{ parameters.referenceType }}
254266
testSet: ${{ parameters.testSet }}
255267
abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
268+
azurePackageVersion: ${{ parameters.azurePackageVersion }}
256269
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
257270
${{ if ne(parameters.operatingSystem, 'Windows') }}:
258271
OSGroup: Unix

eng/pipelines/common/templates/jobs/validate-signed-package-job.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -305,17 +305,6 @@ jobs:
305305
Get-ChildItem *.dll -Path $(extractedNugetPath) -Recurse | ForEach-Object VersionInfo | Format-List
306306
displayName: 'Verify "File Version" matches expected values for DLLs'
307307
308-
- powershell: |
309-
# Change TestMicrosoftDataSqlClientVersion
310-
311-
[Xml] $versionprops = Get-Content -Path "tools/props/Versions.props"
312-
$versionpropspath = "tools\props\Versions.props"
313-
$versionprops.Project.PropertyGroup[$versionprops.Project.PropertyGroup.Count-1].TestMicrosoftDataSqlClientVersion ="$(mdsPackageVersion)"
314-
Write-Host "Saving Test nuget version at $rootfolder\props ...." -ForegroundColor Green
315-
$versionprops.Save($versionpropspath)
316-
317-
displayName: 'Modify TestMicrosoftDataSqlClientVersion'
318-
319308
- powershell: |
320309
# Check assembly versions.
321310
#

0 commit comments

Comments
 (0)