Skip to content

Commit 080c712

Browse files
paulmedynskipaulmedynski
authored
[5.1] Update Dependencies & Fix Build Issues (#3754)
1 parent 499b095 commit 080c712

File tree

106 files changed

+437
-1626
lines changed

Some content is hidden

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

106 files changed

+437
-1626
lines changed

‎build.proj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<FunctionalTests Include="**/tools/TDS/TDS/TDS.csproj" />
5454
<FunctionalTests Include="**/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
5555
<FunctionalTests Include="**/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
56-
<FunctionalTests Include="**/tools/Microsoft.DotNet.XUnitExtensions/Microsoft.DotNet.XUnitExtensions.csproj" />
5756
<FunctionalTests Include="**/tools/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj" />
5857
<FunctionalTests Include="**/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
5958
<FunctionalTests Include="**/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj" />
@@ -64,7 +63,6 @@
6463
<ManualTests Include="**/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj" />
6564
<ManualTests Include="**/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
6665
<ManualTests Include="**/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
67-
<ManualTests Include="**/tools/Microsoft.DotNet.XUnitExtensions/Microsoft.DotNet.XUnitExtensions.csproj" />
6866
<ManualTests Include="**/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj"/>
6967
<ManualTests Include="**/tools/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj" />
7068
<ManualTests Include="**/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
@@ -105,7 +103,7 @@
105103

106104
<Target Name="BuildTools" Condition="'$(BuildTools)' == 'true'">
107105
<PropertyGroup>
108-
<DotnetBuildCmd>$(DotNetCmd) dotnet build -c Release -p:ReferenceType=$(ReferenceType)</DotnetBuildCmd>
106+
<DotnetBuildCmd>$(DotnetPath)dotnet build -c Release -p:ReferenceType=$(ReferenceType)</DotnetBuildCmd>
109107
</PropertyGroup>
110108
<Exec Command="$(DotnetBuildCmd)" WorkingDirectory="$(GenAPISrcDir)Microsoft.DotNet.GenAPI\" />
111109
</Target>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# See the LICENSE file in the project root for more information. #
55
#################################################################################
66
parameters:
7+
- name: mdsPackageVersion
8+
type: string
9+
710
- name: symbolsFolder
811
type: string
912
default: symbols
@@ -33,14 +36,14 @@ jobs:
3336
- template: ../steps/build-all-configurations-signed-dlls-step.yml@self
3437
parameters:
3538
product: AKV
36-
nugetPackageRefVersion: $(MDS_PackageRef_Version)
39+
nugetPackageRefVersion: ${{ parameters.mdsPackageVersion }}
3740
AssemblyFileVersion: $(AKVAssemblyFileVersion)
3841

3942
- template: ../steps/code-analyze-step.yml@self
4043
parameters:
4144
analyzeType: all
4245
product: AKV
43-
nugetPackageRefVersion: $(MDS_PackageRef_Version)
46+
nugetPackageRefVersion: ${{ parameters.mdsPackageVersion }}
4447

4548
- template: ../steps/esrp-code-signing-step.yml@self
4649
parameters:

‎eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ steps:
5858
5959
if ($tf.StartsWith('net4'))
6060
{
61-
Copy-Item "artifacts\${{parameters.referenceType }}\bin\Windows_NT\${{parameters.Configuration }}.AnyCPU\Microsoft.Data.SqlClient\netfx\Microsoft.Data.SqlClient.dll" "$software\win\$tf" -recurse
61+
Copy-Item "artifacts\${{parameters.referenceType }}\bin\Windows_NT\${{parameters.Configuration }}.AnyCPU\Microsoft.Data.SqlClient\netfx\$tf\Microsoft.Data.SqlClient.dll" "$software\win\$tf" -recurse
6262
}
6363
else
6464
{
@@ -70,16 +70,16 @@ steps:
7070
7171
if ($tf.StartsWith('net4'))
7272
{
73-
Copy-Item "artifacts\Project\bin\Windows_NT\Release.AnyCPU\Microsoft.Data.SqlClient\netfx\Microsoft.Data.SqlClient.pdb" "$symbols\win\$tf" -recurse
73+
Copy-Item "artifacts\${{parameters.referenceType }}\bin\Windows_NT\${{parameters.Configuration }}.AnyCPU\Microsoft.Data.SqlClient\netfx\$tf\Microsoft.Data.SqlClient.pdb" "$symbols\win\$tf" -recurse
7474
}
7575
else
7676
{
77-
Copy-Item "artifacts\Project\bin\Windows_NT\Release.AnyCPU\Microsoft.Data.SqlClient\netcore\$tf\Microsoft.Data.SqlClient.pdb" "$symbols\win\$tf" -recurse
77+
Copy-Item "artifacts\${{parameters.referenceType }}\bin\Windows_NT\${{parameters.Configuration }}.AnyCPU\Microsoft.Data.SqlClient\netcore\$tf\Microsoft.Data.SqlClient.pdb" "$symbols\win\$tf" -recurse
7878
}
7979
8080
Write-Host "Artifacts fetched for testing"
8181
Get-Location
82-
displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
82+
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
8383
8484
- ${{ if eq(parameters.product, 'AKV') }}:
8585
- powershell: |
@@ -96,7 +96,7 @@ steps:
9696
9797
Write-Host "Artifacts fetched for testing"
9898
Get-Location
99-
displayName: 'Prepare ${{ targetFramework }} Arifacts for Testing'
99+
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
100100
101101
- powershell: |
102102
$software = '${{parameters.softwareFolder}}'

‎eng/pipelines/dotnet-sqlclient-signing-pipeline.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@ parameters: # parameters are shown up in ADO UI in a build queue time
4343
type: boolean
4444
default: false
4545

46+
# GOTCHA: This must be a previously published MDS package version. This
47+
# pipeline isn't capable of using the MDS package being built as input for
48+
# the AKV package build.
4649
- name: MDS_PackageRef_Version
47-
displayName: 'MDS package version of AKV Provider (build AKV)'
50+
displayName: 'Publicly available MDS package version for AKV Provider build'
4851
type: string
49-
default: 5.1.2
52+
default: 5.1.7
5053

5154
- name: CurrentNetFxVersion
5255
displayName: 'Lowest supported .NET Framework version (MDS validation)'
@@ -77,8 +80,6 @@ variables:
7780
value: drop_buildMDS_build_signed_package
7881
- name: PublishSymbols
7982
value: ${{ parameters['publishSymbols'] }}
80-
- name: MDS_PackageRef_Version
81-
value: ${{ parameters['MDS_PackageRef_Version'] }}
8283
- name: CurrentNetFxVersion
8384
value: ${{ parameters['CurrentNetFxVersion'] }}
8485
- name: ProductVersion #MDS product version (MDS validation)
@@ -144,22 +145,23 @@ extends:
144145
tsaOptionsPath: $(REPOROOT)\.config\tsaoptions.json
145146
disableLegacyManifest: true
146147
stages:
147-
- stage: buildAKV
148-
displayName: 'Build AKV Provider'
148+
- stage: buildMDS
149+
displayName: 'Build MDS'
149150
jobs:
150-
- template: eng/pipelines/common/templates/jobs/build-signed-akv-package-job.yml@self
151+
- template: eng/pipelines/common/templates/jobs/build-signed-package-job.yml@self
151152
parameters:
152153
symbolsFolder: $(symbolsFolder)
153154
softwareFolder: $(softwareFolder)
154155
publishSymbols: ${{ parameters['publishSymbols'] }}
155156

156-
- stage: buildMDS
157-
displayName: 'Build MDS'
157+
- stage: buildAKV
158+
displayName: 'Build AKV Provider'
158159
jobs:
159-
- template: eng/pipelines/common/templates/jobs/build-signed-package-job.yml@self
160+
- template: eng/pipelines/common/templates/jobs/build-signed-akv-package-job.yml@self
160161
parameters:
161162
symbolsFolder: $(symbolsFolder)
162163
softwareFolder: $(softwareFolder)
164+
mdsPackageVersion: ${{ parameters['MDS_PackageRef_Version'] }}
163165
publishSymbols: ${{ parameters['publishSymbols'] }}
164166

165167
- stage: mds_package_validation

‎eng/pipelines/libraries/akv-variables.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,26 @@
66

77
variables:
88
- group: AKV Release Variables
9-
- name: AKVMajor
9+
10+
# The above Library contains variables named AKVMajor, AKVMinor, and AKVPatch.
11+
# We don't want to use those (since they are shared with other pipelines), so
12+
# we specify our own variables here. These are the only variables that affect
13+
# the NuGet package version and assembly version for AKV official builds for
14+
# this branch (5.1).
15+
#
16+
# There are other variables in that Library that we still need, so we can't
17+
# omit it entirely.
18+
#
19+
- name: LocalAkvMajor
1020
value: 5
11-
- name: AKVMinor
21+
- name: LocalAkvMinor
1222
value: 1
13-
- name: AKVPatch
23+
- name: LocalAkvPatch
1424
value: 0
1525

1626
- name: AKVNugetPackageVersion
17-
value: $(AKVMajor).$(AKVMinor).$(AKVPatch)
27+
value: $(LocalAkvMajor).$(LocalAkvMinor).$(LocalAkvPatch)
1828
- name: AKVAssemblyFileVersion
19-
value: '$(AKVMajor).$(AKVMinor)$(AKVPatch).$(Build.BuildNumber)'
29+
value: '$(LocalAkvMajor).$(LocalAkvMinor)$(LocalAkvPatch).$(Build.BuildNumber)'
2030
- name: akvNuspecPath
2131
value: tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec

‎eng/pipelines/libraries/build-variables.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66

77
variables:
88
- template: common-variables.yml@self
9-
- template: akv-variables.yml@self
109
- template: mds-variables.yml@self
10+
- template: akv-variables.yml@self

‎eng/pipelines/libraries/mds-variables.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,27 @@
77
variables:
88
- group: Release Variables
99

10-
- name: Major
10+
# The above Library contains variables named Major, Minor, and Patch. We
11+
# don't want to use those (since they are shared with other pipelines), so we
12+
# specify our own variables here. These are the only variables that affect
13+
# the NuGet package version and assembly version for MDS official builds for
14+
# this branch (5.1).
15+
#
16+
# There are other variables in that Library that we still need, so we can't
17+
# omit it entirely.
18+
#
19+
- name: LocalMdsMajor
1120
value: 5
12-
- name: Minor
21+
- name: LocalMdsMinor
1322
value: 1
14-
- name: Patch
15-
value: 7
23+
- name: LocalMdsPatch
24+
value: 8
1625
- name: Packaging.EnableSBOMSigning
1726
value: true
1827

1928
- name: NugetPackageVersion
20-
value: $(Major).$(Minor).$(Patch)
29+
value: $(LocalMdsMajor).$(LocalMdsMinor).$(LocalMdsPatch)
2130
- name: AssemblyFileVersion
22-
value: '$(Major).$(Minor)$(Patch).$(Build.BuildNumber)'
31+
value: '$(LocalMdsMajor).$(LocalMdsMinor)$(LocalMdsPatch).$(Build.BuildNumber)'
2332
- name: nuspecPath
2433
value: '$(REPOROOT)/tools/specs/Microsoft.Data.SqlClient.nuspec'

‎src/Directory.Build.props‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,16 @@
105105
<Import Project="$(ToolsDir)props\AssemblyRef.props" />
106106
<Import Project="$(ToolsDir)targets\RepositoryInfo.targets" />
107107

108+
<!-- Fix GetTargetPath issues - see https://github.com/dotnet/msbuild/issues/4303#issuecomment-482345617 -->
109+
<PropertyGroup>
110+
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
111+
</PropertyGroup>
112+
113+
<!--
114+
We target .NET 6.0 and modern SDK tooling produces warnings since it is
115+
out of support. Suppress these warnings to avoid noise in the builds.
116+
-->
117+
<PropertyGroup>
118+
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
119+
</PropertyGroup>
108120
</Project>

‎src/Microsoft.Data.SqlClient.sln‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio Version 17
34
VisualStudioVersion = 17.0.31912.275
@@ -11,9 +12,6 @@ EndProject
1112
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TDS.Servers", "Microsoft.Data.SqlClient\tests\tools\TDS\TDS.Servers\TDS.Servers.csproj", "{978063D3-FBB5-4E10-8C45-67C90BE1B931}"
1213
EndProject
1314
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TDS", "Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj", "{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}"
14-
ProjectSection(ProjectDependencies) = postProject
15-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC} = {FDA6971D-9F57-4DA4-B10A-261C91684CFC}
16-
EndProjectSection
1715
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.Tests", "Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.Tests.csproj", "{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}"
1917
ProjectSection(ProjectDependencies) = postProject
@@ -28,7 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netfx", "netfx", "{3FDD425C
2826
EndProject
2927
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Address", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Address\Address.csproj", "{D1392B54-998A-4F27-BC17-4CE149117BCC}"
3028
ProjectSection(ProjectDependencies) = postProject
31-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC} = {FDA6971D-9F57-4DA4-B10A-261C91684CFC}
3229
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
3330
{407890AC-9876-4FEF-A6F1-F36A876BAADE} = {407890AC-9876-4FEF-A6F1-F36A876BAADE}
3431
EndProjectSection
@@ -40,13 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.Ma
4037
EndProject
4138
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Circle", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Circle\Circle.csproj", "{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}"
4239
ProjectSection(ProjectDependencies) = postProject
43-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC} = {FDA6971D-9F57-4DA4-B10A-261C91684CFC}
4440
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
4541
EndProjectSection
4642
EndProject
4743
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shapes", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Shapes\Shapes.csproj", "{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}"
4844
ProjectSection(ProjectDependencies) = postProject
49-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC} = {FDA6971D-9F57-4DA4-B10A-261C91684CFC}
5045
{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
5146
EndProjectSection
5247
EndProject
@@ -72,8 +67,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.Al
7267
EndProject
7368
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "add-ons", "add-ons", "{C9726AED-D6A3-4AAC-BA04-92DD1F079594}"
7469
EndProject
75-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.XUnitExtensions", "Microsoft.Data.SqlClient\tests\tools\Microsoft.DotNet.XUnitExtensions\Microsoft.DotNet.XUnitExtensions.csproj", "{FDA6971D-9F57-4DA4-B10A-261C91684CFC}"
76-
EndProject
7770
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{ED952CF7-84DF-437A-B066-F516E9BE1C2C}"
7871
EndProject
7972
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "snippets", "snippets", "{71F356DC-DFA3-4163-8BFE-D268722CE189}"
@@ -383,18 +376,6 @@ Global
383376
{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x64.Build.0 = Release|Any CPU
384377
{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x86.ActiveCfg = Release|Any CPU
385378
{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x86.Build.0 = Release|Any CPU
386-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
387-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
388-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Debug|x64.ActiveCfg = Debug|Any CPU
389-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Debug|x64.Build.0 = Debug|Any CPU
390-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Debug|x86.ActiveCfg = Debug|Any CPU
391-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Debug|x86.Build.0 = Debug|Any CPU
392-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
393-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Release|Any CPU.Build.0 = Release|Any CPU
394-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Release|x64.ActiveCfg = Release|Any CPU
395-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Release|x64.Build.0 = Release|Any CPU
396-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Release|x86.ActiveCfg = Release|Any CPU
397-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC}.Release|x86.Build.0 = Release|Any CPU
398379
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
399380
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|x64.ActiveCfg = Debug|Any CPU
400381
{F5DF2FDC-C860-4CB3-8B24-7C903C6FC076}.Debug|x64.Build.0 = Debug|Any CPU
@@ -510,7 +491,6 @@ Global
510491
{771F3F1E-7A68-4A9D-ADA8-A24F1D5BE71D} = {3FDD425C-FE01-4B56-863E-1FCDD0677CF5}
511492
{412BCCC8-19F6-489A-B594-E9A506816155} = {771F3F1E-7A68-4A9D-ADA8-A24F1D5BE71D}
512493
{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7} = {C9726AED-D6A3-4AAC-BA04-92DD1F079594}
513-
{FDA6971D-9F57-4DA4-B10A-261C91684CFC} = {0CC4817A-12F3-4357-912C-09315FAAD008}
514494
{71F356DC-DFA3-4163-8BFE-D268722CE189} = {ED952CF7-84DF-437A-B066-F516E9BE1C2C}
515495
{908C7DD3-C999-40A6-9433-9F5ACA7C36F5} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
516496
{0CE216CE-8072-4985-B248-61F0D0BE9C2E} = {71F356DC-DFA3-4163-8BFE-D268722CE189}

‎src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
</ItemGroup>
3232
<ItemGroup>
3333
<PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
34+
<PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
3435
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
3536
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="$(AzureSecurityKeyVaultKeysVersion)" />
3637
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />

0 commit comments

Comments
 (0)