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