diff --git a/Packages.props b/Packages.props index 08e832bf..eff449c4 100644 --- a/Packages.props +++ b/Packages.props @@ -28,7 +28,7 @@ - + diff --git a/bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230302.47.nupkg b/bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230302.47.nupkg deleted file mode 100644 index 48ef5992..00000000 Binary files a/bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230302.47.nupkg and /dev/null differ diff --git a/bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230321.50.nupkg b/bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230321.50.nupkg new file mode 100644 index 00000000..f75b1596 Binary files /dev/null and b/bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230321.50.nupkg differ diff --git a/src/Microsoft.SqlTools.Migration/Contracts/StartLoginMigration.cs b/src/Microsoft.SqlTools.Migration/Contracts/StartLoginMigration.cs index cd0ba8b2..d5ad9ad5 100644 --- a/src/Microsoft.SqlTools.Migration/Contracts/StartLoginMigration.cs +++ b/src/Microsoft.SqlTools.Migration/Contracts/StartLoginMigration.cs @@ -5,7 +5,7 @@ #nullable disable -using Microsoft.SqlServer.DataCollection.Common.Contracts.OperationsInfrastructure; +using Microsoft.SqlServer.Migration.Logins.Contracts.Exceptions; using Microsoft.SqlTools.Hosting.Protocol.Contracts; using System.Collections.Generic; @@ -81,7 +81,7 @@ namespace Microsoft.SqlTools.Migration.Contracts /// /// Start time of the assessment /// - public IDictionary> ExceptionMap { get; set; } + public IDictionary> ExceptionMap { get; set; } /// /// The login migration step that just completed diff --git a/src/Microsoft.SqlTools.Migration/MigrationService.cs b/src/Microsoft.SqlTools.Migration/MigrationService.cs index 809aae30..f2f8e75e 100644 --- a/src/Microsoft.SqlTools.Migration/MigrationService.cs +++ b/src/Microsoft.SqlTools.Migration/MigrationService.cs @@ -27,6 +27,7 @@ using Microsoft.SqlServer.Migration.Assessment.Common.Utils; using Microsoft.SqlServer.Migration.Logins; using Microsoft.SqlServer.Migration.Logins.Contracts; using Microsoft.SqlServer.Migration.Logins.Contracts.ErrorHandling; +using Microsoft.SqlServer.Migration.Logins.Contracts.Exceptions; using Microsoft.SqlServer.Migration.Logins.ErrorHandling; using Microsoft.SqlServer.Migration.Logins.Helpers; using Microsoft.SqlServer.Migration.SkuRecommendation; @@ -294,7 +295,7 @@ namespace Microsoft.SqlTools.Migration ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, null, parameters.LoginList, parameters.AADDomainName, logger); - IDictionary> exceptionMap = new Dictionary>(); + IDictionary> exceptionMap = new Dictionary>(); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); exceptionMap.AddExceptions(await loginMigration.MigrateLogins(CancellationToken.None)); @@ -327,7 +328,7 @@ namespace Microsoft.SqlTools.Migration ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, null, parameters.LoginList, parameters.AADDomainName, logger); - IDictionary> exceptionMap = new Dictionary>(); + IDictionary> exceptionMap = new Dictionary>(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); @@ -360,7 +361,7 @@ namespace Microsoft.SqlTools.Migration ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, null, parameters.LoginList, parameters.AADDomainName, logger); - IDictionary> exceptionMap = new Dictionary>(); + IDictionary> exceptionMap = new Dictionary>(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); @@ -393,7 +394,7 @@ namespace Microsoft.SqlTools.Migration ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, null, parameters.LoginList, parameters.AADDomainName, logger); - IDictionary> exceptionMap = new Dictionary>(); + IDictionary> exceptionMap = new Dictionary>(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); @@ -427,7 +428,7 @@ namespace Microsoft.SqlTools.Migration ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, null, parameters.LoginList, parameters.AADDomainName, logger); - IDictionary> exceptionMap = new Dictionary>(); + IDictionary> exceptionMap = new Dictionary>(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); diff --git a/src/Microsoft.SqlTools.Migration/Utils/ExtensionMethods.cs b/src/Microsoft.SqlTools.Migration/Utils/ExtensionMethods.cs index c24e46d4..22f58af8 100644 --- a/src/Microsoft.SqlTools.Migration/Utils/ExtensionMethods.cs +++ b/src/Microsoft.SqlTools.Migration/Utils/ExtensionMethods.cs @@ -7,13 +7,13 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.SqlServer.DataCollection.Common.Contracts.OperationsInfrastructure; +using Microsoft.SqlServer.Migration.Logins.Contracts.Exceptions; namespace Microsoft.SqlTools.Migration.Utils { internal static class ExtensionMethods { - public static void AddExceptions(this IDictionary> exceptionMap1, IDictionary> exceptionMap2) + public static void AddExceptions(this IDictionary> exceptionMap1, IDictionary> exceptionMap2) { if (exceptionMap1 is null || exceptionMap2 is null) {