From d81fd785de11bd7863a0cec3ee56f55ac28e6923 Mon Sep 17 00:00:00 2001 From: Gary Hampson Date: Mon, 4 Mar 2024 19:13:26 -0500 Subject: [PATCH] Updates to remediate CVE-2024-0056 and CVE-2023-36414 --- build/build-core.ps1 | 10 +++++----- build/build-full.ps1 | 6 +++--- build/build-local.ps1 | 20 ++++++++++---------- project/dbatools/dbatools.csproj | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/build-core.ps1 b/build/build-core.ps1 index ae78da3..2b006d5 100644 --- a/build/build-core.ps1 +++ b/build/build-core.ps1 @@ -104,21 +104,21 @@ $parms = @{ } $parms.Name = "Microsoft.Data.SqlClient" -$parms.RequiredVersion = "5.1.1" +$parms.RequiredVersion = "5.1.4" $null = Install-Package @parms $parms.Name = "Microsoft.Data.SqlClient.SNI.runtime" -$parms.RequiredVersion = "5.1.0" +$parms.RequiredVersion = "5.2.0" $null = Install-Package @parms $parms.Name = "Microsoft.Identity.Client" $parms.RequiredVersion = "4.53.0" $null = Install-Package @parms -Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.1.1/runtimes/unix/lib/net6.0/Microsoft.Data.SqlClient.dll" -Destination lib -Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.1.1/runtimes/win/lib/net6.0/Microsoft.Data.SqlClient.dll" -Destination lib/win-sqlclient/ +Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.1.4/runtimes/unix/lib/net6.0/Microsoft.Data.SqlClient.dll" -Destination lib +Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.1.4/runtimes/win/lib/net6.0/Microsoft.Data.SqlClient.dll" -Destination lib/win-sqlclient/ Copy-Item "$tempdir/nuget/Microsoft.Identity.Client.4.53.0/lib/net6.0/Microsoft.Identity.Client.dll" -Destination lib/win-sqlclient/ #Maybe this will be a problem, i dont know -Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.SNI.runtime.5.1.0/runtimes/win-x64/native/Microsoft.Data.SqlClient.SNI.dll" -Destination lib/win-sqlclient/ +Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.SNI.runtime.5.2.0/runtimes/win-x64/native/Microsoft.Data.SqlClient.SNI.dll" -Destination lib/win-sqlclient/ Copy-Item ./temp/linux/* -Destination lib -Exclude (Get-ChildItem lib -Recurse) -Recurse -Include *.exe, *.config -Verbose diff --git a/build/build-full.ps1 b/build/build-full.ps1 index 1bd536f..389222b 100644 --- a/build/build-full.ps1 +++ b/build/build-full.ps1 @@ -79,11 +79,11 @@ $parms = @{ } $parms.Name = "Microsoft.Data.SqlClient" -$parms.RequiredVersion = "5.1.1" +$parms.RequiredVersion = "5.1.4" $null = Install-Package @parms $parms.Name = "Microsoft.Data.SqlClient.SNI.runtime" -$parms.RequiredVersion = "5.1.0" +$parms.RequiredVersion = "5.2.0" $null = Install-Package @parms $parms.Name = "Microsoft.Identity.Client" @@ -91,7 +91,7 @@ $parms.RequiredVersion = "4.53.0" $null = Install-Package @parms Copy-Item "$tempdir\nuget\Microsoft.Identity.Client.4.53.0\lib\net461\Microsoft.Identity.Client.dll" -Destination lib/ -Copy-Item "$tempdir\nuget\Microsoft.Data.SqlClient.SNI.runtime.5.1.0\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll" -Destination lib/ +Copy-Item "$tempdir\nuget\Microsoft.Data.SqlClient.SNI.runtime.5.2.0\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll" -Destination lib/ Copy-Item "./var/misc/core/*.dll" -Destination ./lib/ diff --git a/build/build-local.ps1 b/build/build-local.ps1 index 89ea38e..665319d 100644 --- a/build/build-local.ps1 +++ b/build/build-local.ps1 @@ -99,15 +99,15 @@ $parms.RequiredVersion = "170.7.0-preview" #Install-Package @parms $parms.Name = "Microsoft.Data.SqlClient" -$parms.RequiredVersion = "5.0.1" +$parms.RequiredVersion = "5.1.4" #Install-Package @parms $parms.Name = "Microsoft.Data.SqlClient.SNI.runtime" -$parms.RequiredVersion = "5.0.1" +$parms.RequiredVersion = "5.2.0" #Install-Package @parms $parms.Name = "Microsoft.Identity.Client" -$parms.RequiredVersion = "4.45.0" +$parms.RequiredVersion = "4.53.0" #Install-Package @parms $parms.Name = "Microsoft.SqlServer.Server" @@ -115,15 +115,15 @@ $parms.RequiredVersion = "1.0.0" #Install-Package @parms $parms.Name = "Azure.Identity" -$parms.RequiredVersion = "1.6.0" +$parms.RequiredVersion = "1.10.3" #Install-Package @parms -Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.5.0.1\runtimes\unix\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll" -Destination lib/net6.0/publish -Copy-Item "C:\temp\nuget\Microsoft.Identity.Client.4.45.0\lib\net461\Microsoft.Identity.Client.dll" -Destination lib/net462/publish/ -Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.5.0.1\runtimes\win\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll" -Destination lib/net6.0/publish/win-sqlclient -Copy-Item "C:\temp\nuget\Microsoft.Identity.Client.4.45.0\lib\netcoreapp2.1\Microsoft.Identity.Client.dll" -Destination lib/net6.0/publish/win-sqlclient -Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.SNI.runtime.5.0.1\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll" -Destination lib/net6.0/publish/win-sqlclient -Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.SNI.runtime.5.0.1\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll" -Destination lib/net462/publish/ +Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.5.1.4\runtimes\unix\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll" -Destination lib/net6.0/publish +Copy-Item "C:\temp\nuget\Microsoft.Identity.Client.4.53.0\lib\net461\Microsoft.Identity.Client.dll" -Destination lib/net462/publish/ +Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.5.1.4\runtimes\win\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll" -Destination lib/net6.0/publish/win-sqlclient +Copy-Item "C:\temp\nuget\Microsoft.Identity.Client.4.53.0\lib\netcoreapp2.1\Microsoft.Identity.Client.dll" -Destination lib/net6.0/publish/win-sqlclient +Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.SNI.runtime.5.2.0\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll" -Destination lib/net6.0/publish/win-sqlclient +Copy-Item "C:\temp\nuget\Microsoft.Data.SqlClient.SNI.runtime.5.2.0\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll" -Destination lib/net462/publish/ Copy-Item "replication/*.dll" -Destination lib/net462/publish/ Copy-Item "replication/*.dll" -Destination lib/net6.0/publish/ diff --git a/project/dbatools/dbatools.csproj b/project/dbatools/dbatools.csproj index e963c12..26fecbe 100644 --- a/project/dbatools/dbatools.csproj +++ b/project/dbatools/dbatools.csproj @@ -45,7 +45,7 @@ - +