From c7e9fccd1b51e5518ca6ae3c1336bf31f8beb102 Mon Sep 17 00:00:00 2001 From: Simone Bizzotto Date: Mon, 20 Jan 2025 22:52:56 +0100 Subject: [PATCH 1/5] update library --- build/build-core.ps1 | 22 +++++++++---------- build/build-full.ps1 | 8 +++---- project/dbatools.Tests/dbatools.Tests.csproj | 2 +- project/dbatools/dbatools.csproj | 23 ++++++++++++-------- project/global.json | 2 +- 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/build/build-core.ps1 b/build/build-core.ps1 index 7f080b2..43f6b5b 100644 --- a/build/build-core.ps1 +++ b/build/build-core.ps1 @@ -19,14 +19,14 @@ $root = Split-Path -Path $scriptroot Push-Location "$root/project" -dotnet publish --configuration release --framework net6.0 | Out-String -OutVariable build -dotnet test --framework net6.0 --verbosity normal | Out-String -OutVariable test +dotnet publish --configuration release --framework net8.0 | Out-String -OutVariable build +dotnet test --framework net8.0 --verbosity normal | Out-String -OutVariable test Pop-Location Remove-Item -Path lib/dbatools.xml -Get-ChildItem -Path lib/net6.0 -File | Remove-Item -Move-Item -Path lib/net6.0/publish/* -Destination lib/ #-ErrorAction Ignore -Remove-Item -Path lib/net6.0 -Recurse -ErrorAction Ignore +Get-ChildItem -Path lib/net8.0 -File | Remove-Item +Move-Item -Path lib/net8.0/publish/* -Destination lib/ #-ErrorAction Ignore +Remove-Item -Path lib/net8.0 -Recurse -ErrorAction Ignore Get-ChildItem ./lib -Recurse -Include *.pdb | Remove-Item Get-ChildItem ./lib -Recurse -Include *.xml | Remove-Item @@ -72,7 +72,7 @@ Invoke-WebRequest -Uri https://aka.ms/sqlpackage-macos -OutFile ./temp/sqlpackag Invoke-WebRequest -Uri https://aka.ms/dacfx-msi -OutFile .\temp\DacFramework.msi Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Bogus -OutFile ./temp/bogus.zip Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/LumenWorksCsvReader -OutFile ./temp/LumenWorksCsvReader.zip -Invoke-WebRequest -Uri https://github.com/spaghettidba/XESmartTarget/releases/download/v1.4.9/XESmartTarget_x64.msi -OutFile ./temp/XESmartTarget_x64.msi +Invoke-WebRequest -Uri https://github.com/spaghettidba/XESmartTarget/releases/download/v1.5.7/XESmartTarget_x64.msi -OutFile ./temp/XESmartTarget_x64.msi $ProgressPreference = "Continue" @@ -104,7 +104,7 @@ $parms = @{ } $parms.Name = "Microsoft.Data.SqlClient" -$parms.RequiredVersion = "5.1.4" +$parms.RequiredVersion = "5.2.2" $null = Install-Package @parms $parms.Name = "Microsoft.Data.SqlClient.SNI.runtime" @@ -112,12 +112,12 @@ $parms.RequiredVersion = "5.2.0" $null = Install-Package @parms $parms.Name = "Microsoft.Identity.Client" -$parms.RequiredVersion = "4.53.0" +$parms.RequiredVersion = "4.67.1" $null = Install-Package @parms -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.5.2.2/runtimes/unix/lib/net8.0/Microsoft.Data.SqlClient.dll" -Destination lib +Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.2.2/runtimes/win/lib/net8.0/Microsoft.Data.SqlClient.dll" -Destination lib/win-sqlclient/ +Copy-Item "$tempdir/nuget/Microsoft.Identity.Client.4.67.1/lib/net8.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.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 8053967..6d426a5 100644 --- a/build/build-full.ps1 +++ b/build/build-full.ps1 @@ -49,7 +49,7 @@ $ProgressPreference = "SilentlyContinue" Invoke-WebRequest -Uri https://aka.ms/dacfx-msi -OutFile .\temp\DacFramework.msi Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Bogus -OutFile .\temp\bogus.zip Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/LumenWorksCsvReader -OutFile .\temp\LumenWorksCsvReader.zip -Invoke-WebRequest -Uri https://github.com/spaghettidba/XESmartTarget/releases/download/v1.4.9/XESmartTarget_x64.msi -OutFile .\temp\XESmartTarget_x64.msi +Invoke-WebRequest -Uri https://github.com/spaghettidba/XESmartTarget/releases/download/v1.5.7/XESmartTarget_x64.msi -OutFile .\temp\XESmartTarget_x64.msi $ProgressPreference = "Continue" 7z x .\temp\LumenWorksCsvReader.zip "-o.\temp\LumenWorksCsvReader" @@ -79,7 +79,7 @@ $parms = @{ } $parms.Name = "Microsoft.Data.SqlClient" -$parms.RequiredVersion = "5.1.4" +$parms.RequiredVersion = "5.2.2" $null = Install-Package @parms $parms.Name = "Microsoft.Data.SqlClient.SNI.runtime" @@ -87,10 +87,10 @@ $parms.RequiredVersion = "5.2.0" $null = Install-Package @parms $parms.Name = "Microsoft.Identity.Client" -$parms.RequiredVersion = "4.53.0" +$parms.RequiredVersion = "4.67.1" $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.Identity.Client.4.67.1\lib\net461\Microsoft.Identity.Client.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/ diff --git a/project/dbatools.Tests/dbatools.Tests.csproj b/project/dbatools.Tests/dbatools.Tests.csproj index 32e7229..51e2969 100644 --- a/project/dbatools.Tests/dbatools.Tests.csproj +++ b/project/dbatools.Tests/dbatools.Tests.csproj @@ -1,7 +1,7 @@  Dataplat.Dbatools - net462;net6.0 + net462;net8.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/project/dbatools/dbatools.csproj b/project/dbatools/dbatools.csproj index d0a574a..a8e8cac 100644 --- a/project/dbatools/dbatools.csproj +++ b/project/dbatools/dbatools.csproj @@ -1,7 +1,7 @@  Dataplat.Dbatools - net462;net6.0 + net462;net8.0 dbatools Dataplat dbatools @@ -42,23 +42,28 @@ MinimumRecommendedRules.ruleset - - - - - - - + + + + + + + - + C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll False False + + + 7.4.6 + + \ No newline at end of file diff --git a/project/global.json b/project/global.json index 1dfc2d4..70b6e82 100644 --- a/project/global.json +++ b/project/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.419" + "version": "8.0.*" } } \ No newline at end of file From 7cce14e7ac1964781d6278995dc017c85361d41d Mon Sep 17 00:00:00 2001 From: Chrissy LeMaire Date: Thu, 30 Jan 2025 16:21:20 +0100 Subject: [PATCH 2/5] update libs --- build/build-full.ps1 | 33 +++++++++++++++++++++++++++++---- dbatools.library.psm1 | 4 ---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/build/build-full.ps1 b/build/build-full.ps1 index 6d426a5..3be1e95 100644 --- a/build/build-full.ps1 +++ b/build/build-full.ps1 @@ -90,10 +90,20 @@ $parms.Name = "Microsoft.Identity.Client" $parms.RequiredVersion = "4.67.1" $null = Install-Package @parms -Copy-Item "$tempdir\nuget\Microsoft.Identity.Client.4.67.1\lib\net461\Microsoft.Identity.Client.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/ +$parms.Name = "Microsoft.IdentityModel.Abstractions" +$parms.RequiredVersion = "8.3.1" +$null = Install-Package @parms + +$parms.Name = "Azure.Core" +$parms.RequiredVersion = "1.38.0" +$null = Install-Package @parms + +Copy-Item "$tempdir\nuget\Microsoft.Identity.Client.4.67.1\lib\net462\Microsoft.Identity.Client.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 "$tempdir\nuget\Azure.Core.1.38.0\lib\net461\Azure.Core.dll" -Destination lib/ + Copy-Item "./var/misc/core/*.dll" -Destination ./lib/ Copy-Item "./var/misc/both/*.dll" -Destination ./lib/ Copy-Item "./var/third-party-licenses" -Destination ./ -Recurse @@ -111,7 +121,7 @@ if ((Get-ChildItem -Path C:\gallery\dbatools.library -ErrorAction Ignore)) { #$null = mkdir C:\gallery\dbatools.library\desktop\x86 #$null = mkdir C:\gallery\dbatools.library\desktop\x64 $null = robocopy c:\github\dbatools.library C:\gallery\dbatools.library /S /XF actions-build.ps1 .markdownlint.json *.psproj* *.git* *.yml *.md dac.ps1 build*.ps1 dbatools-core*.* /XD .git .github Tests .vscode project temp runtime runtimes replication var opt | Out-String | Out-Null - + Remove-Item c:\gallery\dbatools.library\dac.ps1 -ErrorAction Ignore Remove-Item c:\gallery\dbatools.library\dbatools.core.library.psd1 -ErrorAction Ignore Copy-Item C:\github\dbatools.library\dbatools.library.psd1 C:\gallery\dbatools.library @@ -134,4 +144,19 @@ already there #> #(Get-Item C:\github\dbatools.library\lib\Microsoft.Data.Tools.Schema.Sql.dll).VersionInfo.FileVersion -#(Get-Item C:\github\dbatools.library\lib\Microsoft.Data.Tools.Utilities.dll).VersionInfo.FileVersion \ No newline at end of file +#(Get-Item C:\github\dbatools.library\lib\Microsoft.Data.Tools.Utilities.dll).VersionInfo.FileVersion + +<# + +$script:instance1 = $script:instance2 = "localhost" +Set-DbatoolsConfig -FullName sql.connection.trustcert -Value $true +$db = Get-DbaDatabase -SqlInstance $script:instance1 -Database dbatoolsci_publishdacpac +$publishprofile = New-DbaDacProfile -SqlInstance $script:instance1 -Database dbatoolsci_publishdacpac -Path C:\temp +$extractOptions = New-DbaDacOption -Action Export +$extractOptions.ExtractAllTableData = $true +$dacpac = Export-DbaDacPackage -SqlInstance $script:instance1 -Database dbatoolsci_publishdacpac -DacOption $extractOptions +$dacpac +$dacpac | Publish-DbaDacPackage -PublishXml $publishprofile.FileName -Database butt -SqlInstance $script:instance2 -Confirm:$false -Verbose +$Error | Select-Object * + +#> \ No newline at end of file diff --git a/dbatools.library.psm1 b/dbatools.library.psm1 index 9b7e7bc..dbb1f77 100644 --- a/dbatools.library.psm1 +++ b/dbatools.library.psm1 @@ -109,8 +109,6 @@ if ($PSVersionTable.PSEdition -eq "Core") { 'Microsoft.SqlServer.Dac', 'Microsoft.SqlServer.Smo', 'Microsoft.SqlServer.SmoExtended', - 'Microsoft.SqlServer.SqlWmiManagement', - 'Microsoft.SqlServer.WmiEnum', 'Microsoft.SqlServer.Management.RegisteredServers', 'Microsoft.SqlServer.Management.Collector', 'Microsoft.SqlServer.Management.XEvent', @@ -126,8 +124,6 @@ if ($PSVersionTable.PSEdition -eq "Core") { 'Microsoft.SqlServer.Dac', 'Microsoft.SqlServer.Smo', 'Microsoft.SqlServer.SmoExtended', - 'Microsoft.SqlServer.SqlWmiManagement', - 'Microsoft.SqlServer.WmiEnum', 'Microsoft.SqlServer.Management.RegisteredServers', 'Microsoft.SqlServer.Management.IntegrationServices', 'Microsoft.SqlServer.Management.Collector', From 5d3f53250089538b93de72de9c6f6f2b77fcc01c Mon Sep 17 00:00:00 2001 From: Chrissy LeMaire Date: Thu, 30 Jan 2025 18:04:35 +0100 Subject: [PATCH 3/5] add x86 support from PR #11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit thank you @ashdar 🙏 Sorry it took so long! now there'd be a conflict so i added it myself --- build/build-core.ps1 | 29 +++++++++++++++++++++++++++-- build/build-full.ps1 | 3 +++ dbatools.library.psm1 | 6 +++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/build/build-core.ps1 b/build/build-core.ps1 index 43f6b5b..473a3a3 100644 --- a/build/build-core.ps1 +++ b/build/build-core.ps1 @@ -47,6 +47,7 @@ if ($IsLinux -or $IsMacOs) { $null = mkdir ./lib/win $null = mkdir ./lib/mac $null = mkdir ./lib/win-sqlclient + $null = mkdir ./lib/win-sqlclient-x86 } else { $tempdir = "C:/temp" $null = New-Item -ItemType Directory $tempdir -ErrorAction Ignore @@ -60,6 +61,7 @@ if ($IsLinux -or $IsMacOs) { $null = New-Item -ItemType Directory ./lib/win $null = New-Item -ItemType Directory ./lib/mac $null = New-Item -ItemType Directory ./lib/win-sqlclient + $null = New-Item -ItemType Directory ./lib/win-sqlclient-x86 } @@ -115,13 +117,36 @@ $parms.Name = "Microsoft.Identity.Client" $parms.RequiredVersion = "4.67.1" $null = Install-Package @parms +$parms.Name = "Microsoft.IdentityModel.Abstractions" +$parms.RequiredVersion = "8.3.1" +$null = Install-Package @parms + +$parms.Name = "Azure.Core" +$parms.RequiredVersion = "1.38.0" +$null = Install-Package @parms + + + Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.2.2/runtimes/unix/lib/net8.0/Microsoft.Data.SqlClient.dll" -Destination lib +# Copy to the 'x64' directory Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.2.2/runtimes/win/lib/net8.0/Microsoft.Data.SqlClient.dll" -Destination lib/win-sqlclient/ -Copy-Item "$tempdir/nuget/Microsoft.Identity.Client.4.67.1/lib/net8.0/Microsoft.Identity.Client.dll" -Destination lib/win-sqlclient/ #Maybe this will be a problem, i dont know +Copy-Item "$tempdir/nuget/Microsoft.Identity.Client.4.67.1/lib/net8.0/Microsoft.Identity.Client.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 to the 'x86' directory, but with a different SNI DLL file. Remember,the SNI file is not managed code, it's _native_. +Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.2.2/runtimes/win/lib/net8.0/Microsoft.Data.SqlClient.dll" -Destination lib/win-sqlclient-x86/ +Copy-Item "$tempdir/nuget/Microsoft.Identity.Client.4.67.1/lib/net8.0/Microsoft.Identity.Client.dll" -Destination lib/win-sqlclient-x86/ +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-x86/ + + + +Copy-Item "$tempdir/nuget/Azure.Core.1.38.0/lib/net6.0/Azure.Core.dll" -Destination lib/ +Copy-Item "$tempdir/nuget/Microsoft.IdentityModel.Abstractions.8.3.1/lib/net8.0/Microsoft.IdentityModel.Abstractions.dll" -Destination lib/ + Copy-Item ./temp/linux/* -Destination lib -Exclude (Get-ChildItem lib -Recurse) -Recurse -Include *.exe, *.config -Verbose + Copy-Item "./var/misc/core/*.dll" -Destination ./lib/ Copy-Item "./var/misc/both/*.dll" -Destination ./lib/ Copy-Item "./var/third-party-licenses" -Destination ./ -Recurse @@ -131,7 +156,7 @@ $linux = 'libclrjit.so', 'libcoreclr.so', 'libhostfxr.so', 'libhostpolicy.so', ' $sqlp = Get-ChildItem ./temp/linux/* -Exclude (Get-ChildItem lib -Recurse) | Where-Object Name -in $linux Copy-Item -Path $sqlp.FullName -Destination ./lib/ -Get-ChildItem -Directory -Path ./lib | Where-Object Name -notin 'win-sqlclient', 'x64', 'x86', 'win', 'mac', 'macos' | Remove-Item -Recurse +Get-ChildItem -Directory -Path ./lib | Where-Object Name -notin 'win-sqlclient', 'win-sqlclient-x86', 'x64', 'x86', 'win', 'mac', 'macos' | Remove-Item -Recurse Get-ChildItem ./lib, ./lib/win, ./lib/mac | Where-Object BaseName -in (Get-ChildItem /opt/microsoft/powershell/7).BaseName -OutVariable files diff --git a/build/build-full.ps1 b/build/build-full.ps1 index 3be1e95..b713f81 100644 --- a/build/build-full.ps1 +++ b/build/build-full.ps1 @@ -103,6 +103,9 @@ $null = Install-Package @parms Copy-Item "$tempdir\nuget\Microsoft.Identity.Client.4.67.1\lib\net462\Microsoft.Identity.Client.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 "$tempdir\nuget\Azure.Core.1.38.0\lib\net461\Azure.Core.dll" -Destination lib/ +Copy-Item "$tempdir\nuget\Microsoft.IdentityModel.Abstractions.8.3.1\lib\net462\Microsoft.IdentityModel.Abstractions.dll" -Destination lib/ + + Copy-Item "./var/misc/core/*.dll" -Destination ./lib/ Copy-Item "./var/misc/both/*.dll" -Destination ./lib/ diff --git a/dbatools.library.psm1 b/dbatools.library.psm1 index dbb1f77..fcd915d 100644 --- a/dbatools.library.psm1 +++ b/dbatools.library.psm1 @@ -88,7 +88,11 @@ if ($PSVersionTable.PSEdition -ne "Core") { } if ($IsWindows -and $PSVersionTable.PSEdition -eq "Core") { - $sqlclient = [System.IO.Path]::Combine($script:libraryroot, "lib", "win-sqlclient", "Microsoft.Data.SqlClient.dll") + if ($env:PROCESSOR_ARCHITECTURE -eq "x86") { + $sqlclient = [System.IO.Path]::Combine($script:libraryroot, "lib", "win-sqlclient-x86", "Microsoft.Data.SqlClient.dll") + } else { + $sqlclient = [System.IO.Path]::Combine($script:libraryroot, "lib", "win-sqlclient", "Microsoft.Data.SqlClient.dll") + } } else { $sqlclient = [System.IO.Path]::Combine($script:libraryroot, "lib", "Microsoft.Data.SqlClient.dll") } From c8c075afdffc345333618c504808366e9f35950b Mon Sep 17 00:00:00 2001 From: Chrissy LeMaire Date: Thu, 30 Jan 2025 18:16:02 +0100 Subject: [PATCH 4/5] update module version for library --- dbatools.library.psd1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbatools.library.psd1 b/dbatools.library.psd1 index c7d3c27..d7b34a3 100644 --- a/dbatools.library.psd1 +++ b/dbatools.library.psd1 @@ -7,7 +7,7 @@ # @{ # Version number of this module. - ModuleVersion = '2024.3.9' + ModuleVersion = '2025.1.30' # ID used to uniquely identify this module GUID = '00b61a37-6c36-40d8-8865-ac0180288c84' From b659b0d28930f47cf4a2a72d4d49e006cec54c74 Mon Sep 17 00:00:00 2001 From: Simone Bizzotto Date: Tue, 11 Feb 2025 23:33:52 +0100 Subject: [PATCH 5/5] one more step --- build/build-core.ps1 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/build/build-core.ps1 b/build/build-core.ps1 index 473a3a3..130514a 100644 --- a/build/build-core.ps1 +++ b/build/build-core.ps1 @@ -18,15 +18,19 @@ if (-not $scriptroot) { $root = Split-Path -Path $scriptroot Push-Location "$root/project" +dotnet clean +dotnet publish --configuration release --verbosity diag --framework net8.0 | Out-String -OutVariable build +dotnet test --configuration release --verbosity diag --framework net8.0 | Out-String -OutVariable test -dotnet publish --configuration release --framework net8.0 | Out-String -OutVariable build -dotnet test --framework net8.0 --verbosity normal | Out-String -OutVariable test +## the build is now in dbatools.library/lib Pop-Location Remove-Item -Path lib/dbatools.xml Get-ChildItem -Path lib/net8.0 -File | Remove-Item Move-Item -Path lib/net8.0/publish/* -Destination lib/ #-ErrorAction Ignore Remove-Item -Path lib/net8.0 -Recurse -ErrorAction Ignore +#publish got moved to lib + Get-ChildItem ./lib -Recurse -Include *.pdb | Remove-Item Get-ChildItem ./lib -Recurse -Include *.xml | Remove-Item @@ -38,12 +42,14 @@ if ($IsLinux -or $IsMacOs) { $null = mkdir ./temp $null = mkdir ./temp/dacfull $null = mkdir ./temp/xe + $null = mkdir ./temp/bogus + $null = mkdir ./temp/linux + $null = mkdir ./third-party $null = mkdir ./third-party/XESmartTarget $null = mkdir ./third-party/bogus $null = mkdir ./third-party/LumenWorks - $null = mkdir ./temp/bogus - $null = mkdir ./temp/linux + $null = mkdir ./lib/win $null = mkdir ./lib/mac $null = mkdir ./lib/win-sqlclient @@ -71,7 +77,7 @@ $ProgressPreference = "SilentlyContinue" Invoke-WebRequest -Uri https://aka.ms/sqlpackage-linux -OutFile ./temp/sqlpackage-linux.zip Invoke-WebRequest -Uri https://aka.ms/sqlpackage-macos -OutFile ./temp/sqlpackage-macos.zip -Invoke-WebRequest -Uri https://aka.ms/dacfx-msi -OutFile .\temp\DacFramework.msi +Invoke-WebRequest -Uri https://aka.ms/dacfx-msi -OutFile ./temp/DacFramework.msi Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Bogus -OutFile ./temp/bogus.zip Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/LumenWorksCsvReader -OutFile ./temp/LumenWorksCsvReader.zip Invoke-WebRequest -Uri https://github.com/spaghettidba/XESmartTarget/releases/download/v1.5.7/XESmartTarget_x64.msi -OutFile ./temp/XESmartTarget_x64.msi @@ -126,7 +132,7 @@ $parms.RequiredVersion = "1.38.0" $null = Install-Package @parms - +# README cl: this dll is already there, as we're building dbatools csproj whose dependencies are already included !? Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.2.2/runtimes/unix/lib/net8.0/Microsoft.Data.SqlClient.dll" -Destination lib # Copy to the 'x64' directory Copy-Item "$tempdir/nuget/Microsoft.Data.SqlClient.5.2.2/runtimes/win/lib/net8.0/Microsoft.Data.SqlClient.dll" -Destination lib/win-sqlclient/ @@ -175,7 +181,7 @@ if ($xmlpdb) { Remove-Item -Path $xmlpdb -Recurse -ErrorAction Ignore } -#Import-Module ./dbatools.core.library.psd1 +#Import-Module ./dbatools.library.psd1 <# if ((Get-ChildItem -Path C:\gallery\dbatools.library\core -ErrorAction Ignore)) {