Skip to content

Commit

Permalink
Major change: Update SMO, update dbatools library, and switch System.…
Browse files Browse the repository at this point in the history
…Data to Microsoft.Data (#7540)
  • Loading branch information
potatoqualitee committed Jul 13, 2021
1 parent 1af3b16 commit 588e3cb
Show file tree
Hide file tree
Showing 145 changed files with 402 additions and 1,465 deletions.
12 changes: 5 additions & 7 deletions appveyor.yml
Expand Up @@ -3,12 +3,10 @@ image: Previous Visual Studio 2015
configuration: "Debug"

build_script:
- ps: Push-Location bin\projects\dbatools; dotnet build; Pop-Location

after_build:
# Removed to prevent credential exposure
# - ps: Push-AppveyorArtifact msbuild.binlog
# - ps: Push-AppveyorArtifact msbuild.log
- ps: Set-Service wuauserv -StartupType Manual #otherwise, choco command exits with code 1058
- ps: choco install dotnet-5.0-sdk | Out-String | Out-Null
- ps: choco install dotnetcore-sdk | Out-String | Out-Null
- ps: Push-Location bin\projects\dbatools; dotnet build ;Pop-Location

version: 0.9.{build}

Expand Down Expand Up @@ -98,5 +96,5 @@ test_script:
after_test:
- ps: .\Tests\appveyor.post.ps1

# on_finish:
#on_finish:
#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
4 changes: 2 additions & 2 deletions bin/build-project.ps1
Expand Up @@ -55,9 +55,9 @@ Write-Verbose -Message "Building the library with command $dotnet build $Project

if ($MsbuildTarget -eq 'Build') {
if ($PSVersionTable.PSVersion.Major -ge 6) {
$dll = (Resolve-Path -Path "$libraryBase\netcoreapp2.1\dbatools.dll" -ErrorAction Ignore)
$dll = (Resolve-Path -Path "$libraryBase\netcoreapp3.1\dbatools.dll" -ErrorAction Ignore)
} else {
$dll = (Resolve-Path -Path "$libraryBase\net452\dbatools.dll" -ErrorAction Ignore)
$dll = (Resolve-Path -Path "$libraryBase\net462\dbatools.dll" -ErrorAction Ignore)
}
try {
Write-Verbose -Message "Found library, trying to copy & import"
Expand Down
4 changes: 2 additions & 2 deletions bin/dbatools.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bin/library.ps1
@@ -1,5 +1,5 @@
# Current library Version the module expects
$currentLibraryVersion = New-Object System.Version(0, 10, 0, 71)
$currentLibraryVersion = New-Object System.Version(0, 10, 0, 72)

<#
Library Versioning 101:
Expand All @@ -13,7 +13,7 @@ Revision: Tracks all changes. Every single update to the library - bugfix, featu
Updating the library version number:
When changing the library version number, it is necessary to do so in TWO places:
- At the top of this very library.ps1
- Within AssemblyInfo.cs
- Within dbatools.csproj
These two locations MUST have matching version numbers, otherwise it will keep building the library and complaining about version mismatch!
#>

Expand All @@ -36,9 +36,9 @@ Mostly for developers working on the library.

$dll =
if ($PSVersionTable.PSVersion.Major -ge 6) {
Join-Path $psModuleRoot "bin\netcoreapp2.1\dbatools.dll"
Join-Path $psModuleRoot "bin\netcoreapp3.1\dbatools.dll"
} else {
Join-Path $psModuleRoot "bin\net452\dbatools.dll"
Join-Path $psModuleRoot "bin\net462\dbatools.dll"
}

$ImportLibrary = $true # Always import the library, because it contains some internal cmdlets.
Expand Down
Binary file removed bin/net452/dbatools.dll
Binary file not shown.
Binary file removed bin/net452/dbatools.pdb
Binary file not shown.
Binary file added bin/net462/dbatools.dll
Binary file not shown.
Binary file added bin/net462/dbatools.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions bin/net452/dbatools.xml → bin/net462/dbatools.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 588e3cb

Please sign in to comment.