Skip to content
Permalink
Browse files

Fix debug and Path is null issues (#5183)

* add debug by default and dbatools_enabledebug

* remove missing files

* discard leftovers

* put dac back
  • Loading branch information...
potatoqualitee committed Mar 11, 2019
1 parent 81a926f commit 992c798181d1699898c15b9d25436c99d8278404
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,3 +1,4 @@
cd C:\github\dbatools\bin\smo
$phase1 = @()
$leftover = @()
dir | %{
@@ -136,8 +136,8 @@ $script:multiFileImport = $false
if ($dbatools_multiFileImport) { $script:multiFileImport = $true }
if ($dbatoolsSystemSystemNode.MultiFileImport) { $script:multiFileImport = $true }
if ($dbatoolsSystemUserNode.MultiFileImport) { $script:multiFileImport = $true }
if (Test-Path -Path "$script:PSModuleRoot\.git") { $script:multiFileImport = $true }
if (Test-Path -Path "$script:PSModuleRoot/.git") { $script:multiFileImport = $true }
if ((Test-Path -Path "$script:PSModuleRoot\.git") -or $dbatools_enabledebug) { $script:multiFileImport = $true; $script:serialImport = $true }
if ((Test-Path -Path "$script:PSModuleRoot/.git") -or $dbatools_enabledebug) { $script:multiFileImport = $true; $script:serialImport = $true }
#endregion Multi File Import

Write-ImportTime -Text "Validated defines"
@@ -78,111 +78,56 @@ $scriptBlock = {
'Microsoft.SqlServer.Management.UtilityEnum',
'Microsoft.SqlServer.Management.HadrDMF',
'Microsoft.SqlServer.VulnerabilityAssessment.Model',

'Microsoft.SqlServer.BatchParser',
'Microsoft.SqlServer.BatchParserClient',
'Microsoft.SqlServer.BulkInsertTaskConnections',
'Microsoft.SqlServer.DTSRuntimeWrap',
'Microsoft.SqlServer.DtsServer.Interop',
'Microsoft.SqlServer.DTSUtilities',
'Microsoft.SqlServer.ForEachFileEnumeratorWrap',
'Microsoft.SqlServer.ManagedDTS',
'Microsoft.SqlServer.IntegrationServices.ODataConnectionManager',
'Microsoft.SqlServer.IntegrationServices.ODataSrc',
'Microsoft.SqlServer.PipelineHost',
'Microsoft.SqlServer.PackageFormatUpdate',
'Microsoft.SqlServer.Replication',
'Microsoft.SqlServer.SqlCEDest',
'Microsoft.SqlServer.SQLTask',
'Microsoft.SqlServer.TxScript',
'Microsoft.SqlServer.XE.Core',
'Microsoft.SqlServer.XEvent.Configuration',
'Microsoft.SqlServer.XEvent',
'Microsoft.SqlServer.XEvent.Linq',
'Microsoft.SqlServer.XmlSrc',
'Microsoft.SqlServer.Rmo',
'Microsoft.SqlServer.DTSPipelineWrap',
'Microsoft.SqlServer.ScriptTask',

'Accessibility',
'EnvDTE',
'Microsoft.AnalysisServices.AppLocal.Core',
'Microsoft.AnalysisServices.AppLocal',
'Microsoft.Azure.KeyVault.Core',
'Microsoft.Data.Edm',
'Microsoft.Data.OData',
'Microsoft.Practices.TransientFaultHandling.Core',
'Microsoft.DataTransfer.Common.Utils',
'Microsoft.SqlServer.ASTasks',
'Microsoft.SqlServer.ConnectionInfoExtended',
'Microsoft.SqlServer.DataProfiler',
'Microsoft.SqlServer.DataProfilingTask',
'Microsoft.SqlServer.Diagnostics.STrace',
'Microsoft.SqlServer.Dmf.Common',

'Microsoft.SqlServer.DMQueryTask',
'Microsoft.SqlServer.DTEnum',
'Microsoft.SqlServer.Dts.Design',
'Microsoft.SqlServer.Dts.DtsClient',
'Microsoft.SqlServer.DtsMsg',
'Microsoft.SqlServer.Edition',
'Microsoft.SqlServer.ExecProcTask',
'Microsoft.SqlServer.ExpressionTask',
'Microsoft.SqlServer.FileSystemTask',
'Microsoft.SqlServer.ForEachADOEnumerator',
'Microsoft.SqlServer.ForEachFromVarEnumerator',
'Microsoft.SqlServer.ForEachNodeListEnumerator',
'Microsoft.SqlServer.ForEachSMOEnumerator',
'Microsoft.SqlServer.FtpTask',
'Microsoft.SqlServer.GridControl',
'Microsoft.SqlServer.Instapi',
'Microsoft.Build.Utilities.Core',
'Microsoft.Build.Framework',
'System.Collections.Immutable',
'Microsoft.Data.Tools.Schema.Tasks.Sql',
'Microsoft.SqlServer.TransactSql',
'Microsoft.Data.Tools.Schema.Sql',
'Microsoft.SqlServer.IntegrationServices.ClusterManagement',
'Microsoft.SqlServer.IntegrationServices.Common.ObjectModel',
'Microsoft.SqlServer.IntegrationServices.ISServerDBUpgrade',
'Microsoft.SqlServer.IntegrationServices.Server.Common',
'Microsoft.SqlServer.IntegrationServices.Server',
'Microsoft.SqlServer.IntegrationServices.Server.IPC',
'Microsoft.SqlServer.IntegrationServices.server.shared',
'Microsoft.SqlServer.IntegrationServices.TaskScheduler',
'Microsoft.SqlServer.ManagedConnections',
'Microsoft.SqlServer.Management.CollectorTasks',
'Microsoft.SqlServer.Management.HelpViewer',
'Microsoft.SqlServer.Management.IntegrationServices',
'Microsoft.SqlServer.Management.IntegrationServicesEnum',
'Microsoft.SqlServer.Management.Sdk.Scripting',
'Microsoft.SqlServer.Management.Sdk.SqlStudio',
'Microsoft.SqlServer.Management.SmartAdminPolicies',
'Microsoft.SqlServer.Management.SqlParser',
'Microsoft.SqlServer.Management.SystemMetadataProvider',
'Microsoft.SqlServer.Management.XEvent',
'Microsoft.SqlServer.Management.XEventDbScoped',
'Microsoft.SqlServer.Management.XEventDbScopedEnum',
'Microsoft.SqlServer.Management.XEventEnum',
'Microsoft.SqlServer.MSMQTask',
'Microsoft.SqlServer.PipelineXML',
'Microsoft.SqlServer.PolicyEnum',
'Microsoft.SqlServer.Replication.BusinessLogicSupport',
'Microsoft.SqlServer.SendMailTask',
'Microsoft.SqlServer.SqlClrProvider',
'Microsoft.SqlServer.SQLTaskConnectionsWrap',
'Microsoft.SqlServer.SqlTDiagm',
'Microsoft.SqlServer.SString',
'Microsoft.SqlServer.TransferDatabasesTask',
'Microsoft.SqlServer.TransferErrorMessagesTask',
'Microsoft.SqlServer.TransferJobsTask',
'Microsoft.SqlServer.TransferLoginsTask',
'Microsoft.SqlServer.TransferObjectsTask',
'Microsoft.SqlServer.TransferSqlServerObjectsTask',
'Microsoft.SqlServer.TransferStoredProceduresTask',
'Microsoft.SqlServer.Types',
'Microsoft.SqlServer.Types.resources',
'Microsoft.SqlServer.VSTAScriptingLib',
'Microsoft.SqlServer.WebServiceTask',
'Microsoft.SqlServer.WMIDRTask',
'Microsoft.SqlServer.WMIEWTask',
'Microsoft.SqlServer.XMLTask',
'Microsoft.SqlServer.Dmf.Adapters',
'Microsoft.SqlServer.DmfSqlClrWrapper'
'Microsoft.SqlServer.DmfSqlClrWrapper',
'Microsoft.SqlServer.Dac',
'Microsoft.SqlServer.Dac.Extensions'
)
}
#endregion Names
@@ -204,7 +149,7 @@ $scriptBlock = {
$smo = (Resolve-Path -Path "$script:DllRoot\smo")

if ($script:serialImport) {
$scriptBlock.Invoke($script:PSModuleRoot, "$script:DllRoot\smo", (-not $script:strictSecurityMode))
$scriptBlock.Invoke($script:PSModuleRoot, "$script:DllRoot\smo", $script:copyDllMode)
} else {
$script:smoRunspace = [System.Management.Automation.PowerShell]::Create()
if ($script:smoRunspace.Runspace.Name) {

0 comments on commit 992c798

Please sign in to comment.
You can’t perform that action at this time.