From d4f73e72985dc2f36e4228358f4dc9b6114414ab Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 30 Dec 2017 01:40:42 -0800 Subject: Integrate namespace change in WixToolset.Data --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 1 - .../Bundles/AutomaticallySlipstreamPatchesCommand.cs | 1 - .../Bundles/CreateBootstrapperApplicationManifestCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs | 1 - .../Bundles/OrderPackagesAndRollbackBoundariesCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/PackageFacade.cs | 2 -- src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs | 1 - src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs | 1 - .../Bind/CreateDeltaPatchesCommand.cs | 1 - src/WixToolset.Core.WindowsInstaller/Decompiler.cs | 1 - src/WixToolset.Core/BinderFileManager.cs | 1 - src/WixToolset.Core/Localizer.cs | 4 ++-- 17 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index bc3ba8df..c1c12ac4 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -13,7 +13,6 @@ namespace WixToolset.Core.Burn using WixToolset.Core.Burn.Bundles; using WixToolset.Data; using WixToolset.Data.Bind; - using WixToolset.Data.Rows; using WixToolset.Extensibility; using WixToolset.Extensibility.Services; diff --git a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs index d06cf4a8..cf702b2e 100644 --- a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs @@ -7,7 +7,6 @@ namespace WixToolset.Core.Burn.Bundles using System.Diagnostics; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Rows; internal class AutomaticallySlipstreamPatchesCommand { diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs index b1f1f0cd..4fe8688c 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs @@ -10,7 +10,6 @@ namespace WixToolset.Core.Burn.Bundles using System.Text; using System.Xml; using WixToolset.Data; - using WixToolset.Data.Rows; internal class CreateBootstrapperApplicationManifestCommand { diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs index 788c7296..0ec8e46a 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs @@ -10,7 +10,6 @@ namespace WixToolset.Core.Burn.Bundles using System.Text; using System.Xml; using WixToolset.Data; - using WixToolset.Data.Rows; using WixToolset.Extensibility; internal class CreateBurnManifestCommand diff --git a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs index cbc4839a..c9dd2671 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs @@ -8,7 +8,6 @@ namespace WixToolset.Core.Burn.Bundles using System.IO; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Rows; /// /// Creates cabinet files. diff --git a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs index 056f6eb7..1ed37046 100644 --- a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs @@ -4,7 +4,6 @@ namespace WixToolset.Core.Burn.Bundles { using System.Collections.Generic; using WixToolset.Data; - using WixToolset.Data.Rows; internal class GetPackageFacadesCommand { diff --git a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs index 4266ca40..48923ba1 100644 --- a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs @@ -5,7 +5,6 @@ namespace WixToolset.Core.Burn.Bundles using System; using System.Collections.Generic; using WixToolset.Data; - using WixToolset.Data.Rows; internal class OrderPackagesAndRollbackBoundariesCommand { diff --git a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs index ff5c2e2e..c68a8311 100644 --- a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs +++ b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs @@ -2,8 +2,6 @@ namespace WixToolset.Core.Burn.Bundles { - using WixToolset.Data.Rows; - internal class PackageFacade { #if TODO diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs index 75bb5bb1..77102c0f 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs @@ -4,7 +4,6 @@ namespace WixToolset.Core.Burn.Bundles { using System; using WixToolset.Data; - using WixToolset.Data.Rows; /// /// Initializes package state from the Exe contents. diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs index 636cb1a0..39a71be7 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs @@ -10,7 +10,6 @@ namespace WixToolset.Core.Burn.Bundles using System.IO; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Rows; using WixToolset.Extensibility; using WixToolset.Core.Native; using Dtf = WixToolset.Dtf.WindowsInstaller; diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs index 37e08634..e0390360 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs @@ -10,7 +10,6 @@ namespace WixToolset.Core.Burn.Bundles using System.Text; using System.Xml; using WixToolset.Data; - using WixToolset.Data.Rows; using Dtf = WixToolset.Dtf.WindowsInstaller; /// diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs index 1380385d..ef720bc1 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs @@ -4,7 +4,6 @@ namespace WixToolset.Core.Burn.Bundles { using System; using WixToolset.Data; - using WixToolset.Data.Rows; /// /// Processes the Msu packages to add properties and payloads from the Msu packages. diff --git a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs index f22a8f2b..82682a47 100644 --- a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs @@ -9,7 +9,6 @@ namespace WixToolset.Core.Burn.Bundles using System.Runtime.InteropServices; using System.Text; using WixToolset.Data; - using WixToolset.Data.Rows; internal class VerifyPayloadsWithCatalogCommand { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs index 7c7b07cc..19f7b9e5 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs @@ -8,7 +8,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.IO; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Rows; using WixToolset.Data.Tuples; /// diff --git a/src/WixToolset.Core.WindowsInstaller/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompiler.cs index d353cc16..8136bf00 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompiler.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompiler.cs @@ -12,7 +12,6 @@ namespace WixToolset using System.Text; using System.Text.RegularExpressions; using WixToolset.Data; - using WixToolset.Data.Rows; using WixToolset.Extensibility; using WixToolset.Core.Native; using Wix = WixToolset.Data.Serialize; diff --git a/src/WixToolset.Core/BinderFileManager.cs b/src/WixToolset.Core/BinderFileManager.cs index 5e08bc40..dece3a20 100644 --- a/src/WixToolset.Core/BinderFileManager.cs +++ b/src/WixToolset.Core/BinderFileManager.cs @@ -9,7 +9,6 @@ namespace WixToolset using System.Linq; using System.Runtime.InteropServices; using WixToolset.Data; - using WixToolset.Data.Rows; using WixToolset.Extensibility; #if DEAD_CODE diff --git a/src/WixToolset.Core/Localizer.cs b/src/WixToolset.Core/Localizer.cs index d4f89e7a..2e7b19b6 100644 --- a/src/WixToolset.Core/Localizer.cs +++ b/src/WixToolset.Core/Localizer.cs @@ -5,9 +5,9 @@ namespace WixToolset.Core using System; using System.Collections.Generic; using System.Xml.Linq; - using WixToolset.Data; - using WixToolset.Data.Rows; using WixToolset.Core.Native; + using WixToolset.Data; + using WixToolset.Data.Bind; using WixToolset.Extensibility; using WixToolset.Extensibility.Services; -- cgit v1.2.3-55-g6feb