Skip to content

Commit de257bb

Browse files
[windows] Add SQL OLEDB Driver 19 (#13127)
1 parent 5641ff0 commit de257bb

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

images/windows/scripts/build/Install-SQLOLEDBDriver.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
## Desc: Install OLE DB Driver for SQL Server
44
################################################################################
55

6+
# Install OLE DB Driver 18
67
Install-Binary -Type MSI `
78
-Url "https://go.microsoft.com/fwlink/?linkid=2242656" `
89
-ExtraInstallArgs @("ADDLOCAL=ALL", "IACCEPTMSOLEDBSQLLICENSETERMS=YES") `
910
-ExpectedSubject $(Get-MicrosoftPublisher)
11+
12+
# Install OLE DB Driver 19
13+
Install-Binary -Type MSI `
14+
-Url "https://go.microsoft.com/fwlink/?linkid=2318101" `
15+
-ExtraInstallArgs @("ADDLOCAL=ALL", "IACCEPTMSOLEDBSQLLICENSETERMS=YES") `
16+
-ExpectedSubject $(Get-MicrosoftPublisher)

images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ $databaseTools = $installedSoftware.AddHeader("Database tools")
191191
$databaseTools.AddToolVersion("Azure CosmosDb Emulator", $(Get-AzCosmosDBEmulatorVersion))
192192
$databaseTools.AddToolVersion("DacFx", $(Get-DacFxVersion))
193193
$databaseTools.AddToolVersion("MySQL", $(Get-MySQLVersion))
194-
$databaseTools.AddToolVersion("SQL OLEDB Driver", $(Get-SQLOLEDBDriverVersion))
194+
$databaseTools.AddToolVersion("SQL OLEDB Driver 18", $(Get-SQLOLEDBDriver18Version))
195+
$databaseTools.AddToolVersion("SQL OLEDB Driver 19", $(Get-SQLOLEDBDriver19Version))
195196
$databaseTools.AddToolVersion("SQLPS", $(Get-SQLPSVersion))
196197
$databaseTools.AddToolVersion("MongoDB Shell (mongosh)", $(Get-MongoshVersion))
197198

images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,16 @@ function Get-MySQLVersion {
121121
return $mysqlVersion
122122
}
123123

124-
function Get-SQLOLEDBDriverVersion {
124+
function Get-SQLOLEDBDriver18Version {
125125
$SQLOLEDBDriverVersion = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSOLEDBSQL' InstalledVersion).InstalledVersion
126126
return $SQLOLEDBDriverVersion
127127
}
128128

129+
function Get-SQLOLEDBDriver19Version {
130+
$SQLOLEDBDriverVersion = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSOLEDBSQL19' InstalledVersion).InstalledVersion
131+
return $SQLOLEDBDriverVersion
132+
}
133+
129134
function Get-MercurialVersion {
130135
($(hg --version) | Out-String) -match "version (?<version>\d+\.\d+\.?\d*)" | Out-Null
131136
$mercurialVersion = $Matches.Version

images/windows/scripts/tests/Tools.Tests.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,13 @@ Describe "Kotlin" {
213213
}
214214

215215
Describe "SQL OLEDB Driver" {
216-
It "SQL OLEDB Driver" {
216+
It "SQL OLEDB Driver 18" {
217217
"HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL" | Should -Exist
218218
}
219+
220+
It "SQL OLEDB Driver 19" {
221+
"HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL19" | Should -Exist
222+
}
219223
}
220224

221225
Describe "OpenSSL" {

0 commit comments

Comments
 (0)