diff --git a/sqltoolsservice.sln b/sqltoolsservice.sln index 9bf2c8dc..d26ead16 100644 --- a/sqltoolsservice.sln +++ b/sqltoolsservice.sln @@ -61,6 +61,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlTools.Hosting.Contracts", "src\Microsoft.SqlTools.Hosting.Contracts\Microsoft.SqlTools.Hosting.Contracts.csproj", "{BE04C532-C9AE-4C32-9283-F6629112228B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlTools.ServiceLayer", "src\Microsoft.SqlTools.ServiceLayer\Microsoft.SqlTools.ServiceLayer.csproj", "{835EDEB4-289B-4D6D-A9A0-609E43A87D6E}" + ProjectSection(ProjectDependencies) = postProject + {3F82F298-700A-48DF-8A69-D048DFBA782C} = {3F82F298-700A-48DF-8A69-D048DFBA782C} + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlTools.Hosting.UnitTests", "test\Microsoft.SqlTools.Hosting.UnitTests\Microsoft.SqlTools.Hosting.UnitTests.csproj", "{BA3C9622-ABFF-45A2-91AA-CC5189083256}" EndProject @@ -90,6 +93,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlTools.Hosting. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TVFSample", "test\TVFSample\TVFSample.csproj", "{1FC10261-EC0D-416A-9B66-C55F0A34968C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlTools.ManagedBatchParser", "src\Microsoft.SqlTools.ManagedBatchParser\Microsoft.SqlTools.ManagedBatchParser.csproj", "{3F82F298-700A-48DF-8A69-D048DFBA782C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -217,6 +222,12 @@ Global {1FC10261-EC0D-416A-9B66-C55F0A34968C}.Integration|Any CPU.Build.0 = Release|Any CPU {1FC10261-EC0D-416A-9B66-C55F0A34968C}.Release|Any CPU.ActiveCfg = Release|Any CPU {1FC10261-EC0D-416A-9B66-C55F0A34968C}.Release|Any CPU.Build.0 = Release|Any CPU + {3F82F298-700A-48DF-8A69-D048DFBA782C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F82F298-700A-48DF-8A69-D048DFBA782C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F82F298-700A-48DF-8A69-D048DFBA782C}.Integration|Any CPU.ActiveCfg = Debug|Any CPU + {3F82F298-700A-48DF-8A69-D048DFBA782C}.Integration|Any CPU.Build.0 = Debug|Any CPU + {3F82F298-700A-48DF-8A69-D048DFBA782C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F82F298-700A-48DF-8A69-D048DFBA782C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -244,6 +255,7 @@ Global {8EE5B06A-2EB2-4A47-812D-1D5B98D0F49A} = {AB9CA2B8-6F70-431C-8A1D-67479D8A7BE4} {EF02F89F-417E-4A40-B7E6-B102EE2DF24D} = {2BBD7364-054F-4693-97CD-1C395E3E84A9} {1FC10261-EC0D-416A-9B66-C55F0A34968C} = {AB9CA2B8-6F70-431C-8A1D-67479D8A7BE4} + {3F82F298-700A-48DF-8A69-D048DFBA782C} = {2BBD7364-054F-4693-97CD-1C395E3E84A9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B31CDF4B-2851-45E5-8C5F-BE97125D9DD8} diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserAction.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserAction.cs similarity index 88% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserAction.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserAction.cs index 4ec4b996..ea3fbabb 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserAction.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserAction.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal enum BatchParserAction + public enum BatchParserAction { Continue = 0, Abort = 1 diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserException.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserException.cs similarity index 95% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserException.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserException.cs index 6b4e6149..ccff7261 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserException.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserException.cs @@ -7,7 +7,7 @@ using System; namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal sealed class BatchParserException : Exception + public sealed class BatchParserException : Exception { const string ErrorCodeName = "ErrorCode"; const string BeginName = "Begin"; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapper.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserWrapper.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapper.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserWrapper.cs index 48fd228d..7185b8b9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapper.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserWrapper.cs @@ -10,6 +10,7 @@ using System.IO; using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; using System.Globalization; using System.Diagnostics; +using Microsoft.SqlTools.ManagedBatchParser; namespace Microsoft.SqlTools.ServiceLayer.BatchParser { diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapperException.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserWrapperException.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/BatchParserWrapperException.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/BatchParserWrapperException.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ErrorCode.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ErrorCode.cs similarity index 96% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ErrorCode.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ErrorCode.cs index a85d1478..ac735a31 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ErrorCode.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ErrorCode.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal enum ErrorCode + public enum ErrorCode { ErrorCodeBase = 0, diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/Batch.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/Batch.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/Batch.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/Batch.cs index 9e4e5532..a2d6a410 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/Batch.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/Batch.cs @@ -11,13 +11,14 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; using Microsoft.SqlTools.Utility; +using Microsoft.SqlTools.ManagedBatchParser; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { /// /// Single batch of SQL command /// - internal class Batch + public class Batch { #region Private methods diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchDefinition.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchDefinition.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchDefinition.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchDefinition.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs index d423fb16..5bff029e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchErrorEventArgs.cs @@ -5,13 +5,14 @@ using System; using System.Data.SqlClient; +using Microsoft.SqlTools.ManagedBatchParser; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { /// /// Error totalAffectedRows for a Batch /// - internal class BatchErrorEventArgs : EventArgs + public class BatchErrorEventArgs : EventArgs { #region Private Fields private string message = string.Empty; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs similarity index 96% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs index 3ec42f35..ef1cddd3 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchMessageEventArgs.cs @@ -11,7 +11,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode /// /// Event args for notification about non-error message /// - internal class BatchMessageEventArgs : EventArgs + public class BatchMessageEventArgs : EventArgs { private readonly string message = string.Empty; private readonly string detailedMessage = string.Empty; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParser.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParser.cs similarity index 98% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParser.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParser.cs index 62fd22e1..ced5d5c5 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParser.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParser.cs @@ -10,7 +10,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode /// /// Class that parses queries into batches /// - internal class BatchParser : + public class BatchParser : ICommandHandler, IVariableResolver { @@ -153,7 +153,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode throw new NotImplementedException("The method or operation is not implemented."); } - internal void DisableVariableSubstitution() + public void DisableVariableSubstitution() { variableSubstitutionDisabled = true; } diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionErrorEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionErrorEventArgs.cs similarity index 92% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionErrorEventArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionErrorEventArgs.cs index 05961304..7da183c8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionErrorEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionErrorEventArgs.cs @@ -8,7 +8,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode /// /// Class associated with batch parser execution errors /// - internal class BatchParserExecutionErrorEventArgs : BatchErrorEventArgs + public class BatchParserExecutionErrorEventArgs : BatchErrorEventArgs { private readonly ScriptMessageType messageType; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionFinishedEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionFinishedEventArgs.cs similarity index 94% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionFinishedEventArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionFinishedEventArgs.cs index 08f0b2fa..e6e2cc4c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionFinishedEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionFinishedEventArgs.cs @@ -10,7 +10,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode /// /// Class associated with batch parser execution finished event /// - internal class BatchParserExecutionFinishedEventArgs : EventArgs + public class BatchParserExecutionFinishedEventArgs : EventArgs { private readonly Batch batch = null; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionStartEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionStartEventArgs.cs similarity index 94% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionStartEventArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionStartEventArgs.cs index d3d90fc9..e195cdcd 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserExecutionStartEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserExecutionStartEventArgs.cs @@ -11,7 +11,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode /// /// Class associated with batch parser execution start event /// - internal class BatchParserExecutionStartEventArgs : EventArgs + public class BatchParserExecutionStartEventArgs : EventArgs { private readonly Batch batch = null; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs similarity index 95% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs index 721beba9..33b90cad 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs @@ -8,13 +8,14 @@ using System.Collections.Generic; using System.Data.SqlClient; using System.Globalization; using System.IO; +using Microsoft.SqlTools.ManagedBatchParser; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { /// /// Class for handling SQL CMD by Batch Parser /// - internal class BatchParserSqlCmd : BatchParser + public class BatchParserSqlCmd : BatchParser { /// /// The internal variables that can be used in SqlCommand substitution. @@ -36,14 +37,14 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { // nothing } - - internal ConnectionChangedDelegate ConnectionChanged + + public ConnectionChangedDelegate ConnectionChanged { get { return connectionChangedDelegate; } set { connectionChangedDelegate = value; } } - internal ErrorActionChangedDelegate ErrorActionChanged + public ErrorActionChangedDelegate ErrorActionChanged { get { return errorActionChangedDelegate; } set { errorActionChangedDelegate = value; } diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchResultSetEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchResultSetEventArgs.cs similarity index 96% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchResultSetEventArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchResultSetEventArgs.cs index 0b80cf0d..ffc24c79 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/BatchResultSetEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchResultSetEventArgs.cs @@ -11,7 +11,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode /// /// Class associated with setting batch results /// - internal class BatchResultSetEventArgs : EventArgs + public class BatchResultSetEventArgs : EventArgs { private readonly IDataReader dataReader = null; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngine.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngine.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs index 8aaefdfb..b4d41299 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngine.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs @@ -12,6 +12,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; using System.Text; +using Microsoft.SqlTools.ManagedBatchParser; using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection; using Microsoft.SqlTools.Utility; @@ -20,7 +21,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode /// /// Execution engine class which executed the parsed batches /// - internal class ExecutionEngine : IDisposable + public class ExecutionEngine : IDisposable { #region Private fields diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs index 243f0a53..b64667ed 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngineConditions.cs @@ -8,7 +8,7 @@ using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { - internal class ExecutionEngineConditions + public class ExecutionEngineConditions { #region Private fields diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionState.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionState.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ExecutionState.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionState.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/IBatchEventsHandler.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/IBatchEventsHandler.cs similarity index 96% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/IBatchEventsHandler.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/IBatchEventsHandler.cs index 4cc727f8..e0bbaab0 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/IBatchEventsHandler.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/IBatchEventsHandler.cs @@ -7,7 +7,7 @@ using System; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { - internal interface IBatchEventsHandler + public interface IBatchEventsHandler { /// /// fired when there is an error message from the server diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs similarity index 98% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs index 29349529..5fabed81 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs @@ -10,7 +10,7 @@ using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { - internal class ScriptExecutionArgs : EventArgs + public class ScriptExecutionArgs : EventArgs { private IDbConnection connection; private IBatchEventsHandler batchEventHandlers; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionFinishedEventArgs.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionFinishedEventArgs.cs similarity index 90% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionFinishedEventArgs.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionFinishedEventArgs.cs index 855b8365..6dca2bb8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionFinishedEventArgs.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionFinishedEventArgs.cs @@ -7,7 +7,7 @@ using System; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { - internal class ScriptExecutionFinishedEventArgs : EventArgs + public class ScriptExecutionFinishedEventArgs : EventArgs { internal ScriptExecutionFinishedEventArgs(ScriptExecutionResult result) { diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionResult.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionResult.cs similarity index 90% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionResult.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionResult.cs index 5c48dec6..efbe8367 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptExecutionResult.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionResult.cs @@ -8,7 +8,7 @@ using System; namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { [Flags] - internal enum ScriptExecutionResult + public enum ScriptExecutionResult { Success = 0x1, Failure = 0x2, diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptMessageType.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptMessageType.cs similarity index 89% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptMessageType.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptMessageType.cs index d9774e61..4f265f94 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ScriptMessageType.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptMessageType.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { - internal enum ScriptMessageType + public enum ScriptMessageType { FatalError, Error, diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ShowPlanType.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ShowPlanType.cs similarity index 95% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ShowPlanType.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ShowPlanType.cs index 01acfd98..9ee08e98 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/ShowPlanType.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ShowPlanType.cs @@ -6,7 +6,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { [System.Flags] - internal enum ShowPlanType + public enum ShowPlanType { None = 0x0, ActualExecutionShowPlan = 0x1, diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/TextSpan.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/TextSpan.cs similarity index 93% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/TextSpan.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/TextSpan.cs index 24fd35e5..70034f90 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ExecutionEngineCode/TextSpan.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/TextSpan.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode { - internal struct TextSpan + public struct TextSpan { public int iEndIndex; public int iEndLine; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ICommandHandler.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ICommandHandler.cs similarity index 92% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/ICommandHandler.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ICommandHandler.cs index 02117f9a..ac874e40 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/ICommandHandler.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ICommandHandler.cs @@ -7,7 +7,7 @@ using System.IO; namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal interface ICommandHandler + public interface ICommandHandler { BatchParserAction Go(TextBlock batch, int repeatCount); BatchParserAction OnError(Token token, OnErrorAction action); diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/IVariableResolver.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/IVariableResolver.cs similarity index 89% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/IVariableResolver.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/IVariableResolver.cs index 8573b55f..3ee29cc4 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/IVariableResolver.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/IVariableResolver.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal interface IVariableResolver + public interface IVariableResolver { string GetVariable(PositionStruct pos, string name); void SetVariable(PositionStruct pos, string name, string value); diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/Lexer.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Lexer.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/Lexer.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Lexer.cs index adc826a8..c0b4285e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/Lexer.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Lexer.cs @@ -8,13 +8,14 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; +using Microsoft.SqlTools.ManagedBatchParser; namespace Microsoft.SqlTools.ServiceLayer.BatchParser { /// /// Lexer class for the SMO Batch Parser /// - internal sealed class Lexer : IDisposable + public sealed class Lexer : IDisposable { private LexerInput currentInput; private bool popInputAtNextConsume; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/LexerInput.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LexerInput.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/LexerInput.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LexerInput.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/LexerTokenType.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LexerTokenType.cs similarity index 95% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/LexerTokenType.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LexerTokenType.cs index 77e68dff..8050fea0 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/LexerTokenType.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LexerTokenType.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal enum LexerTokenType + public enum LexerTokenType { None, Text, diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/LineInfo.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LineInfo.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/LineInfo.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LineInfo.cs index 33984d0c..e2e0b5dd 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/LineInfo.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/LineInfo.cs @@ -11,7 +11,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser /// This class gives information about lines being parsed by /// the Batch Parser /// - class LineInfo + public class LineInfo { private IEnumerable tokens; private IEnumerable variableRefs; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/OnErrorAction.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/OnErrorAction.cs similarity index 89% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/OnErrorAction.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/OnErrorAction.cs index 39d1f6a6..2e2247fb 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/OnErrorAction.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/OnErrorAction.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal enum OnErrorAction + public enum OnErrorAction { Ignore = 0, Exit = 1, diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/Parser.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Parser.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/Parser.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Parser.cs index 16f00e58..f3e09dc9 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/Parser.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Parser.cs @@ -10,13 +10,14 @@ using System.Globalization; using System.IO; using System.Security; using System.Text; +using Microsoft.SqlTools.ManagedBatchParser; namespace Microsoft.SqlTools.ServiceLayer.BatchParser { /// /// The Parser class on which the Batch Parser is based on /// - internal sealed class Parser : IDisposable + public sealed class Parser : IDisposable { private readonly ICommandHandler commandHandler; private Lexer lexer; @@ -224,7 +225,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser return false; } - internal void Parse() + public void Parse() { Accept(); ParseLines(); diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/PositionStruct.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/PositionStruct.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/PositionStruct.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/PositionStruct.cs index 8f2758f6..25654eea 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/PositionStruct.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/PositionStruct.cs @@ -8,7 +8,7 @@ using System; namespace Microsoft.SqlTools.ServiceLayer.BatchParser { [Serializable] - internal struct PositionStruct + public struct PositionStruct { private readonly int line; private readonly int column; diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/TextBlock.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/TextBlock.cs similarity index 93% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/TextBlock.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/TextBlock.cs index 3b6e2710..4c42922b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/TextBlock.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/TextBlock.cs @@ -3,25 +3,25 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using System.Text; using System.Collections.Generic; +using System.Text; namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal class TextBlock + public class TextBlock { private readonly Parser parser; private readonly IEnumerable tokens; /// - /// Constructor for the TextBlock class + /// Constructor for the TextBlock class /// public TextBlock(Parser parser, Token token) : this(parser, new[] { token }) { } /// - /// Constructor for the TextBlock class + /// Constructor for the TextBlock class /// public TextBlock(Parser parser, IEnumerable tokens) { @@ -63,6 +63,5 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser lineInfo = new LineInfo(tokens, variableRefs); text = sb.ToString(); } - } -} +} \ No newline at end of file diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/TextRuleFlags.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/TextRuleFlags.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/TextRuleFlags.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/TextRuleFlags.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/Token.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Token.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/Token.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Token.cs index c1d74a18..c88e3a3c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/Token.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Token.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser { - internal sealed class Token + public sealed class Token { /// /// Token class used by the lexer in Batch Parser diff --git a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/VariableReference.cs b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/VariableReference.cs similarity index 96% rename from src/Microsoft.SqlTools.ServiceLayer/BatchParser/VariableReference.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/VariableReference.cs index 41e13937..a31e2e5d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/BatchParser/VariableReference.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/VariableReference.cs @@ -8,7 +8,7 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser /// /// Class for reference of variables used by the lexer /// - internal sealed class VariableReference + public sealed class VariableReference { /// /// Constructor method for VariableReference class diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs new file mode 100644 index 00000000..fcdf3c56 --- /dev/null +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs @@ -0,0 +1,381 @@ +// WARNING: +// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0 +// from information in sr.strings +// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN +// +namespace Microsoft.SqlTools.ManagedBatchParser +{ + using System; + using System.Reflection; + using System.Resources; + using System.Globalization; + + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class SR + { + protected SR() + { } + + public static CultureInfo Culture + { + get + { + return Keys.Culture; + } + set + { + Keys.Culture = value; + } + } + + + public static string EE_BatchSqlMessageNoProcedureInfo + { + get + { + return Keys.GetString(Keys.EE_BatchSqlMessageNoProcedureInfo); + } + } + + public static string EE_BatchSqlMessageWithProcedureInfo + { + get + { + return Keys.GetString(Keys.EE_BatchSqlMessageWithProcedureInfo); + } + } + + public static string EE_BatchSqlMessageNoLineInfo + { + get + { + return Keys.GetString(Keys.EE_BatchSqlMessageNoLineInfo); + } + } + + public static string EE_BatchError_Exception + { + get + { + return Keys.GetString(Keys.EE_BatchError_Exception); + } + } + + public static string EE_BatchExecutionInfo_RowsAffected + { + get + { + return Keys.GetString(Keys.EE_BatchExecutionInfo_RowsAffected); + } + } + + public static string EE_ExecutionNotYetCompleteError + { + get + { + return Keys.GetString(Keys.EE_ExecutionNotYetCompleteError); + } + } + + public static string EE_ScriptError_Error + { + get + { + return Keys.GetString(Keys.EE_ScriptError_Error); + } + } + + public static string EE_ScriptError_ParsingSyntax + { + get + { + return Keys.GetString(Keys.EE_ScriptError_ParsingSyntax); + } + } + + public static string EE_ScriptError_FatalError + { + get + { + return Keys.GetString(Keys.EE_ScriptError_FatalError); + } + } + + public static string EE_ExecutionInfo_FinalizingLoop + { + get + { + return Keys.GetString(Keys.EE_ExecutionInfo_FinalizingLoop); + } + } + + public static string EE_ExecutionInfo_QueryCancelledbyUser + { + get + { + return Keys.GetString(Keys.EE_ExecutionInfo_QueryCancelledbyUser); + } + } + + public static string EE_BatchExecutionError_Halting + { + get + { + return Keys.GetString(Keys.EE_BatchExecutionError_Halting); + } + } + + public static string EE_BatchExecutionError_Ignoring + { + get + { + return Keys.GetString(Keys.EE_BatchExecutionError_Ignoring); + } + } + + public static string EE_ExecutionInfo_InitializingLoop + { + get + { + return Keys.GetString(Keys.EE_ExecutionInfo_InitializingLoop); + } + } + + public static string EE_ExecutionError_CommandNotSupported + { + get + { + return Keys.GetString(Keys.EE_ExecutionError_CommandNotSupported); + } + } + + public static string EE_ExecutionError_VariableNotFound + { + get + { + return Keys.GetString(Keys.EE_ExecutionError_VariableNotFound); + } + } + + public static string BatchParserWrapperExecutionEngineError + { + get + { + return Keys.GetString(Keys.BatchParserWrapperExecutionEngineError); + } + } + + public static string BatchParserWrapperExecutionError + { + get + { + return Keys.GetString(Keys.BatchParserWrapperExecutionError); + } + } + + public static string BatchParserWrapperExecutionEngineBatchMessage + { + get + { + return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchMessage); + } + } + + public static string BatchParserWrapperExecutionEngineBatchResultSetProcessing + { + get + { + return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchResultSetProcessing); + } + } + + public static string BatchParserWrapperExecutionEngineBatchResultSetFinished + { + get + { + return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchResultSetFinished); + } + } + + public static string BatchParserWrapperExecutionEngineBatchCancelling + { + get + { + return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchCancelling); + } + } + + public static string EE_ScriptError_Warning + { + get + { + return Keys.GetString(Keys.EE_ScriptError_Warning); + } + } + + public static string TroubleshootingAssistanceMessage + { + get + { + return Keys.GetString(Keys.TroubleshootingAssistanceMessage); + } + } + + public static string BatchParser_CircularReference + { + get + { + return Keys.GetString(Keys.BatchParser_CircularReference); + } + } + + public static string BatchParser_CommentNotTerminated + { + get + { + return Keys.GetString(Keys.BatchParser_CommentNotTerminated); + } + } + + public static string BatchParser_StringNotTerminated + { + get + { + return Keys.GetString(Keys.BatchParser_StringNotTerminated); + } + } + + public static string BatchParser_IncorrectSyntax + { + get + { + return Keys.GetString(Keys.BatchParser_IncorrectSyntax); + } + } + + public static string BatchParser_VariableNotDefined + { + get + { + return Keys.GetString(Keys.BatchParser_VariableNotDefined); + } + } + + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class Keys + { + static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ManagedBatchParser.Localization.SR", typeof(SR).GetTypeInfo().Assembly); + + static CultureInfo _culture = null; + + + public const string EE_BatchSqlMessageNoProcedureInfo = "EE_BatchSqlMessageNoProcedureInfo"; + + + public const string EE_BatchSqlMessageWithProcedureInfo = "EE_BatchSqlMessageWithProcedureInfo"; + + + public const string EE_BatchSqlMessageNoLineInfo = "EE_BatchSqlMessageNoLineInfo"; + + + public const string EE_BatchError_Exception = "EE_BatchError_Exception"; + + + public const string EE_BatchExecutionInfo_RowsAffected = "EE_BatchExecutionInfo_RowsAffected"; + + + public const string EE_ExecutionNotYetCompleteError = "EE_ExecutionNotYetCompleteError"; + + + public const string EE_ScriptError_Error = "EE_ScriptError_Error"; + + + public const string EE_ScriptError_ParsingSyntax = "EE_ScriptError_ParsingSyntax"; + + + public const string EE_ScriptError_FatalError = "EE_ScriptError_FatalError"; + + + public const string EE_ExecutionInfo_FinalizingLoop = "EE_ExecutionInfo_FinalizingLoop"; + + + public const string EE_ExecutionInfo_QueryCancelledbyUser = "EE_ExecutionInfo_QueryCancelledbyUser"; + + + public const string EE_BatchExecutionError_Halting = "EE_BatchExecutionError_Halting"; + + + public const string EE_BatchExecutionError_Ignoring = "EE_BatchExecutionError_Ignoring"; + + + public const string EE_ExecutionInfo_InitializingLoop = "EE_ExecutionInfo_InitializingLoop"; + + + public const string EE_ExecutionError_CommandNotSupported = "EE_ExecutionError_CommandNotSupported"; + + + public const string EE_ExecutionError_VariableNotFound = "EE_ExecutionError_VariableNotFound"; + + + public const string BatchParserWrapperExecutionEngineError = "BatchParserWrapperExecutionEngineError"; + + + public const string BatchParserWrapperExecutionError = "BatchParserWrapperExecutionError"; + + + public const string BatchParserWrapperExecutionEngineBatchMessage = "BatchParserWrapperExecutionEngineBatchMessage"; + + + public const string BatchParserWrapperExecutionEngineBatchResultSetProcessing = "BatchParserWrapperExecutionEngineBatchResultSetProcessing"; + + + public const string BatchParserWrapperExecutionEngineBatchResultSetFinished = "BatchParserWrapperExecutionEngineBatchResultSetFinished"; + + + public const string BatchParserWrapperExecutionEngineBatchCancelling = "BatchParserWrapperExecutionEngineBatchCancelling"; + + + public const string EE_ScriptError_Warning = "EE_ScriptError_Warning"; + + + public const string TroubleshootingAssistanceMessage = "TroubleshootingAssistanceMessage"; + + + public const string BatchParser_CircularReference = "BatchParser_CircularReference"; + + + public const string BatchParser_CommentNotTerminated = "BatchParser_CommentNotTerminated"; + + + public const string BatchParser_StringNotTerminated = "BatchParser_StringNotTerminated"; + + + public const string BatchParser_IncorrectSyntax = "BatchParser_IncorrectSyntax"; + + + public const string BatchParser_VariableNotDefined = "BatchParser_VariableNotDefined"; + + + private Keys() + { } + + public static CultureInfo Culture + { + get + { + return _culture; + } + set + { + _culture = value; + } + } + + public static string GetString(string key) + { + return resourceManager.GetString(key, _culture); + } + + } + } +} diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.resx b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.resx new file mode 100644 index 00000000..db2aa302 --- /dev/null +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.resx @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Msg {0}, Level {1}, State {2}, Line {3} + + + + Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} + + + + Msg {0}, Level {1}, State {2} + + + + An error occurred while the batch was being processed. The error message is: {0} + + + + ({0} row(s) affected) + + + + The previous execution is not yet complete. + + + + A scripting error occurred. + + + + Incorrect syntax was encountered while {0} was being parsed. + + + + A fatal error occurred. + + + + Batch execution completed {0} times... + + + + You cancelled the query. + + + + An error occurred while the batch was being executed. + + + + An error occurred while the batch was being executed, but the error has been ignored. + + + + Beginning execution loop + + + + Command {0} is not supported. + + + + The variable {0} could not be found. + + + + SQL Execution error: {0} + + + + Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} + + + + Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} + + + + Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} + + + + Batch parser wrapper execution engine batch ResultSet finished. + + + + Canceling batch parser wrapper batch execution. + + + + Scripting warning. + + + + For more information about this error, see the troubleshooting topics in the product documentation. + + + + File '{0}' recursively included. + + + + Missing end comment mark '*/'. + + + + Unclosed quotation mark after the character string. + + + + Incorrect syntax was encountered while parsing '{0}'. + + + + Variable {0} is not defined. + + + diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.strings b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.strings new file mode 100644 index 00000000..e97d416e --- /dev/null +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.strings @@ -0,0 +1,84 @@ +# String resource file +# +# When processed by the String Resource Tool, this file generates +# both a .CS and a .RESX file with the same name as the file. +# The .CS file contains a class which can be used to access these +# string resources, including the ability to format in +# parameters, which are identified with the .NET {x} format +# (see String.Format help). +# +# Comments below assume the file name is SR.strings. +# +# Lines starting with a semicolon ";" are also treated as comments, but +# in a future version they will be extracted and made available in LocStudio +# Put your comments to localizers _before_ the string they apply to. +# +# SMO build specific comment +# after generating the .resx file, run srgen on it and get the .resx file +# please remember to also check that .resx in, along with the +# .strings and .cs files + +[strings] + + +############################################################################ +# DacFx Resources + +EE_BatchSqlMessageNoProcedureInfo = Msg {0}, Level {1}, State {2}, Line {3} + +EE_BatchSqlMessageWithProcedureInfo = Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} + +EE_BatchSqlMessageNoLineInfo = Msg {0}, Level {1}, State {2} + +EE_BatchError_Exception = An error occurred while the batch was being processed. The error message is: {0} + +EE_BatchExecutionInfo_RowsAffected = ({0} row(s) affected) + +EE_ExecutionNotYetCompleteError = The previous execution is not yet complete. + +EE_ScriptError_Error = A scripting error occurred. + +EE_ScriptError_ParsingSyntax = Incorrect syntax was encountered while {0} was being parsed. + +EE_ScriptError_FatalError = A fatal error occurred. + +EE_ExecutionInfo_FinalizingLoop = Batch execution completed {0} times... + +EE_ExecutionInfo_QueryCancelledbyUser = You cancelled the query. + +EE_BatchExecutionError_Halting = An error occurred while the batch was being executed. + +EE_BatchExecutionError_Ignoring = An error occurred while the batch was being executed, but the error has been ignored. + +EE_ExecutionInfo_InitializingLoop = Beginning execution loop + +EE_ExecutionError_CommandNotSupported = Command {0} is not supported. + +EE_ExecutionError_VariableNotFound = The variable {0} could not be found. + +BatchParserWrapperExecutionEngineError = SQL Execution error: {0} + +BatchParserWrapperExecutionError = Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} + +BatchParserWrapperExecutionEngineBatchMessage = Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} + +BatchParserWrapperExecutionEngineBatchResultSetProcessing = Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} + +BatchParserWrapperExecutionEngineBatchResultSetFinished = Batch parser wrapper execution engine batch ResultSet finished. + +BatchParserWrapperExecutionEngineBatchCancelling = Canceling batch parser wrapper batch execution. + +EE_ScriptError_Warning = Scripting warning. + +TroubleshootingAssistanceMessage = For more information about this error, see the troubleshooting topics in the product documentation. + +BatchParser_CircularReference = File '{0}' recursively included. + +BatchParser_CommentNotTerminated = Missing end comment mark '*/'. + +BatchParser_StringNotTerminated = Unclosed quotation mark after the character string. + +BatchParser_IncorrectSyntax = Incorrect syntax was encountered while parsing '{0}'. + +BatchParser_VariableNotDefined = Variable {0} is not defined. + diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.xlf b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.xlf new file mode 100644 index 00000000..3399ad70 --- /dev/null +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.xlf @@ -0,0 +1,152 @@ + + + + + + Msg {0}, Level {1}, State {2}, Line {3} + Msg {0}, Level {1}, State {2}, Line {3} + + + + Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} + Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} + + + + Msg {0}, Level {1}, State {2} + Msg {0}, Level {1}, State {2} + + + + An error occurred while the batch was being processed. The error message is: {0} + An error occurred while the batch was being processed. The error message is: {0} + + + + ({0} row(s) affected) + ({0} row(s) affected) + + + + The previous execution is not yet complete. + The previous execution is not yet complete. + + + + A scripting error occurred. + A scripting error occurred. + + + + Incorrect syntax was encountered while {0} was being parsed. + Incorrect syntax was encountered while {0} was being parsed. + + + + A fatal error occurred. + A fatal error occurred. + + + + Batch execution completed {0} times... + Batch execution completed {0} times... + + + + You cancelled the query. + You cancelled the query. + + + + An error occurred while the batch was being executed. + An error occurred while the batch was being executed. + + + + An error occurred while the batch was being executed, but the error has been ignored. + An error occurred while the batch was being executed, but the error has been ignored. + + + + Beginning execution loop + Beginning execution loop + + + + Command {0} is not supported. + Command {0} is not supported. + + + + The variable {0} could not be found. + The variable {0} could not be found. + + + + SQL Execution error: {0} + SQL Execution error: {0} + + + + Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} + Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} + + + + Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} + Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} + + + + Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} + Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} + + + + Batch parser wrapper execution engine batch ResultSet finished. + Batch parser wrapper execution engine batch ResultSet finished. + + + + Canceling batch parser wrapper batch execution. + Canceling batch parser wrapper batch execution. + + + + Scripting warning. + Scripting warning. + + + + For more information about this error, see the troubleshooting topics in the product documentation. + For more information about this error, see the troubleshooting topics in the product documentation. + + + + File '{0}' recursively included. + File '{0}' recursively included. + + + + Missing end comment mark '*/'. + Missing end comment mark '*/'. + + + + Unclosed quotation mark after the character string. + Unclosed quotation mark after the character string. + + + + Incorrect syntax was encountered while parsing '{0}'. + Incorrect syntax was encountered while parsing '{0}'. + + + + Variable {0} is not defined. + Variable {0} is not defined. + + + + + \ No newline at end of file diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj b/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj new file mode 100644 index 00000000..7c63cc89 --- /dev/null +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj @@ -0,0 +1,21 @@ + + + netstandard2.0 + false + false + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.ManagedBatchParser/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..4cf13ee7 --- /dev/null +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Properties/AssemblyInfo.cs @@ -0,0 +1,43 @@ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Microsoft.SqlTools.ManagedBatchParser")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.SqlTools.ManagedBatchParser")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("82dd9738-2ad3-4eb3-9f80-18b594e03621")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.UnitTests")] +[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.IntegrationTests")] +[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.Test.Common")] +[assembly: InternalsVisibleTo("MicrosoftSqlToolsServiceLayer")] +[assembly: InternalsVisibleTo("Microsoft.SqlTools.ManagedBatchParser.UnitTests")] \ No newline at end of file diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/AmbientSettings.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/AmbientSettings.cs similarity index 98% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/AmbientSettings.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/AmbientSettings.cs index 46f621c2..c31e3c5d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/AmbientSettings.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/AmbientSettings.cs @@ -16,11 +16,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// cannot rely on the registry to supply override values therefore setting overrides must be made /// by the top-of-the-stack /// - internal sealed class AmbientSettings + public sealed class AmbientSettings { private const string LogicalContextName = "__LocalContextConfigurationName"; - internal enum StreamBackingStore + public enum StreamBackingStore { // MemoryStream Memory = 0, @@ -49,7 +49,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection internal const string DoNotSerializeQueryStoreSettingsIndex = "DoNotSerializeQueryStoreSettings"; internal const string AlwaysEncryptedWizardMigrationIndex = "AlwaysEncryptedWizardMigration"; - internal static AmbientData _defaultSettings; + public static AmbientData _defaultSettings; static AmbientSettings() { @@ -291,25 +291,25 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection set { _configuration[ImportModelDatabaseIndex].Value = value; } } - internal bool SupportAlwaysEncrypted + public bool SupportAlwaysEncrypted { get { return (bool)_configuration[SupportAlwaysEncryptedIndex].Value; } set { _configuration[SupportAlwaysEncryptedIndex].Value = value; } } - internal bool AlwaysEncryptedWizardMigration + public bool AlwaysEncryptedWizardMigration { get { return (bool)_configuration[AlwaysEncryptedWizardMigrationIndex].Value; } set { _configuration[AlwaysEncryptedWizardMigrationIndex].Value = value; } } - internal bool SkipObjectTypeBlocking + public bool SkipObjectTypeBlocking { get { return (bool)_configuration[SkipObjectTypeBlockingIndex].Value; } set { _configuration[SkipObjectTypeBlockingIndex].Value = value; } } - internal bool DoNotSerializeQueryStoreSettings + public bool DoNotSerializeQueryStoreSettings { get { return (bool)_configuration[DoNotSerializeQueryStoreSettingsIndex].Value; } set { _configuration[DoNotSerializeQueryStoreSettingsIndex].Value = value; } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/CachedServerInfo.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/CachedServerInfo.cs similarity index 98% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/CachedServerInfo.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/CachedServerInfo.cs index a1548b6a..5217fd89 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/CachedServerInfo.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/CachedServerInfo.cs @@ -17,7 +17,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// This class caches server information for subsequent use /// - internal class CachedServerInfo + public class CachedServerInfo { /// /// Singleton service instance @@ -115,7 +115,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Internal constructor for testing purposes. For all code use, please use the /// default instance. /// - internal CachedServerInfo() + public CachedServerInfo() { _cache = new ConcurrentDictionary(); _cacheLock = new object(); @@ -175,7 +175,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection AddOrUpdateCache(builder, newState, cacheVar); } - internal void AddOrUpdateCache(SqlConnectionStringBuilder builder, bool newState, CacheVariable cacheVar) + public void AddOrUpdateCache(SqlConnectionStringBuilder builder, bool newState, CacheVariable cacheVar) { Validate.IsNotNull(nameof(builder), builder); Validate.IsNotNullOrWhitespaceString(nameof(builder) + ".DataSource", builder.DataSource); diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/Constants.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/Constants.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/Constants.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/Constants.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DataSchemaError.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DataSchemaError.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DataSchemaError.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DataSchemaError.cs index 143b29ec..975824ae 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DataSchemaError.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DataSchemaError.cs @@ -15,7 +15,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// the objects are just data-transfer-objects initialized during construction. /// [Serializable] - internal class DataSchemaError + public class DataSchemaError { internal const string DefaultPrefix = "SQL"; private const int MaxErrorCode = 99999; @@ -182,7 +182,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection get { return FormatErrorCode(Prefix, ErrorCode); } } - internal Boolean IsBuildErrorCodeDefined + public Boolean IsBuildErrorCodeDefined { get { return (ErrorCode != UndefinedErrorCode); } } @@ -190,9 +190,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// true if this error is being displayed in ErrorList. More of an Accounting Mechanism to be used internally. /// - internal bool IsOnDisplay { get; set; } + public bool IsOnDisplay { get; set; } - internal static string FormatErrorCode(string prefix, int code) + public static string FormatErrorCode(string prefix, int code) { return string.Format( CultureInfo.InvariantCulture, diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbCommandWrapper.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbCommandWrapper.cs similarity index 98% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbCommandWrapper.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbCommandWrapper.cs index d9b96397..86413030 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbCommandWrapper.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbCommandWrapper.cs @@ -15,7 +15,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Wraps objects that could be a or /// a , providing common methods across both. /// - internal sealed class DbCommandWrapper + public sealed class DbCommandWrapper { private readonly IDbCommand _command; private readonly bool _isReliableCommand; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbConnectionWrapper.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbConnectionWrapper.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/DbConnectionWrapper.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/DbConnectionWrapper.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ErrorSeverity.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ErrorSeverity.cs similarity index 90% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ErrorSeverity.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ErrorSeverity.cs index 5cb01c6d..6e5581eb 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ErrorSeverity.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ErrorSeverity.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal enum ErrorSeverity + public enum ErrorSeverity { Unknown = 0, Error, diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/IStackSettingsContext.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/IStackSettingsContext.cs similarity index 90% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/IStackSettingsContext.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/IStackSettingsContext.cs index a121ab73..b593a3e2 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/IStackSettingsContext.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/IStackSettingsContext.cs @@ -12,7 +12,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// top-of-stack API. Changes made to this context's AmbientData instance will /// flow to lower in the stack while this object is not disposed. /// - internal interface IStackSettingsContext : IDisposable + public interface IStackSettingsContext : IDisposable { AmbientSettings.AmbientData Settings { get; } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableConnectionHelper.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableConnectionHelper.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs index fad121bb..e490a406 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableConnectionHelper.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs @@ -16,7 +16,7 @@ using Microsoft.SqlServer.Management.Common; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal static class ReliableConnectionHelper + public static class ReliableConnectionHelper { private const int PCU1BuildNumber = 2816; public readonly static SqlConnectionStringBuilder BuilderWithDefaultApplicationName = new SqlConnectionStringBuilder("server=(local);"); @@ -705,6 +705,13 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection public Dictionary Options { get; set; } } + public class ClusterEndpoint + { + public string ServiceName; + public string IpAddress; + public int Port; + } + public static bool TryGetServerVersion(string connectionString, out ServerInfo serverInfo, string azureAccountToken) { serverInfo = null; @@ -902,7 +909,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection public string DatabaseName; } - internal static bool TryGetConnectionStringBuilder(string connectionString, out SqlConnectionStringBuilder builder) + public static bool TryGetConnectionStringBuilder(string connectionString, out SqlConnectionStringBuilder builder) { builder = null; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlCommand.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlCommand.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlCommand.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlCommand.cs index eaacdfb0..7f55040a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlCommand.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlCommand.cs @@ -35,9 +35,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Provides a reliable way of opening connections to and executing commands /// taking into account potential network unreliability and a requirement for connection retry. /// - internal sealed partial class ReliableSqlConnection + public sealed partial class ReliableSqlConnection { - internal class ReliableSqlCommand : DbCommand + public class ReliableSqlCommand : DbCommand { private const int Dummy = 0; private readonly SqlCommand _command; @@ -230,12 +230,12 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection _command.Prepare(); } - internal SqlCommand GetUnderlyingCommand() + public SqlCommand GetUnderlyingCommand() { return _command; } - internal void ValidateConnectionIsSet() + public void ValidateConnectionIsSet() { if (_connection == null) { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlConnection.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlConnection.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs index 3d9ebbf4..f275621b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/ReliableSqlConnection.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs @@ -41,7 +41,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Provides a reliable way of opening connections to and executing commands /// taking into account potential network unreliability and a requirement for connection retry. /// - internal sealed partial class ReliableSqlConnection : DbConnection, IDisposable + public sealed partial class ReliableSqlConnection : DbConnection, IDisposable { private const string QueryAzureSessionId = "SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO())"; @@ -493,7 +493,7 @@ SET NUMERIC_ROUNDABORT OFF;"; } // Because retry loses session settings, cache session settings or reply if the settings are already cached. - internal Tuple[] CacheOrReplaySessionSettings(IDbCommand originalCommand, Tuple[] sessionSettings) + public Tuple[] CacheOrReplaySessionSettings(IDbCommand originalCommand, Tuple[] sessionSettings) { if (sessionSettings == null) { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/Resources.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/Resources.cs similarity index 79% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/Resources.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/Resources.cs index 796cfeb1..c22bf4ba 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/Resources.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/Resources.cs @@ -8,7 +8,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// Contains string resources used throughout ReliableConnection code. /// - internal static class Resources + public static class Resources { internal static string AmbientSettingFormat { @@ -18,7 +18,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string ConnectionPassedToIsCloudShouldBeOpen + public static string ConnectionPassedToIsCloudShouldBeOpen { get { @@ -26,7 +26,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string ConnectionPropertyNotSet + public static string ConnectionPropertyNotSet { get { @@ -34,7 +34,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string ExceptionCannotBeRetried + public static string ExceptionCannotBeRetried { get { @@ -42,7 +42,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string ErrorParsingConnectionString + public static string ErrorParsingConnectionString { get { @@ -50,7 +50,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string FailedToCacheIsCloud + public static string FailedToCacheIsCloud { get { @@ -58,7 +58,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string FailedToParseConnectionString + public static string FailedToParseConnectionString { get { @@ -66,7 +66,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string IgnoreOnException + public static string IgnoreOnException { get { @@ -74,7 +74,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string InvalidCommandType + public static string InvalidCommandType { get { @@ -82,7 +82,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string InvalidConnectionType + public static string InvalidConnectionType { get { @@ -106,7 +106,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string OnlyReliableConnectionSupported + public static string OnlyReliableConnectionSupported { get { @@ -114,7 +114,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string RetryOnException + public static string RetryOnException { get { @@ -130,7 +130,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string UnableToAssignValue + public static string UnableToAssignValue { get { @@ -138,7 +138,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static string UnableToRetrieveAzureSessionId + public static string UnableToRetrieveAzureSessionId { get { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryLimitExceededException.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryLimitExceededException.cs similarity index 89% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryLimitExceededException.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryLimitExceededException.cs index c4f99e59..26932f3e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryLimitExceededException.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryLimitExceededException.cs @@ -32,13 +32,13 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// exception to notify the retry policy that no further retry attempts are required. /// [Serializable] - internal sealed class RetryLimitExceededException : Exception + public sealed class RetryLimitExceededException : Exception { - internal RetryLimitExceededException() : base() + public RetryLimitExceededException() : base() { } - internal RetryLimitExceededException(string m, Exception e) : base(m, e) + public RetryLimitExceededException(string m, Exception e) : base(m, e) { } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs similarity index 92% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs index 5295effd..e0678921 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.DataTransferDetectionErrorStrategy.cs @@ -9,12 +9,12 @@ using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal abstract partial class RetryPolicy + public abstract partial class RetryPolicy { /// /// Provides the error detection logic for temporary faults that are commonly found during data transfer. /// - internal class DataTransferErrorDetectionStrategy : ErrorDetectionStrategyBase + public class DataTransferErrorDetectionStrategy : ErrorDetectionStrategyBase { private static readonly DataTransferErrorDetectionStrategy instance = new DataTransferErrorDetectionStrategy(); diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs similarity index 96% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs index bc591616..de7f4b5d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.IErrorDetectionStrategy.cs @@ -8,7 +8,7 @@ using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal abstract partial class RetryPolicy + public abstract partial class RetryPolicy { public interface IErrorDetectionStrategy { @@ -31,7 +31,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Base class with common retry logic. The core behavior for retrying non SqlExceptions is the same /// across retry policies /// - internal abstract class ErrorDetectionStrategyBase : IErrorDetectionStrategy + public abstract class ErrorDetectionStrategyBase : IErrorDetectionStrategy { public bool CanRetry(Exception ex) { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs similarity index 91% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs index bcdd5083..5b2b0d7c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.NetworkConnectivityErrorStrategy.cs @@ -7,13 +7,13 @@ using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal abstract partial class RetryPolicy + public abstract partial class RetryPolicy { /// /// Provides the error detection logic for temporary faults that are commonly found in SQL Azure. /// The same errors CAN occur on premise also, but they are not seen as often. /// - internal sealed class NetworkConnectivityErrorDetectionStrategy : ErrorDetectionStrategyBase + public sealed class NetworkConnectivityErrorDetectionStrategy : ErrorDetectionStrategyBase { private static NetworkConnectivityErrorDetectionStrategy instance = new NetworkConnectivityErrorDetectionStrategy(); diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs similarity index 93% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs index 65c35b96..cefa6b4e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy.cs @@ -8,7 +8,7 @@ using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal abstract partial class RetryPolicy + public abstract partial class RetryPolicy { /// /// Provides the error detection logic for temporary faults that are commonly found in SQL Azure. @@ -18,7 +18,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// want to consider this as passing since the first execution that has timed out (or failed for some other temporary error) /// might have managed to create the object. /// - internal class SqlAzureTemporaryAndIgnorableErrorDetectionStrategy : ErrorDetectionStrategyBase + public class SqlAzureTemporaryAndIgnorableErrorDetectionStrategy : ErrorDetectionStrategyBase { /// /// Azure error that can be ignored diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs index bf64b144..4446b0c8 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.cs @@ -7,7 +7,7 @@ using System.Data.SqlClient; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal abstract partial class RetryPolicy + public abstract partial class RetryPolicy { /// /// Provides the error detection logic for temporary faults that are commonly found in SQL Azure. diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.ThrottleReason.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.ThrottleReason.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.ThrottleReason.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.ThrottleReason.cs index 64eb2102..4df38944 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.ThrottleReason.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.ThrottleReason.cs @@ -13,7 +13,7 @@ using System.Text.RegularExpressions; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal abstract partial class RetryPolicy + public abstract partial class RetryPolicy { /// /// Implements an object holding the decoded reason code returned from SQL Azure when encountering throttling conditions. diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.cs index 3f158602..6bb5d3c5 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicy.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicy.cs @@ -36,19 +36,19 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// Implements a policy defining and implementing the retry mechanism for unreliable actions. /// - internal abstract partial class RetryPolicy + public abstract partial class RetryPolicy { /// /// Defines a callback delegate which will be invoked whenever a retry condition is encountered. /// /// The state of current retry attempt. - internal delegate void RetryCallbackDelegate(RetryState retryState); + public delegate void RetryCallbackDelegate(RetryState retryState); /// /// Defines a callback delegate which will be invoked whenever an error is ignored on retry. /// /// The state of current retry attempt. - internal delegate void IgnoreErrorCallbackDelegate(RetryState retryState); + public delegate void IgnoreErrorCallbackDelegate(RetryState retryState); private readonly IErrorDetectionStrategy _errorDetectionStrategy; @@ -106,7 +106,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// This flag is currently being used for TESTING PURPOSES ONLY. /// - internal bool ShouldIgnoreOnFirstTry + public bool ShouldIgnoreOnFirstTry { get; set; @@ -292,7 +292,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } */ - internal static int? GetErrorNumber(Exception ex) + public static int? GetErrorNumber(Exception ex) { SqlException sqlEx = ex as SqlException; if (sqlEx == null) @@ -331,7 +331,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal class FixedDelayPolicy : RetryPolicy + public class FixedDelayPolicy : RetryPolicy { private readonly int _maxRetryCount; private readonly TimeSpan _intervalBetweenRetries; @@ -367,7 +367,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal class ProgressiveRetryPolicy : RetryPolicy + public class ProgressiveRetryPolicy : RetryPolicy { private readonly int _maxRetryCount; private readonly TimeSpan _initialInterval; @@ -453,7 +453,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal class TimeBasedRetryPolicy : RetryPolicy + public class TimeBasedRetryPolicy : RetryPolicy { private readonly TimeSpan _minTotalRetryTimeLimit; private readonly TimeSpan _maxTotalRetryTimeLimit; @@ -533,7 +533,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection return new RetryStateEx { TotalRetryTime = TimeSpan.Zero }; } - internal sealed class RetryStateEx : RetryState + public sealed class RetryStateEx : RetryState { public TimeSpan TotalRetryTime { get; set; } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyFactory.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyFactory.cs similarity index 92% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyFactory.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyFactory.cs index 99f505a9..984f9e79 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyFactory.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyFactory.cs @@ -57,11 +57,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// public static readonly TimeSpan DefaultProgressiveRetryIncrement = TimeSpan.FromMilliseconds(500); } - + /// /// Implements a collection of the RetryPolicyInfo elements holding retry policy settings. /// - internal sealed class RetryPolicyFactory + public sealed class RetryPolicyFactory { /// /// Returns a default policy that does no retries, it just invokes action exactly once. @@ -77,7 +77,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Implements a strategy that ignores any transient errors. /// Internal for testing purposes only /// - internal sealed class TransientErrorIgnoreStrategy : RetryPolicy.IErrorDetectionStrategy + public sealed class TransientErrorIgnoreStrategy : RetryPolicy.IErrorDetectionStrategy { private static readonly TransientErrorIgnoreStrategy _instance = new TransientErrorIgnoreStrategy(); @@ -101,7 +101,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Creates and returns a default Retry Policy for Schema based operations. /// /// An instance of class. - internal static RetryPolicy CreateDefaultSchemaCommandRetryPolicy(bool useRetry, int retriesPerPhase = RetryPolicyDefaults.DefaulSchemaRetryCount) + public static RetryPolicy CreateDefaultSchemaCommandRetryPolicy(bool useRetry, int retriesPerPhase = RetryPolicyDefaults.DefaulSchemaRetryCount) { RetryPolicy policy; @@ -128,7 +128,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// The RetryOccured event is wired to raise an RaiseAmbientRetryMessage message for a connection retry. /// An instance of class. - internal static RetryPolicy CreateSchemaConnectionRetryPolicy(int retriesPerPhase) + public static RetryPolicy CreateSchemaConnectionRetryPolicy(int retriesPerPhase) { RetryPolicy policy = new RetryPolicy.ExponentialDelayRetryPolicy( RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.Instance, @@ -145,7 +145,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// The RetryOccured event is wired to raise an RaiseAmbientRetryMessage message for a command retry. /// An instance of class. - internal static RetryPolicy CreateSchemaCommandRetryPolicy(int retriesPerPhase) + public static RetryPolicy CreateSchemaCommandRetryPolicy(int retriesPerPhase) { RetryPolicy policy = new RetryPolicy.ExponentialDelayRetryPolicy( RetryPolicy.SqlAzureTemporaryErrorDetectionStrategy.Instance, @@ -167,7 +167,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// The IgnoreErrorOccurred event is wired to raise an RaiseAmbientIgnoreMessage message for ignore. /// /// An instance of class. - internal static RetryPolicy CreateDatabaseCommandRetryPolicy(params int[] ignorableErrorNumbers) + public static RetryPolicy CreateDatabaseCommandRetryPolicy(params int[] ignorableErrorNumbers) { RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy errorDetectionStrategy = new RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy(ignorableErrorNumbers); @@ -196,7 +196,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// The IgnoreErrorOccurred event is wired to raise an RaiseAmbientIgnoreMessage message for ignore. /// /// An instance of class. - internal static RetryPolicy CreateElementCommandRetryPolicy(params int[] ignorableErrorNumbers) + public static RetryPolicy CreateElementCommandRetryPolicy(params int[] ignorableErrorNumbers) { Debug.Assert(ignorableErrorNumbers != null); @@ -226,7 +226,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// The IgnoreErrorOccurred event is wired to raise an RaiseAmbientIgnoreMessage message for ignore. /// /// An instance of class. - internal static RetryPolicy CreatePrimaryKeyCommandRetryPolicy() + public static RetryPolicy CreatePrimaryKeyCommandRetryPolicy() { RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy errorDetectionStrategy = new RetryPolicy.SqlAzureTemporaryAndIgnorableErrorDetectionStrategy(SqlErrorNumbers.PrimaryKeyViolationErrorNumber); @@ -390,7 +390,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection return retryPolicy; } - internal static void DataConnectionFailureRetry(RetryState retryState) + public static void DataConnectionFailureRetry(RetryState retryState) { Logger.Write(TraceEventType.Information, string.Format(CultureInfo.InvariantCulture, "Connection retry number {0}. Delaying {1} ms before retry. Exception: {2}", @@ -401,7 +401,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection RetryPolicyUtils.RaiseAmbientRetryMessage(retryState, SqlSchemaModelErrorCodes.ServiceActions.ConnectionRetry); } - internal static void CommandFailureRetry(RetryState retryState, string commandKeyword) + public static void CommandFailureRetry(RetryState retryState, string commandKeyword) { Logger.Write(TraceEventType.Information, string.Format( CultureInfo.InvariantCulture, @@ -414,7 +414,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection RetryPolicyUtils.RaiseAmbientRetryMessage(retryState, SqlSchemaModelErrorCodes.ServiceActions.CommandRetry); } - internal static void CommandFailureIgnore(RetryState retryState, string commandKeyword) + public static void CommandFailureIgnore(RetryState retryState, string commandKeyword) { Logger.Write(TraceEventType.Information, string.Format( CultureInfo.InvariantCulture, @@ -426,32 +426,32 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection RetryPolicyUtils.RaiseAmbientIgnoreMessage(retryState, SqlSchemaModelErrorCodes.ServiceActions.CommandRetry); } - internal static void CommandFailureRetry(RetryState retryState) + public static void CommandFailureRetry(RetryState retryState) { CommandFailureRetry(retryState, "Command"); } - internal static void CommandFailureIgnore(RetryState retryState) + public static void CommandFailureIgnore(RetryState retryState) { CommandFailureIgnore(retryState, "Command"); } - internal static void CreateDatabaseCommandFailureRetry(RetryState retryState) + public static void CreateDatabaseCommandFailureRetry(RetryState retryState) { CommandFailureRetry(retryState, "Database Command"); } - internal static void CreateDatabaseCommandFailureIgnore(RetryState retryState) + public static void CreateDatabaseCommandFailureIgnore(RetryState retryState) { CommandFailureIgnore(retryState, "Database Command"); } - internal static void ElementCommandFailureRetry(RetryState retryState) + public static void ElementCommandFailureRetry(RetryState retryState) { CommandFailureRetry(retryState, "Element Command"); } - internal static void ElementCommandFailureIgnore(RetryState retryState) + public static void ElementCommandFailureIgnore(RetryState retryState) { CommandFailureIgnore(retryState, "Element Command"); } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyUtils.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyUtils.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyUtils.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyUtils.cs index c522a706..59423c01 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryPolicyUtils.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryPolicyUtils.cs @@ -12,7 +12,7 @@ using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal static class RetryPolicyUtils + public static class RetryPolicyUtils { /// /// Approved list of transient errors that should be retryable during Network connection stages @@ -257,7 +257,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// Total number of retries including the current retry /// TimeSpan defining the length of time to delay - internal static TimeSpan CalcExponentialRetryDelayWithSchemaDefaults(int currentRetryCount) + public static TimeSpan CalcExponentialRetryDelayWithSchemaDefaults(int currentRetryCount) { return CalcExponentialRetryDelay(currentRetryCount, RetryPolicyDefaults.DefaultBackoffIntervalFactor, @@ -277,7 +277,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Minimum interval between retries. The basis for all backoff calculations /// Maximum interval between retries. Backoff will not take longer than this period. /// TimeSpan defining the length of time to delay - internal static TimeSpan CalcExponentialRetryDelay(int currentRetryCount, double intervalFactor, TimeSpan minInterval, TimeSpan maxInterval) + public static TimeSpan CalcExponentialRetryDelay(int currentRetryCount, double intervalFactor, TimeSpan minInterval, TimeSpan maxInterval) { try { @@ -298,7 +298,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static void RaiseAmbientRetryMessage(RetryState retryState, int errorCode) + public static void RaiseAmbientRetryMessage(RetryState retryState, int errorCode) { Action retryMsgHandler = AmbientSettings.ConnectionRetryMessageHandler; if (retryMsgHandler != null) @@ -317,7 +317,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection } } - internal static void RaiseAmbientIgnoreMessage(RetryState retryState, int errorCode) + public static void RaiseAmbientIgnoreMessage(RetryState retryState, int errorCode) { Action retryMsgHandler = AmbientSettings.ConnectionRetryMessageHandler; if (retryMsgHandler != null) @@ -341,7 +341,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// /// - internal static void RaiseSchemaAmbientRetryMessage(RetryState retryState, int errorCode, Guid azureSessionId) + public static void RaiseSchemaAmbientRetryMessage(RetryState retryState, int errorCode, Guid azureSessionId) { if (azureSessionId != Guid.Empty) { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryState.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryState.cs similarity index 98% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryState.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryState.cs index f79ade69..3f8ec64c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/RetryState.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/RetryState.cs @@ -7,7 +7,7 @@ using System; namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal class RetryState + public class RetryState { private int _retryCount = 0; private TimeSpan _delay = TimeSpan.Zero; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlConnectionHelperScripts.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlConnectionHelperScripts.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlConnectionHelperScripts.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlConnectionHelperScripts.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlErrorNumbers.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlErrorNumbers.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlErrorNumbers.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlErrorNumbers.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlSchemaModelErrorCodes.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlSchemaModelErrorCodes.cs similarity index 99% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlSchemaModelErrorCodes.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlSchemaModelErrorCodes.cs index e5f126cc..798437c6 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlSchemaModelErrorCodes.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlSchemaModelErrorCodes.cs @@ -5,7 +5,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection { - internal static class SqlSchemaModelErrorCodes + public static class SqlSchemaModelErrorCodes { private const int ParserErrorCodeStartIndex = 46000; private const int ParserErrorCodeEndIndex = 46499; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlServerError.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlServerError.cs similarity index 97% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlServerError.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlServerError.cs index c58b112d..b7a51210 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlServerError.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlServerError.cs @@ -11,7 +11,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// Represents an error produced by SQL Server database schema provider /// [Serializable] - internal class SqlServerError : DataSchemaError + public class SqlServerError : DataSchemaError { private const string SqlServerPrefix = "SQL"; private const string DefaultHelpKeyword = "vs.teamsystem.datatools.DefaultErrorMessageHelp"; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlServerRetryError.cs b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlServerRetryError.cs similarity index 96% rename from src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlServerRetryError.cs rename to src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlServerRetryError.cs index 35ec6aa1..2c0b9254 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ReliableConnection/SqlServerRetryError.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/SqlServerRetryError.cs @@ -11,7 +11,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection /// /// Captures extended information about a specific error and a retry /// - internal class SqlServerRetryError : SqlServerError + public class SqlServerRetryError : SqlServerError { private int _retryCount; private int _errorCode; diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ServerInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ServerInfo.cs index a62ff495..881f41b3 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ServerInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ServerInfo.cs @@ -3,7 +3,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using System; using System.Collections.Generic; namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts @@ -73,11 +72,4 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts /// public Dictionary Options { get; set; } } -} - -public class ClusterEndpoint -{ - public string ServiceName; - public string IpAddress; - public int Port; -} +} \ No newline at end of file diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs index 4242ac25..a7adb947 100755 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs @@ -669,99 +669,11 @@ namespace Microsoft.SqlTools.ServiceLayer } } - public static string EE_BatchSqlMessageNoProcedureInfo + public static string EE_ExecutionInfo_InitializingLoop { get { - return Keys.GetString(Keys.EE_BatchSqlMessageNoProcedureInfo); - } - } - - public static string EE_BatchSqlMessageWithProcedureInfo - { - get - { - return Keys.GetString(Keys.EE_BatchSqlMessageWithProcedureInfo); - } - } - - public static string EE_BatchSqlMessageNoLineInfo - { - get - { - return Keys.GetString(Keys.EE_BatchSqlMessageNoLineInfo); - } - } - - public static string EE_BatchError_Exception - { - get - { - return Keys.GetString(Keys.EE_BatchError_Exception); - } - } - - public static string EE_BatchExecutionInfo_RowsAffected - { - get - { - return Keys.GetString(Keys.EE_BatchExecutionInfo_RowsAffected); - } - } - - public static string EE_ExecutionNotYetCompleteError - { - get - { - return Keys.GetString(Keys.EE_ExecutionNotYetCompleteError); - } - } - - public static string EE_ScriptError_Error - { - get - { - return Keys.GetString(Keys.EE_ScriptError_Error); - } - } - - public static string EE_ScriptError_ParsingSyntax - { - get - { - return Keys.GetString(Keys.EE_ScriptError_ParsingSyntax); - } - } - - public static string EE_ScriptError_FatalError - { - get - { - return Keys.GetString(Keys.EE_ScriptError_FatalError); - } - } - - public static string EE_ExecutionInfo_FinalizingLoop - { - get - { - return Keys.GetString(Keys.EE_ExecutionInfo_FinalizingLoop); - } - } - - public static string EE_ExecutionInfo_QueryCancelledbyUser - { - get - { - return Keys.GetString(Keys.EE_ExecutionInfo_QueryCancelledbyUser); - } - } - - public static string EE_BatchExecutionError_Halting - { - get - { - return Keys.GetString(Keys.EE_BatchExecutionError_Halting); + return Keys.GetString(Keys.EE_ExecutionInfo_InitializingLoop); } } @@ -773,35 +685,11 @@ namespace Microsoft.SqlTools.ServiceLayer } } - public static string EE_ExecutionInfo_InitializingLoop + public static string EE_ExecutionInfo_FinalizingLoop { get { - return Keys.GetString(Keys.EE_ExecutionInfo_InitializingLoop); - } - } - - public static string EE_ExecutionError_CommandNotSupported - { - get - { - return Keys.GetString(Keys.EE_ExecutionError_CommandNotSupported); - } - } - - public static string EE_ExecutionError_VariableNotFound - { - get - { - return Keys.GetString(Keys.EE_ExecutionError_VariableNotFound); - } - } - - public static string BatchParserWrapperExecutionEngineError - { - get - { - return Keys.GetString(Keys.BatchParserWrapperExecutionEngineError); + return Keys.GetString(Keys.EE_ExecutionInfo_FinalizingLoop); } } @@ -813,94 +701,6 @@ namespace Microsoft.SqlTools.ServiceLayer } } - public static string BatchParserWrapperExecutionEngineBatchMessage - { - get - { - return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchMessage); - } - } - - public static string BatchParserWrapperExecutionEngineBatchResultSetProcessing - { - get - { - return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchResultSetProcessing); - } - } - - public static string BatchParserWrapperExecutionEngineBatchResultSetFinished - { - get - { - return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchResultSetFinished); - } - } - - public static string BatchParserWrapperExecutionEngineBatchCancelling - { - get - { - return Keys.GetString(Keys.BatchParserWrapperExecutionEngineBatchCancelling); - } - } - - public static string EE_ScriptError_Warning - { - get - { - return Keys.GetString(Keys.EE_ScriptError_Warning); - } - } - - public static string TroubleshootingAssistanceMessage - { - get - { - return Keys.GetString(Keys.TroubleshootingAssistanceMessage); - } - } - - public static string BatchParser_CircularReference - { - get - { - return Keys.GetString(Keys.BatchParser_CircularReference); - } - } - - public static string BatchParser_CommentNotTerminated - { - get - { - return Keys.GetString(Keys.BatchParser_CommentNotTerminated); - } - } - - public static string BatchParser_StringNotTerminated - { - get - { - return Keys.GetString(Keys.BatchParser_StringNotTerminated); - } - } - - public static string BatchParser_IncorrectSyntax - { - get - { - return Keys.GetString(Keys.BatchParser_IncorrectSyntax); - } - } - - public static string BatchParser_VariableNotDefined - { - get - { - return Keys.GetString(Keys.BatchParser_VariableNotDefined); - } - } - public static string TestLocalizationConstant { get @@ -2485,926 +2285,6 @@ namespace Microsoft.SqlTools.ServiceLayer } } - public static string unavailable - { - get - { - return Keys.GetString(Keys.unavailable); - } - } - - public static string filegroup_dialog_defaultFilegroup - { - get - { - return Keys.GetString(Keys.filegroup_dialog_defaultFilegroup); - } - } - - public static string filegroup_dialog_title - { - get - { - return Keys.GetString(Keys.filegroup_dialog_title); - } - } - - public static string filegroups_default - { - get - { - return Keys.GetString(Keys.filegroups_default); - } - } - - public static string filegroups_files - { - get - { - return Keys.GetString(Keys.filegroups_files); - } - } - - public static string filegroups_name - { - get - { - return Keys.GetString(Keys.filegroups_name); - } - } - - public static string filegroups_readonly - { - get - { - return Keys.GetString(Keys.filegroups_readonly); - } - } - - public static string general_autogrowth - { - get - { - return Keys.GetString(Keys.general_autogrowth); - } - } - - public static string general_builderText - { - get - { - return Keys.GetString(Keys.general_builderText); - } - } - - public static string general_default - { - get - { - return Keys.GetString(Keys.general_default); - } - } - - public static string general_fileGroup - { - get - { - return Keys.GetString(Keys.general_fileGroup); - } - } - - public static string general_fileName - { - get - { - return Keys.GetString(Keys.general_fileName); - } - } - - public static string general_fileType - { - get - { - return Keys.GetString(Keys.general_fileType); - } - } - - public static string general_initialSize - { - get - { - return Keys.GetString(Keys.general_initialSize); - } - } - - public static string general_newFilegroup - { - get - { - return Keys.GetString(Keys.general_newFilegroup); - } - } - - public static string general_path - { - get - { - return Keys.GetString(Keys.general_path); - } - } - - public static string general_physicalFileName - { - get - { - return Keys.GetString(Keys.general_physicalFileName); - } - } - - public static string general_rawDevice - { - get - { - return Keys.GetString(Keys.general_rawDevice); - } - } - - public static string general_recoveryModel_bulkLogged - { - get - { - return Keys.GetString(Keys.general_recoveryModel_bulkLogged); - } - } - - public static string general_recoveryModel_full - { - get - { - return Keys.GetString(Keys.general_recoveryModel_full); - } - } - - public static string general_recoveryModel_simple - { - get - { - return Keys.GetString(Keys.general_recoveryModel_simple); - } - } - - public static string general_titleSearchOwner - { - get - { - return Keys.GetString(Keys.general_titleSearchOwner); - } - } - - public static string prototype_autogrowth_disabled - { - get - { - return Keys.GetString(Keys.prototype_autogrowth_disabled); - } - } - - public static string prototype_autogrowth_restrictedGrowthByMB - { - get - { - return Keys.GetString(Keys.prototype_autogrowth_restrictedGrowthByMB); - } - } - - public static string prototype_autogrowth_restrictedGrowthByPercent - { - get - { - return Keys.GetString(Keys.prototype_autogrowth_restrictedGrowthByPercent); - } - } - - public static string prototype_autogrowth_unrestrictedGrowthByMB - { - get - { - return Keys.GetString(Keys.prototype_autogrowth_unrestrictedGrowthByMB); - } - } - - public static string prototype_autogrowth_unrestrictedGrowthByPercent - { - get - { - return Keys.GetString(Keys.prototype_autogrowth_unrestrictedGrowthByPercent); - } - } - - public static string prototype_autogrowth_unlimitedfilestream - { - get - { - return Keys.GetString(Keys.prototype_autogrowth_unlimitedfilestream); - } - } - - public static string prototype_autogrowth_limitedfilestream - { - get - { - return Keys.GetString(Keys.prototype_autogrowth_limitedfilestream); - } - } - - public static string prototype_db_category_automatic - { - get - { - return Keys.GetString(Keys.prototype_db_category_automatic); - } - } - - public static string prototype_db_category_servicebroker - { - get - { - return Keys.GetString(Keys.prototype_db_category_servicebroker); - } - } - - public static string prototype_db_category_collation - { - get - { - return Keys.GetString(Keys.prototype_db_category_collation); - } - } - - public static string prototype_db_category_cursor - { - get - { - return Keys.GetString(Keys.prototype_db_category_cursor); - } - } - - public static string prototype_db_category_misc - { - get - { - return Keys.GetString(Keys.prototype_db_category_misc); - } - } - - public static string prototype_db_category_recovery - { - get - { - return Keys.GetString(Keys.prototype_db_category_recovery); - } - } - - public static string prototype_db_category_state - { - get - { - return Keys.GetString(Keys.prototype_db_category_state); - } - } - - public static string prototype_db_prop_ansiNullDefault - { - get - { - return Keys.GetString(Keys.prototype_db_prop_ansiNullDefault); - } - } - - public static string prototype_db_prop_ansiNulls - { - get - { - return Keys.GetString(Keys.prototype_db_prop_ansiNulls); - } - } - - public static string prototype_db_prop_ansiPadding - { - get - { - return Keys.GetString(Keys.prototype_db_prop_ansiPadding); - } - } - - public static string prototype_db_prop_ansiWarnings - { - get - { - return Keys.GetString(Keys.prototype_db_prop_ansiWarnings); - } - } - - public static string prototype_db_prop_arithabort - { - get - { - return Keys.GetString(Keys.prototype_db_prop_arithabort); - } - } - - public static string prototype_db_prop_autoClose - { - get - { - return Keys.GetString(Keys.prototype_db_prop_autoClose); - } - } - - public static string prototype_db_prop_autoCreateStatistics - { - get - { - return Keys.GetString(Keys.prototype_db_prop_autoCreateStatistics); - } - } - - public static string prototype_db_prop_autoShrink - { - get - { - return Keys.GetString(Keys.prototype_db_prop_autoShrink); - } - } - - public static string prototype_db_prop_autoUpdateStatistics - { - get - { - return Keys.GetString(Keys.prototype_db_prop_autoUpdateStatistics); - } - } - - public static string prototype_db_prop_autoUpdateStatisticsAsync - { - get - { - return Keys.GetString(Keys.prototype_db_prop_autoUpdateStatisticsAsync); - } - } - - public static string prototype_db_prop_caseSensitive - { - get - { - return Keys.GetString(Keys.prototype_db_prop_caseSensitive); - } - } - - public static string prototype_db_prop_closeCursorOnCommit - { - get - { - return Keys.GetString(Keys.prototype_db_prop_closeCursorOnCommit); - } - } - - public static string prototype_db_prop_collation - { - get - { - return Keys.GetString(Keys.prototype_db_prop_collation); - } - } - - public static string prototype_db_prop_concatNullYieldsNull - { - get - { - return Keys.GetString(Keys.prototype_db_prop_concatNullYieldsNull); - } - } - - public static string prototype_db_prop_databaseCompatibilityLevel - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseCompatibilityLevel); - } - } - - public static string prototype_db_prop_databaseState - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState); - } - } - - public static string prototype_db_prop_defaultCursor - { - get - { - return Keys.GetString(Keys.prototype_db_prop_defaultCursor); - } - } - - public static string prototype_db_prop_fullTextIndexing - { - get - { - return Keys.GetString(Keys.prototype_db_prop_fullTextIndexing); - } - } - - public static string prototype_db_prop_numericRoundAbort - { - get - { - return Keys.GetString(Keys.prototype_db_prop_numericRoundAbort); - } - } - - public static string prototype_db_prop_pageVerify - { - get - { - return Keys.GetString(Keys.prototype_db_prop_pageVerify); - } - } - - public static string prototype_db_prop_quotedIdentifier - { - get - { - return Keys.GetString(Keys.prototype_db_prop_quotedIdentifier); - } - } - - public static string prototype_db_prop_readOnly - { - get - { - return Keys.GetString(Keys.prototype_db_prop_readOnly); - } - } - - public static string prototype_db_prop_recursiveTriggers - { - get - { - return Keys.GetString(Keys.prototype_db_prop_recursiveTriggers); - } - } - - public static string prototype_db_prop_restrictAccess - { - get - { - return Keys.GetString(Keys.prototype_db_prop_restrictAccess); - } - } - - public static string prototype_db_prop_selectIntoBulkCopy - { - get - { - return Keys.GetString(Keys.prototype_db_prop_selectIntoBulkCopy); - } - } - - public static string prototype_db_prop_honorBrokerPriority - { - get - { - return Keys.GetString(Keys.prototype_db_prop_honorBrokerPriority); - } - } - - public static string prototype_db_prop_serviceBrokerGuid - { - get - { - return Keys.GetString(Keys.prototype_db_prop_serviceBrokerGuid); - } - } - - public static string prototype_db_prop_brokerEnabled - { - get - { - return Keys.GetString(Keys.prototype_db_prop_brokerEnabled); - } - } - - public static string prototype_db_prop_truncateLogOnCheckpoint - { - get - { - return Keys.GetString(Keys.prototype_db_prop_truncateLogOnCheckpoint); - } - } - - public static string prototype_db_prop_dbChaining - { - get - { - return Keys.GetString(Keys.prototype_db_prop_dbChaining); - } - } - - public static string prototype_db_prop_trustworthy - { - get - { - return Keys.GetString(Keys.prototype_db_prop_trustworthy); - } - } - - public static string prototype_db_prop_dateCorrelationOptimization - { - get - { - return Keys.GetString(Keys.prototype_db_prop_dateCorrelationOptimization); - } - } - - public static string prototype_db_prop_parameterization - { - get - { - return Keys.GetString(Keys.prototype_db_prop_parameterization); - } - } - - public static string prototype_db_prop_parameterization_value_forced - { - get - { - return Keys.GetString(Keys.prototype_db_prop_parameterization_value_forced); - } - } - - public static string prototype_db_prop_parameterization_value_simple - { - get - { - return Keys.GetString(Keys.prototype_db_prop_parameterization_value_simple); - } - } - - public static string prototype_file_dataFile - { - get - { - return Keys.GetString(Keys.prototype_file_dataFile); - } - } - - public static string prototype_file_logFile - { - get - { - return Keys.GetString(Keys.prototype_file_logFile); - } - } - - public static string prototype_file_filestreamFile - { - get - { - return Keys.GetString(Keys.prototype_file_filestreamFile); - } - } - - public static string prototype_file_noFileGroup - { - get - { - return Keys.GetString(Keys.prototype_file_noFileGroup); - } - } - - public static string prototype_file_defaultpathstring - { - get - { - return Keys.GetString(Keys.prototype_file_defaultpathstring); - } - } - - public static string title_openConnectionsMustBeClosed - { - get - { - return Keys.GetString(Keys.title_openConnectionsMustBeClosed); - } - } - - public static string warning_openConnectionsMustBeClosed - { - get - { - return Keys.GetString(Keys.warning_openConnectionsMustBeClosed); - } - } - - public static string prototype_db_prop_databaseState_value_autoClosed - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_autoClosed); - } - } - - public static string prototype_db_prop_databaseState_value_emergency - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_emergency); - } - } - - public static string prototype_db_prop_databaseState_value_inaccessible - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_inaccessible); - } - } - - public static string prototype_db_prop_databaseState_value_normal - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_normal); - } - } - - public static string prototype_db_prop_databaseState_value_offline - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_offline); - } - } - - public static string prototype_db_prop_databaseState_value_recovering - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_recovering); - } - } - - public static string prototype_db_prop_databaseState_value_recoveryPending - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_recoveryPending); - } - } - - public static string prototype_db_prop_databaseState_value_restoring - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_restoring); - } - } - - public static string prototype_db_prop_databaseState_value_shutdown - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_shutdown); - } - } - - public static string prototype_db_prop_databaseState_value_standby - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_standby); - } - } - - public static string prototype_db_prop_databaseState_value_suspect - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databaseState_value_suspect); - } - } - - public static string prototype_db_prop_defaultCursor_value_global - { - get - { - return Keys.GetString(Keys.prototype_db_prop_defaultCursor_value_global); - } - } - - public static string prototype_db_prop_defaultCursor_value_local - { - get - { - return Keys.GetString(Keys.prototype_db_prop_defaultCursor_value_local); - } - } - - public static string prototype_db_prop_restrictAccess_value_multiple - { - get - { - return Keys.GetString(Keys.prototype_db_prop_restrictAccess_value_multiple); - } - } - - public static string prototype_db_prop_restrictAccess_value_restricted - { - get - { - return Keys.GetString(Keys.prototype_db_prop_restrictAccess_value_restricted); - } - } - - public static string prototype_db_prop_restrictAccess_value_single - { - get - { - return Keys.GetString(Keys.prototype_db_prop_restrictAccess_value_single); - } - } - - public static string prototype_db_prop_pageVerify_value_checksum - { - get - { - return Keys.GetString(Keys.prototype_db_prop_pageVerify_value_checksum); - } - } - - public static string prototype_db_prop_pageVerify_value_none - { - get - { - return Keys.GetString(Keys.prototype_db_prop_pageVerify_value_none); - } - } - - public static string prototype_db_prop_pageVerify_value_tornPageDetection - { - get - { - return Keys.GetString(Keys.prototype_db_prop_pageVerify_value_tornPageDetection); - } - } - - public static string prototype_db_prop_varDecimalEnabled - { - get - { - return Keys.GetString(Keys.prototype_db_prop_varDecimalEnabled); - } - } - - public static string compatibilityLevel_katmai - { - get - { - return Keys.GetString(Keys.compatibilityLevel_katmai); - } - } - - public static string prototype_db_prop_encryptionEnabled - { - get - { - return Keys.GetString(Keys.prototype_db_prop_encryptionEnabled); - } - } - - public static string prototype_db_prop_databasescopedconfig_value_off - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databasescopedconfig_value_off); - } - } - - public static string prototype_db_prop_databasescopedconfig_value_on - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databasescopedconfig_value_on); - } - } - - public static string prototype_db_prop_databasescopedconfig_value_primary - { - get - { - return Keys.GetString(Keys.prototype_db_prop_databasescopedconfig_value_primary); - } - } - - public static string error_db_prop_invalidleadingColumns - { - get - { - return Keys.GetString(Keys.error_db_prop_invalidleadingColumns); - } - } - - public static string compatibilityLevel_denali - { - get - { - return Keys.GetString(Keys.compatibilityLevel_denali); - } - } - - public static string compatibilityLevel_sql14 - { - get - { - return Keys.GetString(Keys.compatibilityLevel_sql14); - } - } - - public static string compatibilityLevel_sql15 - { - get - { - return Keys.GetString(Keys.compatibilityLevel_sql15); - } - } - - public static string compatibilityLevel_sqlvNext - { - get - { - return Keys.GetString(Keys.compatibilityLevel_sqlvNext); - } - } - - public static string general_containmentType_None - { - get - { - return Keys.GetString(Keys.general_containmentType_None); - } - } - - public static string general_containmentType_Partial - { - get - { - return Keys.GetString(Keys.general_containmentType_Partial); - } - } - - public static string filegroups_filestreamFiles - { - get - { - return Keys.GetString(Keys.filegroups_filestreamFiles); - } - } - - public static string prototype_file_noApplicableFileGroup - { - get - { - return Keys.GetString(Keys.prototype_file_noApplicableFileGroup); - } - } - - public static string NeverBackedUp - { - get - { - return Keys.GetString(Keys.NeverBackedUp); - } - } - - public static string Error_InvalidDirectoryName - { - get - { - return Keys.GetString(Keys.Error_InvalidDirectoryName); - } - } - - public static string Error_ExistingDirectoryName - { - get - { - return Keys.GetString(Keys.Error_ExistingDirectoryName); - } - } - public static string BackupTaskName { get @@ -3677,518 +2557,6 @@ namespace Microsoft.SqlTools.ServiceLayer } } - public static string UserCancelledSelectStep - { - get - { - return Keys.GetString(Keys.UserCancelledSelectStep); - } - } - - public static string RequestPostedToTargetServers - { - get - { - return Keys.GetString(Keys.RequestPostedToTargetServers); - } - } - - public static string Executing - { - get - { - return Keys.GetString(Keys.Executing); - } - } - - public static string BetweenRetries - { - get - { - return Keys.GetString(Keys.BetweenRetries); - } - } - - public static string Suspended - { - get - { - return Keys.GetString(Keys.Suspended); - } - } - - public static string PerformingCompletionAction - { - get - { - return Keys.GetString(Keys.PerformingCompletionAction); - } - } - - public static string WaitingForStepToFinish - { - get - { - return Keys.GetString(Keys.WaitingForStepToFinish); - } - } - - public static string WaitingForWorkerThread - { - get - { - return Keys.GetString(Keys.WaitingForWorkerThread); - } - } - - public static string AllDatabases - { - get - { - return Keys.GetString(Keys.AllDatabases); - } - } - - public static string Severity001 - { - get - { - return Keys.GetString(Keys.Severity001); - } - } - - public static string Severity002 - { - get - { - return Keys.GetString(Keys.Severity002); - } - } - - public static string Severity003 - { - get - { - return Keys.GetString(Keys.Severity003); - } - } - - public static string Severity004 - { - get - { - return Keys.GetString(Keys.Severity004); - } - } - - public static string Severity005 - { - get - { - return Keys.GetString(Keys.Severity005); - } - } - - public static string Severity006 - { - get - { - return Keys.GetString(Keys.Severity006); - } - } - - public static string Severity007 - { - get - { - return Keys.GetString(Keys.Severity007); - } - } - - public static string Severity008 - { - get - { - return Keys.GetString(Keys.Severity008); - } - } - - public static string Severity009 - { - get - { - return Keys.GetString(Keys.Severity009); - } - } - - public static string Severity010 - { - get - { - return Keys.GetString(Keys.Severity010); - } - } - - public static string Severity011 - { - get - { - return Keys.GetString(Keys.Severity011); - } - } - - public static string Severity012 - { - get - { - return Keys.GetString(Keys.Severity012); - } - } - - public static string Severity013 - { - get - { - return Keys.GetString(Keys.Severity013); - } - } - - public static string Severity014 - { - get - { - return Keys.GetString(Keys.Severity014); - } - } - - public static string Severity015 - { - get - { - return Keys.GetString(Keys.Severity015); - } - } - - public static string Severity016 - { - get - { - return Keys.GetString(Keys.Severity016); - } - } - - public static string Severity017 - { - get - { - return Keys.GetString(Keys.Severity017); - } - } - - public static string Severity018 - { - get - { - return Keys.GetString(Keys.Severity018); - } - } - - public static string Severity019 - { - get - { - return Keys.GetString(Keys.Severity019); - } - } - - public static string Severity020 - { - get - { - return Keys.GetString(Keys.Severity020); - } - } - - public static string Severity021 - { - get - { - return Keys.GetString(Keys.Severity021); - } - } - - public static string Severity022 - { - get - { - return Keys.GetString(Keys.Severity022); - } - } - - public static string Severity023 - { - get - { - return Keys.GetString(Keys.Severity023); - } - } - - public static string Severity024 - { - get - { - return Keys.GetString(Keys.Severity024); - } - } - - public static string Severity025 - { - get - { - return Keys.GetString(Keys.Severity025); - } - } - - public static string PagerScheduleMonFri - { - get - { - return Keys.GetString(Keys.PagerScheduleMonFri); - } - } - - public static string PagerScheduleSatSun - { - get - { - return Keys.GetString(Keys.PagerScheduleSatSun); - } - } - - public static string PagerScheduleWarning - { - get - { - return Keys.GetString(Keys.PagerScheduleWarning); - } - } - - public static string General - { - get - { - return Keys.GetString(Keys.General); - } - } - - public static string Notifications - { - get - { - return Keys.GetString(Keys.Notifications); - } - } - - public static string History - { - get - { - return Keys.GetString(Keys.History); - } - } - - public static string Day - { - get - { - return Keys.GetString(Keys.Day); - } - } - - public static string StartTime - { - get - { - return Keys.GetString(Keys.StartTime); - } - } - - public static string EndTime - { - get - { - return Keys.GetString(Keys.EndTime); - } - } - - public static string ColumnIndexIsInvalid - { - get - { - return Keys.GetString(Keys.ColumnIndexIsInvalid); - } - } - - public static string RowIndexIsInvalid - { - get - { - return Keys.GetString(Keys.RowIndexIsInvalid); - } - } - - public static string NewOperatorProperties - { - get - { - return Keys.GetString(Keys.NewOperatorProperties); - } - } - - public static string FailedToCreateInitializeAgentOperatorDialog - { - get - { - return Keys.GetString(Keys.FailedToCreateInitializeAgentOperatorDialog); - } - } - - public static string JobServerIsNotAvailable - { - get - { - return Keys.GetString(Keys.JobServerIsNotAvailable); - } - } - - public static string CannotCreateInitializeGeneralPage - { - get - { - return Keys.GetString(Keys.CannotCreateInitializeGeneralPage); - } - } - - public static string CannotCreateInitializeNotificationsPage - { - get - { - return Keys.GetString(Keys.CannotCreateInitializeNotificationsPage); - } - } - - public static string CannotCreateInitializeHistoryPage - { - get - { - return Keys.GetString(Keys.CannotCreateInitializeHistoryPage); - } - } - - public static string CannotResetOperator - { - get - { - return Keys.GetString(Keys.CannotResetOperator); - } - } - - public static string AlertList - { - get - { - return Keys.GetString(Keys.AlertList); - } - } - - public static string JobList - { - get - { - return Keys.GetString(Keys.JobList); - } - } - - public static string Email - { - get - { - return Keys.GetString(Keys.Email); - } - } - - public static string Pager - { - get - { - return Keys.GetString(Keys.Pager); - } - } - - public static string AlertName - { - get - { - return Keys.GetString(Keys.AlertName); - } - } - - public static string JobName - { - get - { - return Keys.GetString(Keys.JobName); - } - } - - public static string Always - { - get - { - return Keys.GetString(Keys.Always); - } - } - - public static string Never - { - get - { - return Keys.GetString(Keys.Never); - } - } - - public static string OnFailure - { - get - { - return Keys.GetString(Keys.OnFailure); - } - } - - public static string OnSuccess - { - get - { - return Keys.GetString(Keys.OnSuccess); - } - } - - public static string CannotModifyAlerts - { - get - { - return Keys.GetString(Keys.CannotModifyAlerts); - } - } - - public static string CannotCreateScriptForModifyAlerts - { - get - { - return Keys.GetString(Keys.CannotCreateScriptForModifyAlerts); - } - } - public static string CategoryLocal { get @@ -4469,6 +2837,38 @@ namespace Microsoft.SqlTools.ServiceLayer } } + public static string JobServerIsNotAvailable + { + get + { + return Keys.GetString(Keys.JobServerIsNotAvailable); + } + } + + public static string NeverBackedUp + { + get + { + return Keys.GetString(Keys.NeverBackedUp); + } + } + + public static string Error_InvalidDirectoryName + { + get + { + return Keys.GetString(Keys.Error_InvalidDirectoryName); + } + } + + public static string Error_ExistingDirectoryName + { + get + { + return Keys.GetString(Keys.Error_ExistingDirectoryName); + } + } + public static string ConnectionServiceListDbErrorNotConnected(string uri) { return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri); @@ -4584,151 +2984,6 @@ namespace Microsoft.SqlTools.ServiceLayer return Keys.GetString(Keys.SessionAlreadyExists, sessionName); } - public static string EnableAlertsTitle(String serverName) - { - return Keys.GetString(Keys.EnableAlertsTitle, serverName); - } - - public static string EnableAlertDescription(String alertName) - { - return Keys.GetString(Keys.EnableAlertDescription, alertName); - } - - public static string EnablingAlert(String alertName) - { - return Keys.GetString(Keys.EnablingAlert, alertName); - } - - public static string EnabledAlert(String alertName) - { - return Keys.GetString(Keys.EnabledAlert, alertName); - } - - public static string DisableAlertsTitle(String serverName) - { - return Keys.GetString(Keys.DisableAlertsTitle, serverName); - } - - public static string DisableAlertDescription(String alertName) - { - return Keys.GetString(Keys.DisableAlertDescription, alertName); - } - - public static string DisablingAlert(String alertName) - { - return Keys.GetString(Keys.DisablingAlert, alertName); - } - - public static string DisabledAlert(String alertName) - { - return Keys.GetString(Keys.DisabledAlert, alertName); - } - - public static string EnableJobsTitle(String serverName) - { - return Keys.GetString(Keys.EnableJobsTitle, serverName); - } - - public static string EnableJobDescription(String jobName) - { - return Keys.GetString(Keys.EnableJobDescription, jobName); - } - - public static string EnablingJob(String jobName) - { - return Keys.GetString(Keys.EnablingJob, jobName); - } - - public static string EnabledJob(String jobName) - { - return Keys.GetString(Keys.EnabledJob, jobName); - } - - public static string DisableJobsTitle(String serverName) - { - return Keys.GetString(Keys.DisableJobsTitle, serverName); - } - - public static string DisableJobDescription(String jobName) - { - return Keys.GetString(Keys.DisableJobDescription, jobName); - } - - public static string DisablingJob(String jobName) - { - return Keys.GetString(Keys.DisablingJob, jobName); - } - - public static string DisabledJob(String jobName) - { - return Keys.GetString(Keys.DisabledJob, jobName); - } - - public static string StartJobsTitle(String serverName) - { - return Keys.GetString(Keys.StartJobsTitle, serverName); - } - - public static string StartJobDescription(String jobName) - { - return Keys.GetString(Keys.StartJobDescription, jobName); - } - - public static string GettingStartStep(String jobName) - { - return Keys.GetString(Keys.GettingStartStep, jobName); - } - - public static string StartingJob(String jobName) - { - return Keys.GetString(Keys.StartingJob, jobName); - } - - public static string StartJobWithStep(String jobName, String stepName) - { - return Keys.GetString(Keys.StartJobWithStep, jobName, stepName); - } - - public static string ExecuteJob(string jobName) - { - return Keys.GetString(Keys.ExecuteJob, jobName); - } - - public static string JobFailed(string jobName) - { - return Keys.GetString(Keys.JobFailed, jobName); - } - - public static string StopJobsTitle(String serverName) - { - return Keys.GetString(Keys.StopJobsTitle, serverName); - } - - public static string StopJobDescription(String jobName) - { - return Keys.GetString(Keys.StopJobDescription, jobName); - } - - public static string StoppingJob(String jobName) - { - return Keys.GetString(Keys.StoppingJob, jobName); - } - - public static string StoppedJob(String jobName) - { - return Keys.GetString(Keys.StoppedJob, jobName); - } - - public static string UnknownSeverity(int severity) - { - return Keys.GetString(Keys.UnknownSeverity, severity); - } - - public static string OperatorProperties(string operatorName) - { - return Keys.GetString(Keys.OperatorProperties, operatorName); - } - public static string UnknownSizeUnit(string unit) { return Keys.GetString(Keys.UnknownSizeUnit, unit); @@ -5066,93 +3321,18 @@ namespace Microsoft.SqlTools.ServiceLayer public const string EditDataIncorrectTable = "EditDataIncorrectTable"; - public const string EE_BatchSqlMessageNoProcedureInfo = "EE_BatchSqlMessageNoProcedureInfo"; - - - public const string EE_BatchSqlMessageWithProcedureInfo = "EE_BatchSqlMessageWithProcedureInfo"; - - - public const string EE_BatchSqlMessageNoLineInfo = "EE_BatchSqlMessageNoLineInfo"; - - - public const string EE_BatchError_Exception = "EE_BatchError_Exception"; - - - public const string EE_BatchExecutionInfo_RowsAffected = "EE_BatchExecutionInfo_RowsAffected"; - - - public const string EE_ExecutionNotYetCompleteError = "EE_ExecutionNotYetCompleteError"; - - - public const string EE_ScriptError_Error = "EE_ScriptError_Error"; - - - public const string EE_ScriptError_ParsingSyntax = "EE_ScriptError_ParsingSyntax"; - - - public const string EE_ScriptError_FatalError = "EE_ScriptError_FatalError"; - - - public const string EE_ExecutionInfo_FinalizingLoop = "EE_ExecutionInfo_FinalizingLoop"; - - - public const string EE_ExecutionInfo_QueryCancelledbyUser = "EE_ExecutionInfo_QueryCancelledbyUser"; - - - public const string EE_BatchExecutionError_Halting = "EE_BatchExecutionError_Halting"; + public const string EE_ExecutionInfo_InitializingLoop = "EE_ExecutionInfo_InitializingLoop"; public const string EE_BatchExecutionError_Ignoring = "EE_BatchExecutionError_Ignoring"; - public const string EE_ExecutionInfo_InitializingLoop = "EE_ExecutionInfo_InitializingLoop"; - - - public const string EE_ExecutionError_CommandNotSupported = "EE_ExecutionError_CommandNotSupported"; - - - public const string EE_ExecutionError_VariableNotFound = "EE_ExecutionError_VariableNotFound"; - - - public const string BatchParserWrapperExecutionEngineError = "BatchParserWrapperExecutionEngineError"; + public const string EE_ExecutionInfo_FinalizingLoop = "EE_ExecutionInfo_FinalizingLoop"; public const string BatchParserWrapperExecutionError = "BatchParserWrapperExecutionError"; - public const string BatchParserWrapperExecutionEngineBatchMessage = "BatchParserWrapperExecutionEngineBatchMessage"; - - - public const string BatchParserWrapperExecutionEngineBatchResultSetProcessing = "BatchParserWrapperExecutionEngineBatchResultSetProcessing"; - - - public const string BatchParserWrapperExecutionEngineBatchResultSetFinished = "BatchParserWrapperExecutionEngineBatchResultSetFinished"; - - - public const string BatchParserWrapperExecutionEngineBatchCancelling = "BatchParserWrapperExecutionEngineBatchCancelling"; - - - public const string EE_ScriptError_Warning = "EE_ScriptError_Warning"; - - - public const string TroubleshootingAssistanceMessage = "TroubleshootingAssistanceMessage"; - - - public const string BatchParser_CircularReference = "BatchParser_CircularReference"; - - - public const string BatchParser_CommentNotTerminated = "BatchParser_CommentNotTerminated"; - - - public const string BatchParser_StringNotTerminated = "BatchParser_StringNotTerminated"; - - - public const string BatchParser_IncorrectSyntax = "BatchParser_IncorrectSyntax"; - - - public const string BatchParser_VariableNotDefined = "BatchParser_VariableNotDefined"; - - public const string TestLocalizationConstant = "TestLocalizationConstant"; @@ -5747,351 +3927,6 @@ namespace Microsoft.SqlTools.ServiceLayer public const string ScriptingExecuteNotSupportedError = "ScriptingExecuteNotSupportedError"; - public const string unavailable = "unavailable"; - - - public const string filegroup_dialog_defaultFilegroup = "filegroup_dialog_defaultFilegroup"; - - - public const string filegroup_dialog_title = "filegroup_dialog_title"; - - - public const string filegroups_default = "filegroups_default"; - - - public const string filegroups_files = "filegroups_files"; - - - public const string filegroups_name = "filegroups_name"; - - - public const string filegroups_readonly = "filegroups_readonly"; - - - public const string general_autogrowth = "general_autogrowth"; - - - public const string general_builderText = "general_builderText"; - - - public const string general_default = "general_default"; - - - public const string general_fileGroup = "general_fileGroup"; - - - public const string general_fileName = "general_fileName"; - - - public const string general_fileType = "general_fileType"; - - - public const string general_initialSize = "general_initialSize"; - - - public const string general_newFilegroup = "general_newFilegroup"; - - - public const string general_path = "general_path"; - - - public const string general_physicalFileName = "general_physicalFileName"; - - - public const string general_rawDevice = "general_rawDevice"; - - - public const string general_recoveryModel_bulkLogged = "general_recoveryModel_bulkLogged"; - - - public const string general_recoveryModel_full = "general_recoveryModel_full"; - - - public const string general_recoveryModel_simple = "general_recoveryModel_simple"; - - - public const string general_titleSearchOwner = "general_titleSearchOwner"; - - - public const string prototype_autogrowth_disabled = "prototype_autogrowth_disabled"; - - - public const string prototype_autogrowth_restrictedGrowthByMB = "prototype_autogrowth_restrictedGrowthByMB"; - - - public const string prototype_autogrowth_restrictedGrowthByPercent = "prototype_autogrowth_restrictedGrowthByPercent"; - - - public const string prototype_autogrowth_unrestrictedGrowthByMB = "prototype_autogrowth_unrestrictedGrowthByMB"; - - - public const string prototype_autogrowth_unrestrictedGrowthByPercent = "prototype_autogrowth_unrestrictedGrowthByPercent"; - - - public const string prototype_autogrowth_unlimitedfilestream = "prototype_autogrowth_unlimitedfilestream"; - - - public const string prototype_autogrowth_limitedfilestream = "prototype_autogrowth_limitedfilestream"; - - - public const string prototype_db_category_automatic = "prototype_db_category_automatic"; - - - public const string prototype_db_category_servicebroker = "prototype_db_category_servicebroker"; - - - public const string prototype_db_category_collation = "prototype_db_category_collation"; - - - public const string prototype_db_category_cursor = "prototype_db_category_cursor"; - - - public const string prototype_db_category_misc = "prototype_db_category_misc"; - - - public const string prototype_db_category_recovery = "prototype_db_category_recovery"; - - - public const string prototype_db_category_state = "prototype_db_category_state"; - - - public const string prototype_db_prop_ansiNullDefault = "prototype_db_prop_ansiNullDefault"; - - - public const string prototype_db_prop_ansiNulls = "prototype_db_prop_ansiNulls"; - - - public const string prototype_db_prop_ansiPadding = "prototype_db_prop_ansiPadding"; - - - public const string prototype_db_prop_ansiWarnings = "prototype_db_prop_ansiWarnings"; - - - public const string prototype_db_prop_arithabort = "prototype_db_prop_arithabort"; - - - public const string prototype_db_prop_autoClose = "prototype_db_prop_autoClose"; - - - public const string prototype_db_prop_autoCreateStatistics = "prototype_db_prop_autoCreateStatistics"; - - - public const string prototype_db_prop_autoShrink = "prototype_db_prop_autoShrink"; - - - public const string prototype_db_prop_autoUpdateStatistics = "prototype_db_prop_autoUpdateStatistics"; - - - public const string prototype_db_prop_autoUpdateStatisticsAsync = "prototype_db_prop_autoUpdateStatisticsAsync"; - - - public const string prototype_db_prop_caseSensitive = "prototype_db_prop_caseSensitive"; - - - public const string prototype_db_prop_closeCursorOnCommit = "prototype_db_prop_closeCursorOnCommit"; - - - public const string prototype_db_prop_collation = "prototype_db_prop_collation"; - - - public const string prototype_db_prop_concatNullYieldsNull = "prototype_db_prop_concatNullYieldsNull"; - - - public const string prototype_db_prop_databaseCompatibilityLevel = "prototype_db_prop_databaseCompatibilityLevel"; - - - public const string prototype_db_prop_databaseState = "prototype_db_prop_databaseState"; - - - public const string prototype_db_prop_defaultCursor = "prototype_db_prop_defaultCursor"; - - - public const string prototype_db_prop_fullTextIndexing = "prototype_db_prop_fullTextIndexing"; - - - public const string prototype_db_prop_numericRoundAbort = "prototype_db_prop_numericRoundAbort"; - - - public const string prototype_db_prop_pageVerify = "prototype_db_prop_pageVerify"; - - - public const string prototype_db_prop_quotedIdentifier = "prototype_db_prop_quotedIdentifier"; - - - public const string prototype_db_prop_readOnly = "prototype_db_prop_readOnly"; - - - public const string prototype_db_prop_recursiveTriggers = "prototype_db_prop_recursiveTriggers"; - - - public const string prototype_db_prop_restrictAccess = "prototype_db_prop_restrictAccess"; - - - public const string prototype_db_prop_selectIntoBulkCopy = "prototype_db_prop_selectIntoBulkCopy"; - - - public const string prototype_db_prop_honorBrokerPriority = "prototype_db_prop_honorBrokerPriority"; - - - public const string prototype_db_prop_serviceBrokerGuid = "prototype_db_prop_serviceBrokerGuid"; - - - public const string prototype_db_prop_brokerEnabled = "prototype_db_prop_brokerEnabled"; - - - public const string prototype_db_prop_truncateLogOnCheckpoint = "prototype_db_prop_truncateLogOnCheckpoint"; - - - public const string prototype_db_prop_dbChaining = "prototype_db_prop_dbChaining"; - - - public const string prototype_db_prop_trustworthy = "prototype_db_prop_trustworthy"; - - - public const string prototype_db_prop_dateCorrelationOptimization = "prototype_db_prop_dateCorrelationOptimization"; - - - public const string prototype_db_prop_parameterization = "prototype_db_prop_parameterization"; - - - public const string prototype_db_prop_parameterization_value_forced = "prototype_db_prop_parameterization_value_forced"; - - - public const string prototype_db_prop_parameterization_value_simple = "prototype_db_prop_parameterization_value_simple"; - - - public const string prototype_file_dataFile = "prototype_file_dataFile"; - - - public const string prototype_file_logFile = "prototype_file_logFile"; - - - public const string prototype_file_filestreamFile = "prototype_file_filestreamFile"; - - - public const string prototype_file_noFileGroup = "prototype_file_noFileGroup"; - - - public const string prototype_file_defaultpathstring = "prototype_file_defaultpathstring"; - - - public const string title_openConnectionsMustBeClosed = "title_openConnectionsMustBeClosed"; - - - public const string warning_openConnectionsMustBeClosed = "warning_openConnectionsMustBeClosed"; - - - public const string prototype_db_prop_databaseState_value_autoClosed = "prototype_db_prop_databaseState_value_autoClosed"; - - - public const string prototype_db_prop_databaseState_value_emergency = "prototype_db_prop_databaseState_value_emergency"; - - - public const string prototype_db_prop_databaseState_value_inaccessible = "prototype_db_prop_databaseState_value_inaccessible"; - - - public const string prototype_db_prop_databaseState_value_normal = "prototype_db_prop_databaseState_value_normal"; - - - public const string prototype_db_prop_databaseState_value_offline = "prototype_db_prop_databaseState_value_offline"; - - - public const string prototype_db_prop_databaseState_value_recovering = "prototype_db_prop_databaseState_value_recovering"; - - - public const string prototype_db_prop_databaseState_value_recoveryPending = "prototype_db_prop_databaseState_value_recoveryPending"; - - - public const string prototype_db_prop_databaseState_value_restoring = "prototype_db_prop_databaseState_value_restoring"; - - - public const string prototype_db_prop_databaseState_value_shutdown = "prototype_db_prop_databaseState_value_shutdown"; - - - public const string prototype_db_prop_databaseState_value_standby = "prototype_db_prop_databaseState_value_standby"; - - - public const string prototype_db_prop_databaseState_value_suspect = "prototype_db_prop_databaseState_value_suspect"; - - - public const string prototype_db_prop_defaultCursor_value_global = "prototype_db_prop_defaultCursor_value_global"; - - - public const string prototype_db_prop_defaultCursor_value_local = "prototype_db_prop_defaultCursor_value_local"; - - - public const string prototype_db_prop_restrictAccess_value_multiple = "prototype_db_prop_restrictAccess_value_multiple"; - - - public const string prototype_db_prop_restrictAccess_value_restricted = "prototype_db_prop_restrictAccess_value_restricted"; - - - public const string prototype_db_prop_restrictAccess_value_single = "prototype_db_prop_restrictAccess_value_single"; - - - public const string prototype_db_prop_pageVerify_value_checksum = "prototype_db_prop_pageVerify_value_checksum"; - - - public const string prototype_db_prop_pageVerify_value_none = "prototype_db_prop_pageVerify_value_none"; - - - public const string prototype_db_prop_pageVerify_value_tornPageDetection = "prototype_db_prop_pageVerify_value_tornPageDetection"; - - - public const string prototype_db_prop_varDecimalEnabled = "prototype_db_prop_varDecimalEnabled"; - - - public const string compatibilityLevel_katmai = "compatibilityLevel_katmai"; - - - public const string prototype_db_prop_encryptionEnabled = "prototype_db_prop_encryptionEnabled"; - - - public const string prototype_db_prop_databasescopedconfig_value_off = "prototype_db_prop_databasescopedconfig_value_off"; - - - public const string prototype_db_prop_databasescopedconfig_value_on = "prototype_db_prop_databasescopedconfig_value_on"; - - - public const string prototype_db_prop_databasescopedconfig_value_primary = "prototype_db_prop_databasescopedconfig_value_primary"; - - - public const string error_db_prop_invalidleadingColumns = "error_db_prop_invalidleadingColumns"; - - - public const string compatibilityLevel_denali = "compatibilityLevel_denali"; - - - public const string compatibilityLevel_sql14 = "compatibilityLevel_sql14"; - - - public const string compatibilityLevel_sql15 = "compatibilityLevel_sql15"; - - - public const string compatibilityLevel_sqlvNext = "compatibilityLevel_sqlvNext"; - - - public const string general_containmentType_None = "general_containmentType_None"; - - - public const string general_containmentType_Partial = "general_containmentType_Partial"; - - - public const string filegroups_filestreamFiles = "filegroups_filestreamFiles"; - - - public const string prototype_file_noApplicableFileGroup = "prototype_file_noApplicableFileGroup"; - - - public const string NeverBackedUp = "NeverBackedUp"; - - - public const string Error_InvalidDirectoryName = "Error_InvalidDirectoryName"; - - - public const string Error_ExistingDirectoryName = "Error_ExistingDirectoryName"; - - public const string BackupTaskName = "BackupTaskName"; @@ -6209,285 +4044,6 @@ namespace Microsoft.SqlTools.ServiceLayer public const string SessionAlreadyExists = "SessionAlreadyExists"; - public const string EnableAlertsTitle = "EnableAlertsTitle"; - - - public const string EnableAlertDescription = "EnableAlertDescription"; - - - public const string EnablingAlert = "EnablingAlert"; - - - public const string EnabledAlert = "EnabledAlert"; - - - public const string DisableAlertsTitle = "DisableAlertsTitle"; - - - public const string DisableAlertDescription = "DisableAlertDescription"; - - - public const string DisablingAlert = "DisablingAlert"; - - - public const string DisabledAlert = "DisabledAlert"; - - - public const string EnableJobsTitle = "EnableJobsTitle"; - - - public const string EnableJobDescription = "EnableJobDescription"; - - - public const string EnablingJob = "EnablingJob"; - - - public const string EnabledJob = "EnabledJob"; - - - public const string DisableJobsTitle = "DisableJobsTitle"; - - - public const string DisableJobDescription = "DisableJobDescription"; - - - public const string DisablingJob = "DisablingJob"; - - - public const string DisabledJob = "DisabledJob"; - - - public const string StartJobsTitle = "StartJobsTitle"; - - - public const string StartJobDescription = "StartJobDescription"; - - - public const string GettingStartStep = "GettingStartStep"; - - - public const string UserCancelledSelectStep = "UserCancelledSelectStep"; - - - public const string StartingJob = "StartingJob"; - - - public const string StartJobWithStep = "StartJobWithStep"; - - - public const string RequestPostedToTargetServers = "RequestPostedToTargetServers"; - - - public const string ExecuteJob = "ExecuteJob"; - - - public const string JobFailed = "JobFailed"; - - - public const string Executing = "Executing"; - - - public const string BetweenRetries = "BetweenRetries"; - - - public const string Suspended = "Suspended"; - - - public const string PerformingCompletionAction = "PerformingCompletionAction"; - - - public const string WaitingForStepToFinish = "WaitingForStepToFinish"; - - - public const string WaitingForWorkerThread = "WaitingForWorkerThread"; - - - public const string StopJobsTitle = "StopJobsTitle"; - - - public const string StopJobDescription = "StopJobDescription"; - - - public const string StoppingJob = "StoppingJob"; - - - public const string StoppedJob = "StoppedJob"; - - - public const string AllDatabases = "AllDatabases"; - - - public const string UnknownSeverity = "UnknownSeverity"; - - - public const string Severity001 = "Severity001"; - - - public const string Severity002 = "Severity002"; - - - public const string Severity003 = "Severity003"; - - - public const string Severity004 = "Severity004"; - - - public const string Severity005 = "Severity005"; - - - public const string Severity006 = "Severity006"; - - - public const string Severity007 = "Severity007"; - - - public const string Severity008 = "Severity008"; - - - public const string Severity009 = "Severity009"; - - - public const string Severity010 = "Severity010"; - - - public const string Severity011 = "Severity011"; - - - public const string Severity012 = "Severity012"; - - - public const string Severity013 = "Severity013"; - - - public const string Severity014 = "Severity014"; - - - public const string Severity015 = "Severity015"; - - - public const string Severity016 = "Severity016"; - - - public const string Severity017 = "Severity017"; - - - public const string Severity018 = "Severity018"; - - - public const string Severity019 = "Severity019"; - - - public const string Severity020 = "Severity020"; - - - public const string Severity021 = "Severity021"; - - - public const string Severity022 = "Severity022"; - - - public const string Severity023 = "Severity023"; - - - public const string Severity024 = "Severity024"; - - - public const string Severity025 = "Severity025"; - - - public const string PagerScheduleMonFri = "PagerScheduleMonFri"; - - - public const string PagerScheduleSatSun = "PagerScheduleSatSun"; - - - public const string PagerScheduleWarning = "PagerScheduleWarning"; - - - public const string General = "General"; - - - public const string Notifications = "Notifications"; - - - public const string History = "History"; - - - public const string Day = "Day"; - - - public const string StartTime = "StartTime"; - - - public const string EndTime = "EndTime"; - - - public const string ColumnIndexIsInvalid = "ColumnIndexIsInvalid"; - - - public const string RowIndexIsInvalid = "RowIndexIsInvalid"; - - - public const string NewOperatorProperties = "NewOperatorProperties"; - - - public const string OperatorProperties = "OperatorProperties"; - - - public const string FailedToCreateInitializeAgentOperatorDialog = "FailedToCreateInitializeAgentOperatorDialog"; - - - public const string JobServerIsNotAvailable = "JobServerIsNotAvailable"; - - - public const string CannotCreateInitializeGeneralPage = "CannotCreateInitializeGeneralPage"; - - - public const string CannotCreateInitializeNotificationsPage = "CannotCreateInitializeNotificationsPage"; - - - public const string CannotCreateInitializeHistoryPage = "CannotCreateInitializeHistoryPage"; - - - public const string CannotResetOperator = "CannotResetOperator"; - - - public const string AlertList = "AlertList"; - - - public const string JobList = "JobList"; - - - public const string Email = "Email"; - - - public const string Pager = "Pager"; - - - public const string AlertName = "AlertName"; - - - public const string JobName = "JobName"; - - - public const string Always = "Always"; - - - public const string Never = "Never"; - - - public const string OnFailure = "OnFailure"; - - - public const string OnSuccess = "OnSuccess"; - - - public const string CannotModifyAlerts = "CannotModifyAlerts"; - - - public const string CannotCreateScriptForModifyAlerts = "CannotCreateScriptForModifyAlerts"; - - public const string CategoryLocal = "CategoryLocal"; @@ -6614,6 +4170,18 @@ namespace Microsoft.SqlTools.ServiceLayer public const string ScheduleNameAlreadyExists = "ScheduleNameAlreadyExists"; + public const string JobServerIsNotAvailable = "JobServerIsNotAvailable"; + + + public const string NeverBackedUp = "NeverBackedUp"; + + + public const string Error_InvalidDirectoryName = "Error_InvalidDirectoryName"; + + + public const string Error_ExistingDirectoryName = "Error_ExistingDirectoryName"; + + private Keys() { } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx index a8e68a33..2d48d7b1 100755 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx @@ -527,122 +527,22 @@ . Parameters: 0 - tableName (string) - - Msg {0}, Level {1}, State {2}, Line {3} - - - - Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} - - - - Msg {0}, Level {1}, State {2} - - - - An error occurred while the batch was being processed. The error message is: {0} - - - - ({0} row(s) affected) - - - - The previous execution is not yet complete. - - - - A scripting error occurred. - - - - Incorrect syntax was encountered while {0} was being parsed. - - - - A fatal error occurred. - - - - Batch execution completed {0} times... - - - - You cancelled the query. - - - - An error occurred while the batch was being executed. + + Beginning execution loop An error occurred while the batch was being executed, but the error has been ignored. - - Beginning execution loop - - - - Command {0} is not supported. - - - - The variable {0} could not be found. - - - - SQL Execution error: {0} + + Batch execution completed {0} times... Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} - - Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} - - - - Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} - - - - Batch parser wrapper execution engine batch ResultSet finished. - - - - Canceling batch parser wrapper batch execution. - - - - Scripting warning. - - - - For more information about this error, see the troubleshooting topics in the product documentation. - - - - File '{0}' recursively included. - - - - Missing end comment mark '*/'. - - - - Unclosed quotation mark after the character string. - - - - Incorrect syntax was encountered while parsing '{0}'. - - - - Variable {0} is not defined. - - test @@ -1435,466 +1335,6 @@ Scripting as Execute is only supported for Stored Procedures - - Unavailable - - - - Current default filegroup: {0} - - - - New Filegroup for {0} - - - - Default - - - - Files - - - - Name - - - - Read-Only - - - - Autogrowth / Maxsize - - - - ... - - - - <default> - - - - Filegroup - - - - Logical Name - - - - File Type - - - - Initial Size (MB) - - - - <new filegroup> - - - - Path - - - - File Name - - - - <raw device> - - - - Bulk-logged - - - - Full - - - - Simple - - - - Select Database Owner - - - - None - - - - By {0} MB, Limited to {1} MB - - - - By {0} percent, Limited to {1} MB - - - - By {0} MB, Unlimited - - - - By {0} percent, Unlimited - - - - Unlimited - - - - Limited to {0} MB - - - - Automatic - - - - Service Broker - - - - Collation - - - - Cursor - - - - Miscellaneous - - - - Recovery - - - - State - - - - ANSI NULL Default - - - - ANSI NULLS Enabled - - - - ANSI Padding Enabled - - - - ANSI Warnings Enabled - - - - Arithmetic Abort Enabled - - - - Auto Close - - - - Auto Create Statistics - - - - Auto Shrink - - - - Auto Update Statistics - - - - Auto Update Statistics Asynchronously - - - - Case Sensitive - - - - Close Cursor on Commit Enabled - - - - Collation - - - - Concatenate Null Yields Null - - - - Database Compatibility Level - - - - Database State - - - - Default Cursor - - - - Full-Text Indexing Enabled - - - - Numeric Round-Abort - - - - Page Verify - - - - Quoted Identifiers Enabled - - - - Database Read-Only - - - - Recursive Triggers Enabled - - - - Restrict Access - - - - Select Into/Bulk Copy - - - - Honor Broker Priority - - - - Service Broker Identifier - - - - Broker Enabled - - - - Truncate Log on Checkpoint - - - - Cross-database Ownership Chaining Enabled - - - - Trustworthy - - - - Date Correlation Optimization Enabled - - - - Parameterization - - - - Forced - - - - Simple - - - - ROWS Data - - - - LOG - - - - FILESTREAM Data - - - - Not Applicable - - - - <default path> - - - - Open Connections - - - - To change the database properties, SQL Server must close all other connections to the database_ Are you sure you want to change the properties and close all other connections? - - - - AUTO_CLOSED - - - - EMERGENCY - - - - INACCESSIBLE - - - - NORMAL - - - - OFFLINE - - - - RECOVERING - - - - RECOVERY PENDING - - - - RESTORING - - - - SHUTDOWN - - - - STANDBY - - - - SUSPECT - - - - GLOBAL - - - - LOCAL - - - - MULTI_USER - - - - RESTRICTED_USER - - - - SINGLE_USER - - - - CHECKSUM - - - - NONE - - - - TORN_PAGE_DETECTION - - - - VarDecimal Storage Format Enabled - - - - SQL Server 2008 (100) - - - - Encryption Enabled - - - - OFF - - - - ON - - - - PRIMARY - - - - For the distribution policy HASH, the number of leading hash columns is optional but should be from 1 to 16 columns - - - - SQL Server 2012 (110) - - - - SQL Server 2014 (120) - - - - SQL Server 2016 (130) - - - - SQL Server vNext (140) - - - - None - - - - Partial - - - - FILESTREAM Files - - - - No Applicable Filegroup - - - - Never - - - - Path {0} is not a valid directory - - - - For directory {0} a file with name {1} already exists - - Backup Database @@ -2056,407 +1496,6 @@ . Parameters: 0 - sessionName (String) - - Enable Alerts - {0} - . - Parameters: 0 - serverName (String) - - - Enable Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Enabling Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Enabled Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Disable Alerts - {0} - . - Parameters: 0 - serverName (String) - - - Disable Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Disabling Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Disabled Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Enable Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Enable Job '{0}' - . - Parameters: 0 - jobName (String) - - - Enabling Job '{0}' - . - Parameters: 0 - jobName (String) - - - Enabled Job '{0}' - . - Parameters: 0 - jobName (String) - - - Disable Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Disable Job '{0}' - . - Parameters: 0 - jobName (String) - - - Disabling Job '{0}' - . - Parameters: 0 - jobName (String) - - - Disabled Job '{0}' - . - Parameters: 0 - jobName (String) - - - Start Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Start Job '{0}' - . - Parameters: 0 - jobName (String) - - - Job '{0}' has more than one step. Getting step to start - . - Parameters: 0 - jobName (String) - - - User canceled select step. Job will not be started - - - - Starting Job '{0}' - . - Parameters: 0 - jobName (String) - - - Start Job '{0}' with step '{1}' - . - Parameters: 0 - jobName (String), 1 - stepName (String) - - - Posted remote job execution request - - - - Execute job '{0}' - . - Parameters: 0 - jobName (string) - - - Execution of job '{0}' failed. See the history log for details. - . - Parameters: 0 - jobName (string) - - - Executing - - - - Between retries - - - - Suspended - - - - Performing completion action - - - - Waiting for step to finish - - - - Waiting for worker thread - - - - Stop Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Stop Job '{0}' - . - Parameters: 0 - jobName (String) - - - Stopping Job '{0}' - . - Parameters: 0 - jobName (String) - - - Stopped Job '{0}' - . - Parameters: 0 - jobName (String) - - - <all databases> - First item in database name drop down list - - - Unknown severity: {0} - Exception thrown when agent alert has unknown severity level. - Parameters: 0 - severity (int) - - - 001 - Miscellaneous System Information - - - - 002 - Reserved - - - - 003 - Reserved - - - - 004 - Reserved - - - - 005 - Reserved - - - - 006 - Reserved - - - - 007 - Notification: Status Information - - - - 008 - Notification: User Intervention Required - - - - 009 - User Defined - - - - 010 - Information - - - - 011 - Specified Database Object Not Found - - - - 012 - Unused - - - - 013 - User Transaction Syntax Error - - - - 014 - Insufficient Permission - - - - 015 - Syntax Error in SQL Statements - - - - 016 - Miscellaneous User Error - - - - 017 - Insufficient Resources - - - - 018 - Nonfatal Internal Error - - - - 019 - Fatal Error in Resource - - - - 020 - Fatal Error in Current Process - - - - 021 - Fatal Error in Database Processes - - - - 022 - Fatal Error: Table Integrity Suspect - - - - 023 - Fatal Error: Database Integrity Suspect - - - - 024 - Fatal Error: Hardware Error - - - - 025 - Fatal Error - - - - Pager schedule end time is earlier than start time on Mon-Fri. Do you want to continue? - Message box that displayed if start time is more than end time on Mon-Fri - - - Pager schedule end time is earlier than start time on Sat-Sun. Do you want to continue? - Message box that displayed if start time is more than end time on Sat-Sun - - - Pager schedule warning - Message box caption - - - General - Tree node name - - - Notifications - Tree node name - - - History - Tree node name - - - Day - Pager schedule grid column name - - - Start Time - Pager schedule grid column name - - - End Time - Pager schedule grid column name - - - Column index is invalid. - Exception thrown when column index is invalid - - - Row index is invalid. - Exception thrown when row index is invalid - - - New Operator - Name of the operator dialog in create new operator mode - - - {0} Properties - Name of the operator dialog in modify operator mode. - Parameters: 0 - operatorName (string) - - - Unable to create/initialize Agent Operator dialog. - Exception thrown when dialog cannot be created/intialized. - - - Job server is not available. - Exception thrown when job server is not available - - - Cannot create/initialize General page. - Exception thrown when we cannot create/initialize agent operators general page - - - Cannot create/initialize Notifications page. - Exception thrown when we cannot create/initialize agent operators notifications page - - - Cannot create/initialize History page. - Exception thrown when we cannot create/initialize agent operators history page - - - Cannot reset operator. - Exception throw when dialog cannot refresh operator - - - Alert list: - Name of label on notifications page - - - Job list: - Name of label on notifications page - - - E-mail - Name of column on notifications page - - - Pager - Name of column on notifications page - - - Alert name - Name of column on notifications page - - - Job name - Name of column on notifications page - - - Always - Completion Action - - - Never - Completion Action - - - On failure - Completion Action - - - On success - Completion Action - - - Cannot modify alerts. - Exception thrown when we cannot modify alerts - - - Cannot create script for modify alerts. - Exception thrown when we cannot create script that modify alerts - [Uncategorized (Local)] job categories @@ -2632,4 +1671,20 @@ . Parameters: 0 - scheduleName (string) + + Job server is not available + Exception thrown when job server is not available + + + Never + + + + Path {0} is not a valid directory + + + + For directory {0} a file with name {1} already exist + + diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings index a3c49b8c..7931948a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings @@ -249,64 +249,14 @@ EditDataIncorrectTable(string tableName) = EditData queries must query the origi ############################################################################ # DacFx Resources -EE_BatchSqlMessageNoProcedureInfo = Msg {0}, Level {1}, State {2}, Line {3} - -EE_BatchSqlMessageWithProcedureInfo = Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} - -EE_BatchSqlMessageNoLineInfo = Msg {0}, Level {1}, State {2} - -EE_BatchError_Exception = An error occurred while the batch was being processed. The error message is: {0} - -EE_BatchExecutionInfo_RowsAffected = ({0} row(s) affected) - -EE_ExecutionNotYetCompleteError = The previous execution is not yet complete. - -EE_ScriptError_Error = A scripting error occurred. - -EE_ScriptError_ParsingSyntax = Incorrect syntax was encountered while {0} was being parsed. - -EE_ScriptError_FatalError = A fatal error occurred. - -EE_ExecutionInfo_FinalizingLoop = Batch execution completed {0} times... - -EE_ExecutionInfo_QueryCancelledbyUser = You cancelled the query. - -EE_BatchExecutionError_Halting = An error occurred while the batch was being executed. +EE_ExecutionInfo_InitializingLoop = Beginning execution loop EE_BatchExecutionError_Ignoring = An error occurred while the batch was being executed, but the error has been ignored. -EE_ExecutionInfo_InitializingLoop = Beginning execution loop - -EE_ExecutionError_CommandNotSupported = Command {0} is not supported. - -EE_ExecutionError_VariableNotFound = The variable {0} could not be found. - -BatchParserWrapperExecutionEngineError = SQL Execution error: {0} +EE_ExecutionInfo_FinalizingLoop = Batch execution completed {0} times... BatchParserWrapperExecutionError = Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} -BatchParserWrapperExecutionEngineBatchMessage = Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} - -BatchParserWrapperExecutionEngineBatchResultSetProcessing = Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} - -BatchParserWrapperExecutionEngineBatchResultSetFinished = Batch parser wrapper execution engine batch ResultSet finished. - -BatchParserWrapperExecutionEngineBatchCancelling = Canceling batch parser wrapper batch execution. - -EE_ScriptError_Warning = Scripting warning. - -TroubleshootingAssistanceMessage = For more information about this error, see the troubleshooting topics in the product documentation. - -BatchParser_CircularReference = File '{0}' recursively included. - -BatchParser_CommentNotTerminated = Missing end comment mark '*/'. - -BatchParser_StringNotTerminated = Unclosed quotation mark after the character string. - -BatchParser_IncorrectSyntax = Incorrect syntax was encountered while parsing '{0}'. - -BatchParser_VariableNotDefined = Variable {0} is not defined. - ############################################################################ # Workspace Service @@ -716,125 +666,6 @@ StoredProcedureScriptParameterComment = -- TODO: Set parameter values here. ScriptingGeneralError = An error occurred while scripting the objects. ScriptingExecuteNotSupportedError = Scripting as Execute is only supported for Stored Procedures -############################################################################ -# Admin Service - -unavailable = Unavailable -filegroup_dialog_defaultFilegroup = Current default filegroup: {0} -filegroup_dialog_title = New Filegroup for {0} -filegroups_default = Default -filegroups_files = Files -filegroups_name = Name -filegroups_readonly = Read-Only -general_autogrowth = Autogrowth / Maxsize -general_builderText = ... -general_default = <default> -general_fileGroup = Filegroup -general_fileName = Logical Name -general_fileType = File Type -general_initialSize = Initial Size (MB) -general_newFilegroup = <new filegroup> -general_path = Path -general_physicalFileName = File Name -general_rawDevice = <raw device> -general_recoveryModel_bulkLogged = Bulk-logged -general_recoveryModel_full = Full -general_recoveryModel_simple = Simple -general_titleSearchOwner = Select Database Owner - -prototype_autogrowth_disabled = None -prototype_autogrowth_restrictedGrowthByMB = By {0} MB, Limited to {1} MB -prototype_autogrowth_restrictedGrowthByPercent = By {0} percent, Limited to {1} MB -prototype_autogrowth_unrestrictedGrowthByMB = By {0} MB, Unlimited -prototype_autogrowth_unrestrictedGrowthByPercent = By {0} percent, Unlimited -prototype_autogrowth_unlimitedfilestream = Unlimited -prototype_autogrowth_limitedfilestream = Limited to {0} MB -prototype_db_category_automatic = Automatic -prototype_db_category_servicebroker = Service Broker -prototype_db_category_collation = Collation -prototype_db_category_cursor = Cursor -prototype_db_category_misc = Miscellaneous -prototype_db_category_recovery = Recovery -prototype_db_category_state = State -prototype_db_prop_ansiNullDefault = ANSI NULL Default -prototype_db_prop_ansiNulls = ANSI NULLS Enabled -prototype_db_prop_ansiPadding = ANSI Padding Enabled -prototype_db_prop_ansiWarnings = ANSI Warnings Enabled -prototype_db_prop_arithabort = Arithmetic Abort Enabled -prototype_db_prop_autoClose = Auto Close -prototype_db_prop_autoCreateStatistics = Auto Create Statistics -prototype_db_prop_autoShrink = Auto Shrink -prototype_db_prop_autoUpdateStatistics = Auto Update Statistics -prototype_db_prop_autoUpdateStatisticsAsync = Auto Update Statistics Asynchronously -prototype_db_prop_caseSensitive = Case Sensitive -prototype_db_prop_closeCursorOnCommit = Close Cursor on Commit Enabled -prototype_db_prop_collation = Collation -prototype_db_prop_concatNullYieldsNull = Concatenate Null Yields Null -prototype_db_prop_databaseCompatibilityLevel = Database Compatibility Level -prototype_db_prop_databaseState = Database State -prototype_db_prop_defaultCursor = Default Cursor -prototype_db_prop_fullTextIndexing = Full-Text Indexing Enabled -prototype_db_prop_numericRoundAbort = Numeric Round-Abort -prototype_db_prop_pageVerify = Page Verify -prototype_db_prop_quotedIdentifier = Quoted Identifiers Enabled -prototype_db_prop_readOnly = Database Read-Only -prototype_db_prop_recursiveTriggers = Recursive Triggers Enabled -prototype_db_prop_restrictAccess = Restrict Access -prototype_db_prop_selectIntoBulkCopy = Select Into/Bulk Copy -prototype_db_prop_honorBrokerPriority = Honor Broker Priority -prototype_db_prop_serviceBrokerGuid = Service Broker Identifier -prototype_db_prop_brokerEnabled = Broker Enabled -prototype_db_prop_truncateLogOnCheckpoint = Truncate Log on Checkpoint -prototype_db_prop_dbChaining = Cross-database Ownership Chaining Enabled -prototype_db_prop_trustworthy = Trustworthy -prototype_db_prop_dateCorrelationOptimization = Date Correlation Optimization Enabled -prototype_db_prop_parameterization = Parameterization -prototype_db_prop_parameterization_value_forced = Forced -prototype_db_prop_parameterization_value_simple = Simple -prototype_file_dataFile = ROWS Data -prototype_file_logFile = LOG -prototype_file_filestreamFile = FILESTREAM Data -prototype_file_noFileGroup = Not Applicable -prototype_file_defaultpathstring = <default path> -title_openConnectionsMustBeClosed = Open Connections -warning_openConnectionsMustBeClosed=To change the database properties, SQL Server must close all other connections to the database_ Are you sure you want to change the properties and close all other connections? -prototype_db_prop_databaseState_value_autoClosed = AUTO_CLOSED -prototype_db_prop_databaseState_value_emergency = EMERGENCY -prototype_db_prop_databaseState_value_inaccessible = INACCESSIBLE -prototype_db_prop_databaseState_value_normal = NORMAL -prototype_db_prop_databaseState_value_offline = OFFLINE -prototype_db_prop_databaseState_value_recovering = RECOVERING -prototype_db_prop_databaseState_value_recoveryPending = RECOVERY PENDING -prototype_db_prop_databaseState_value_restoring = RESTORING -prototype_db_prop_databaseState_value_shutdown=SHUTDOWN -prototype_db_prop_databaseState_value_standby = STANDBY -prototype_db_prop_databaseState_value_suspect = SUSPECT -prototype_db_prop_defaultCursor_value_global = GLOBAL -prototype_db_prop_defaultCursor_value_local = LOCAL -prototype_db_prop_restrictAccess_value_multiple = MULTI_USER -prototype_db_prop_restrictAccess_value_restricted = RESTRICTED_USER -prototype_db_prop_restrictAccess_value_single = SINGLE_USER -prototype_db_prop_pageVerify_value_checksum = CHECKSUM -prototype_db_prop_pageVerify_value_none = NONE -prototype_db_prop_pageVerify_value_tornPageDetection = TORN_PAGE_DETECTION -prototype_db_prop_varDecimalEnabled = VarDecimal Storage Format Enabled -compatibilityLevel_katmai = SQL Server 2008 (100) -prototype_db_prop_encryptionEnabled = Encryption Enabled -prototype_db_prop_databasescopedconfig_value_off = OFF -prototype_db_prop_databasescopedconfig_value_on = ON -prototype_db_prop_databasescopedconfig_value_primary = PRIMARY -error_db_prop_invalidleadingColumns = For the distribution policy HASH, the number of leading hash columns is optional but should be from 1 to 16 columns -compatibilityLevel_denali = SQL Server 2012 (110) -compatibilityLevel_sql14 = SQL Server 2014 (120) -compatibilityLevel_sql15 = SQL Server 2016 (130) -compatibilityLevel_sqlvNext = SQL Server vNext (140) -general_containmentType_None = None -general_containmentType_Partial = Partial -filegroups_filestreamFiles = FILESTREAM Files -prototype_file_noApplicableFileGroup = No Applicable Filegroup -NeverBackedUp = Never -Error_InvalidDirectoryName = Path {0} is not a valid directory -Error_ExistingDirectoryName = For directory {0} a file with name {1} already exists ############################################################################ # Backup Service @@ -895,146 +726,6 @@ StopSessionFailed(String error) = Failed to stop session: {0} SessionNotFound = Cannot find requested XEvent session SessionAlreadyExists(String sessionName) = An XEvent session named {0} already exists -############################################################################# -# SQL Agent -EnableAlertsTitle(String serverName) = Enable Alerts - {0} -EnableAlertDescription(String alertName) = Enable Alert '{0}' -EnablingAlert(String alertName) = Enabling Alert '{0}' -EnabledAlert(String alertName) = Enabled Alert '{0}' - -DisableAlertsTitle(String serverName) = Disable Alerts - {0} -DisableAlertDescription(String alertName) = Disable Alert '{0}' -DisablingAlert(String alertName) = Disabling Alert '{0}' -DisabledAlert(String alertName) = Disabled Alert '{0}' - -EnableJobsTitle(String serverName) = Enable Jobs - {0} -EnableJobDescription(String jobName) = Enable Job '{0}' -EnablingJob(String jobName) = Enabling Job '{0}' -EnabledJob(String jobName) = Enabled Job '{0}' - -DisableJobsTitle(String serverName) = Disable Jobs - {0} -DisableJobDescription(String jobName) = Disable Job '{0}' -DisablingJob(String jobName) = Disabling Job '{0}' -DisabledJob(String jobName) = Disabled Job '{0}' - -StartJobsTitle(String serverName) = Start Jobs - {0} -StartJobDescription(String jobName) = Start Job '{0}' -GettingStartStep(String jobName) = Job '{0}' has more than one step. Getting step to start -UserCancelledSelectStep = User canceled select step. Job will not be started -StartingJob(String jobName) = Starting Job '{0}' -StartJobWithStep(String jobName, String stepName) = Start Job '{0}' with step '{1}' -RequestPostedToTargetServers = Posted remote job execution request - -ExecuteJob(string jobName) = Execute job '{0}' -JobFailed(string jobName) = Execution of job '{0}' failed. See the history log for details. -Executing = Executing -BetweenRetries = Between retries -Suspended = Suspended -PerformingCompletionAction = Performing completion action -WaitingForStepToFinish = Waiting for step to finish -WaitingForWorkerThread = Waiting for worker thread - -StopJobsTitle(String serverName) = Stop Jobs - {0} -StopJobDescription(String jobName) = Stop Job '{0}' -StoppingJob(String jobName) = Stopping Job '{0}' -StoppedJob(String jobName) = Stopped Job '{0}' - -; First item in database name drop down list -AllDatabases = -; Exception thrown when agent alert has unknown severity level -UnknownSeverity(int severity) = Unknown severity: {0} - -#severity types -Severity001 = 001 - Miscellaneous System Information -Severity002 = 002 - Reserved -Severity003 = 003 - Reserved -Severity004 = 004 - Reserved -Severity005 = 005 - Reserved -Severity006 = 006 - Reserved -Severity007 = 007 - Notification: Status Information -Severity008 = 008 - Notification: User Intervention Required -Severity009 = 009 - User Defined -Severity010 = 010 - Information -Severity011 = 011 - Specified Database Object Not Found -Severity012 = 012 - Unused -Severity013 = 013 - User Transaction Syntax Error -Severity014 = 014 - Insufficient Permission -Severity015 = 015 - Syntax Error in SQL Statements -Severity016 = 016 - Miscellaneous User Error -Severity017 = 017 - Insufficient Resources -Severity018 = 018 - Nonfatal Internal Error -Severity019 = 019 - Fatal Error in Resource -Severity020 = 020 - Fatal Error in Current Process -Severity021 = 021 - Fatal Error in Database Processes -Severity022 = 022 - Fatal Error: Table Integrity Suspect -Severity023 = 023 - Fatal Error: Database Integrity Suspect -Severity024 = 024 - Fatal Error: Hardware Error -Severity025 = 025 - Fatal Error - -; Message box that displayed if start time is more than end time on Mon-Fri -PagerScheduleMonFri = Pager schedule end time is earlier than start time on Mon-Fri. Do you want to continue? -; Message box that displayed if start time is more than end time on Sat-Sun -PagerScheduleSatSun = Pager schedule end time is earlier than start time on Sat-Sun. Do you want to continue? -; Message box caption -PagerScheduleWarning = Pager schedule warning - -; Tree node name -General = General -; Tree node name -Notifications = Notifications -; Tree node name -History = History -; Pager schedule grid column name -Day = Day -; Pager schedule grid column name -StartTime = Start Time -; Pager schedule grid column name -EndTime = End Time -; Exception thrown when column index is invalid -ColumnIndexIsInvalid = Column index is invalid. -; Exception thrown when row index is invalid -RowIndexIsInvalid = Row index is invalid. -; Name of the operator dialog in create new operator mode -NewOperatorProperties = New Operator -; Name of the operator dialog in modify operator mode -OperatorProperties(string operatorName) = {0} Properties -; Exception thrown when dialog cannot be created/intialized. -FailedToCreateInitializeAgentOperatorDialog = Unable to create/initialize Agent Operator dialog. -; Exception thrown when job server is not available -JobServerIsNotAvailable = Job server is not available. -; Exception thrown when we cannot create/initialize agent operators general page -CannotCreateInitializeGeneralPage = Cannot create/initialize General page. -; Exception thrown when we cannot create/initialize agent operators notifications page -CannotCreateInitializeNotificationsPage = Cannot create/initialize Notifications page. -; Exception thrown when we cannot create/initialize agent operators history page -CannotCreateInitializeHistoryPage = Cannot create/initialize History page. -; Exception throw when dialog cannot refresh operator -CannotResetOperator = Cannot reset operator. - -; Name of label on notifications page -AlertList = Alert list: -; Name of label on notifications page -JobList = Job list: -; Name of column on notifications page -Email = E-mail -; Name of column on notifications page -Pager = Pager -; Name of column on notifications page -AlertName = Alert name -; Name of column on notifications page -JobName = Job name -; Completion Action -Always = Always -; Completion Action -Never = Never -; Completion Action -OnFailure = On failure -; Completion Action -OnSuccess = On success -; Exception thrown when we cannot modify alerts -CannotModifyAlerts = Cannot modify alerts. -; Exception thrown when we cannot create script that modify alerts -CannotCreateScriptForModifyAlerts = Cannot create script for modify alerts. ;job categories CategoryLocal = [Uncategorized (Local)] @@ -1081,4 +772,14 @@ StartDateGreaterThanEndDate = The job schedule starting date cannot be greater t StartTimeGreaterThanEndTime = The job schedule starting time cannot be after the ending time. EndTimeEqualToStartTime = The job schedule ending time must be after the starting time. InvalidStartDate = Start date must be on or after January 1, 1990. -ScheduleNameAlreadyExists(string scheduleName)=There is already a schedule named '{0}' for this job. You must specify a different name. \ No newline at end of file +ScheduleNameAlreadyExists(string scheduleName)=There is already a schedule named '{0}' for this job. You must specify a different name. + +; Exception thrown when job server is not available +JobServerIsNotAvailable = Job server is not available + +############################################################################ +# Admin Service + +NeverBackedUp = Never +Error_InvalidDirectoryName = Path {0} is not a valid directory +Error_ExistingDirectoryName = For directory {0} a file with name {1} already exist \ No newline at end of file diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf index b531bc1e..1076e99a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf @@ -269,151 +269,6 @@ . Parameters: 0 - sLine (int), 1 - sCol (int), 2 - eLine (int), 3 - eCol (int) - - Msg {0}, Level {1}, State {2}, Line {3} - Msg {0}, Level {1}, State {2}, Line {3} - - - - Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} - Msg {0}, Level {1}, State {2}, Procedure {3}, Line {4} - - - - Msg {0}, Level {1}, State {2} - Msg {0}, Level {1}, State {2} - - - - An error occurred while the batch was being processed. The error message is: {0} - An error occurred while the batch was being processed. The error message is: {0} - - - - ({0} row(s) affected) - ({0} row(s) affected) - - - - The previous execution is not yet complete. - The previous execution is not yet complete. - - - - A scripting error occurred. - A scripting error occurred. - - - - Incorrect syntax was encountered while {0} was being parsed. - Incorrect syntax was encountered while {0} was being parsed. - - - - A fatal error occurred. - A fatal error occurred. - - - - Batch execution completed {0} times... - Batch execution completed {0} times... - - - - You cancelled the query. - You cancelled the query. - - - - An error occurred while the batch was being executed. - An error occurred while the batch was being executed. - - - - An error occurred while the batch was being executed, but the error has been ignored. - An error occurred while the batch was being executed, but the error has been ignored. - - - - Beginning execution loop - Beginning execution loop - - - - Command {0} is not supported. - Command {0} is not supported. - - - - The variable {0} could not be found. - The variable {0} could not be found. - - - - SQL Execution error: {0} - SQL Execution error: {0} - - - - Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} - Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} - - - - Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} - Batch parser wrapper execution engine batch message received: Message: {0} Detailed message: {1} - - - - Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} - Batch parser wrapper execution engine batch ResultSet processing: DataReader.FieldCount: {0} DataReader.RecordsAffected: {1} - - - - Batch parser wrapper execution engine batch ResultSet finished. - Batch parser wrapper execution engine batch ResultSet finished. - - - - Canceling batch parser wrapper batch execution. - Canceling batch parser wrapper batch execution. - - - - Scripting warning. - Scripting warning. - - - - For more information about this error, see the troubleshooting topics in the product documentation. - For more information about this error, see the troubleshooting topics in the product documentation. - - - - File '{0}' recursively included. - File '{0}' recursively included. - - - - Missing end comment mark '*/'. - Missing end comment mark '*/'. - - - - Unclosed quotation mark after the character string. - Unclosed quotation mark after the character string. - - - - Incorrect syntax was encountered while parsing '{0}'. - Incorrect syntax was encountered while parsing '{0}'. - - - - Variable {0} is not defined. - Variable {0} is not defined. - - test test @@ -1542,561 +1397,6 @@ System-Versioned - - Unavailable - Unavailable - - - - Current default filegroup: {0} - Current default filegroup: {0} - - - - New Filegroup for {0} - New Filegroup for {0} - - - - Default - Default - - - - Files - Files - - - - Name - Name - - - - Read-Only - Read-Only - - - - Autogrowth / Maxsize - Autogrowth / Maxsize - - - - ... - ... - - - - <default> - <default> - - - - Filegroup - Filegroup - - - - Logical Name - Logical Name - - - - File Type - File Type - - - - Initial Size (MB) - Initial Size (MB) - - - - <new filegroup> - <new filegroup> - - - - Path - Path - - - - File Name - File Name - - - - <raw device> - <raw device> - - - - Bulk-logged - Bulk-logged - - - - Full - Full - - - - Simple - Simple - - - - Select Database Owner - Select Database Owner - - - - None - None - - - - By {0} MB, Limited to {1} MB - By {0} MB, Limited to {1} MB - - - - By {0} percent, Limited to {1} MB - By {0} percent, Limited to {1} MB - - - - By {0} MB, Unlimited - By {0} MB, Unlimited - - - - By {0} percent, Unlimited - By {0} percent, Unlimited - - - - Unlimited - Unlimited - - - - Limited to {0} MB - Limited to {0} MB - - - - Automatic - Automatic - - - - Service Broker - Service Broker - - - - Collation - Collation - - - - Cursor - Cursor - - - - Miscellaneous - Miscellaneous - - - - Recovery - Recovery - - - - State - State - - - - ANSI NULL Default - ANSI NULL Default - - - - ANSI NULLS Enabled - ANSI NULLS Enabled - - - - ANSI Padding Enabled - ANSI Padding Enabled - - - - ANSI Warnings Enabled - ANSI Warnings Enabled - - - - Arithmetic Abort Enabled - Arithmetic Abort Enabled - - - - Auto Close - Auto Close - - - - Auto Create Statistics - Auto Create Statistics - - - - Auto Shrink - Auto Shrink - - - - Auto Update Statistics - Auto Update Statistics - - - - Auto Update Statistics Asynchronously - Auto Update Statistics Asynchronously - - - - Case Sensitive - Case Sensitive - - - - Close Cursor on Commit Enabled - Close Cursor on Commit Enabled - - - - Collation - Collation - - - - Concatenate Null Yields Null - Concatenate Null Yields Null - - - - Database Compatibility Level - Database Compatibility Level - - - - Database State - Database State - - - - Default Cursor - Default Cursor - - - - Full-Text Indexing Enabled - Full-Text Indexing Enabled - - - - Numeric Round-Abort - Numeric Round-Abort - - - - Page Verify - Page Verify - - - - Quoted Identifiers Enabled - Quoted Identifiers Enabled - - - - Database Read-Only - Database Read-Only - - - - Recursive Triggers Enabled - Recursive Triggers Enabled - - - - Restrict Access - Restrict Access - - - - Select Into/Bulk Copy - Select Into/Bulk Copy - - - - Honor Broker Priority - Honor Broker Priority - - - - Service Broker Identifier - Service Broker Identifier - - - - Broker Enabled - Broker Enabled - - - - Truncate Log on Checkpoint - Truncate Log on Checkpoint - - - - Cross-database Ownership Chaining Enabled - Cross-database Ownership Chaining Enabled - - - - Trustworthy - Trustworthy - - - - Date Correlation Optimization Enabled - Date Correlation Optimization Enabled - - - - Forced - Forced - - - - Simple - Simple - - - - ROWS Data - ROWS Data - - - - LOG - LOG - - - - FILESTREAM Data - FILESTREAM Data - - - - Not Applicable - Not Applicable - - - - <default path> - <default path> - - - - Open Connections - Open Connections - - - - To change the database properties, SQL Server must close all other connections to the database_ Are you sure you want to change the properties and close all other connections? - To change the database properties, SQL Server must close all other connections to the database_ Are you sure you want to change the properties and close all other connections? - - - - AUTO_CLOSED - AUTO_CLOSED - - - - EMERGENCY - EMERGENCY - - - - INACCESSIBLE - INACCESSIBLE - - - - NORMAL - NORMAL - - - - OFFLINE - OFFLINE - - - - RECOVERING - RECOVERING - - - - RECOVERY PENDING - RECOVERY PENDING - - - - RESTORING - RESTORING - - - - SHUTDOWN - SHUTDOWN - - - - STANDBY - STANDBY - - - - SUSPECT - SUSPECT - - - - GLOBAL - GLOBAL - - - - LOCAL - LOCAL - - - - MULTI_USER - MULTI_USER - - - - RESTRICTED_USER - RESTRICTED_USER - - - - SINGLE_USER - SINGLE_USER - - - - CHECKSUM - CHECKSUM - - - - NONE - NONE - - - - TORN_PAGE_DETECTION - TORN_PAGE_DETECTION - - - - VarDecimal Storage Format Enabled - VarDecimal Storage Format Enabled - - - - SQL Server 2008 (100) - SQL Server 2008 (100) - - - - Encryption Enabled - Encryption Enabled - - - - OFF - OFF - - - - ON - ON - - - - PRIMARY - PRIMARY - - - - For the distribution policy HASH, the number of leading hash columns is optional but should be from 1 to 16 columns - For the distribution policy HASH, the number of leading hash columns is optional but should be from 1 to 16 columns - - - - SQL Server 2012 (110) - SQL Server 2012 (110) - - - - SQL Server 2014 (120) - SQL Server 2014 (120) - - - - SQL Server 2016 (130) - SQL Server 2016 (130) - - - - SQL Server vNext (140) - SQL Server vNext (140) - - - - None - None - - - - Partial - Partial - - - - FILESTREAM Files - FILESTREAM Files - - - - No Applicable Filegroup - No Applicable Filegroup - - The database {0} is not accessible. The database {0} is not accessible. @@ -2111,11 +1411,6 @@ Result set has too many rows to be safely loaded Result set has too many rows to be safely loaded - - Parameterization - Parameterization - - Specifying this option when restoring a backup with the NORECOVERY option is not permitted. Specifying this option when restoring a backup with the NORECOVERY option is not permitted. @@ -2281,11 +1576,6 @@ No backupset selected to be restored - - Never - Never - - Azure SQL DB Azure SQL DB @@ -2301,16 +1591,6 @@ Azure SQL Stretch Database - - Path {0} is not a valid directory - Path {0} is not a valid directory - - - - For directory {0} a file with name {1} already exists - For directory {0} a file with name {1} already exists - - Value {0} is too large to fit in column of type {1} Value {0} is too large to fit in column of type {1} @@ -2384,500 +1664,6 @@ . Parameters: 0 - tableName (string) - - Enable Alerts - {0} - Enable Alerts - {0} - . - Parameters: 0 - serverName (String) - - - Enable Alert '{0}' - Enable Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Enabling Alert '{0}' - Enabling Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Enabled Alert '{0}' - Enabled Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Disable Alerts - {0} - Disable Alerts - {0} - . - Parameters: 0 - serverName (String) - - - Disable Alert '{0}' - Disable Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Disabling Alert '{0}' - Disabling Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Disabled Alert '{0}' - Disabled Alert '{0}' - . - Parameters: 0 - alertName (String) - - - Enable Jobs - {0} - Enable Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Enable Job '{0}' - Enable Job '{0}' - . - Parameters: 0 - jobName (String) - - - Enabling Job '{0}' - Enabling Job '{0}' - . - Parameters: 0 - jobName (String) - - - Enabled Job '{0}' - Enabled Job '{0}' - . - Parameters: 0 - jobName (String) - - - Disable Jobs - {0} - Disable Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Disable Job '{0}' - Disable Job '{0}' - . - Parameters: 0 - jobName (String) - - - Disabling Job '{0}' - Disabling Job '{0}' - . - Parameters: 0 - jobName (String) - - - Disabled Job '{0}' - Disabled Job '{0}' - . - Parameters: 0 - jobName (String) - - - Start Jobs - {0} - Start Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Start Job '{0}' - Start Job '{0}' - . - Parameters: 0 - jobName (String) - - - Job '{0}' has more than one step. Getting step to start - Job '{0}' has more than one step. Getting step to start - . - Parameters: 0 - jobName (String) - - - User canceled select step. Job will not be started - User canceled select step. Job will not be started - - - - Starting Job '{0}' - Starting Job '{0}' - . - Parameters: 0 - jobName (String) - - - Start Job '{0}' with step '{1}' - Start Job '{0}' with step '{1}' - . - Parameters: 0 - jobName (String), 1 - stepName (String) - - - Posted remote job execution request - Posted remote job execution request - - - - Execute job '{0}' - Execute job '{0}' - . - Parameters: 0 - jobName (string) - - - Execution of job '{0}' failed. See the history log for details. - Execution of job '{0}' failed. See the history log for details. - . - Parameters: 0 - jobName (string) - - - Executing - Executing - - - - Between retries - Between retries - - - - Suspended - Suspended - - - - Performing completion action - Performing completion action - - - - Waiting for step to finish - Waiting for step to finish - - - - Waiting for worker thread - Waiting for worker thread - - - - Stop Jobs - {0} - Stop Jobs - {0} - . - Parameters: 0 - serverName (String) - - - Stop Job '{0}' - Stop Job '{0}' - . - Parameters: 0 - jobName (String) - - - Stopping Job '{0}' - Stopping Job '{0}' - . - Parameters: 0 - jobName (String) - - - Stopped Job '{0}' - Stopped Job '{0}' - . - Parameters: 0 - jobName (String) - - - <all databases> - <all databases> - First item in database name drop down list - - - Unknown severity: {0} - Unknown severity: {0} - Exception thrown when agent alert has unknown severity level. - Parameters: 0 - severity (int) - - - 001 - Miscellaneous System Information - 001 - Miscellaneous System Information - - - - 002 - Reserved - 002 - Reserved - - - - 003 - Reserved - 003 - Reserved - - - - 004 - Reserved - 004 - Reserved - - - - 005 - Reserved - 005 - Reserved - - - - 006 - Reserved - 006 - Reserved - - - - 007 - Notification: Status Information - 007 - Notification: Status Information - - - - 008 - Notification: User Intervention Required - 008 - Notification: User Intervention Required - - - - 009 - User Defined - 009 - User Defined - - - - 010 - Information - 010 - Information - - - - 011 - Specified Database Object Not Found - 011 - Specified Database Object Not Found - - - - 012 - Unused - 012 - Unused - - - - 013 - User Transaction Syntax Error - 013 - User Transaction Syntax Error - - - - 014 - Insufficient Permission - 014 - Insufficient Permission - - - - 015 - Syntax Error in SQL Statements - 015 - Syntax Error in SQL Statements - - - - 016 - Miscellaneous User Error - 016 - Miscellaneous User Error - - - - 017 - Insufficient Resources - 017 - Insufficient Resources - - - - 018 - Nonfatal Internal Error - 018 - Nonfatal Internal Error - - - - 019 - Fatal Error in Resource - 019 - Fatal Error in Resource - - - - 020 - Fatal Error in Current Process - 020 - Fatal Error in Current Process - - - - 021 - Fatal Error in Database Processes - 021 - Fatal Error in Database Processes - - - - 022 - Fatal Error: Table Integrity Suspect - 022 - Fatal Error: Table Integrity Suspect - - - - 023 - Fatal Error: Database Integrity Suspect - 023 - Fatal Error: Database Integrity Suspect - - - - 024 - Fatal Error: Hardware Error - 024 - Fatal Error: Hardware Error - - - - 025 - Fatal Error - 025 - Fatal Error - - - - Pager schedule end time is earlier than start time on Mon-Fri. Do you want to continue? - Pager schedule end time is earlier than start time on Mon-Fri. Do you want to continue? - Message box that displayed if start time is more than end time on Mon-Fri - - - Pager schedule end time is earlier than start time on Sat-Sun. Do you want to continue? - Pager schedule end time is earlier than start time on Sat-Sun. Do you want to continue? - Message box that displayed if start time is more than end time on Sat-Sun - - - Pager schedule warning - Pager schedule warning - Message box caption - - - General - General - Tree node name - - - Notifications - Notifications - Tree node name - - - History - History - Tree node name - - - Day - Day - Pager schedule grid column name - - - Start Time - Start Time - Pager schedule grid column name - - - End Time - End Time - Pager schedule grid column name - - - Column index is invalid. - Column index is invalid. - Exception thrown when column index is invalid - - - Row index is invalid. - Row index is invalid. - Exception thrown when row index is invalid - - - New Operator - New Operator - Name of the operator dialog in create new operator mode - - - {0} Properties - {0} Properties - Name of the operator dialog in modify operator mode. - Parameters: 0 - operatorName (string) - - - Unable to create/initialize Agent Operator dialog. - Unable to create/initialize Agent Operator dialog. - Exception thrown when dialog cannot be created/intialized. - - - Job server is not available. - Job server is not available. - Exception thrown when job server is not available - - - Cannot create/initialize General page. - Cannot create/initialize General page. - Exception thrown when we cannot create/initialize agent operators general page - - - Cannot create/initialize Notifications page. - Cannot create/initialize Notifications page. - Exception thrown when we cannot create/initialize agent operators notifications page - - - Cannot create/initialize History page. - Cannot create/initialize History page. - Exception thrown when we cannot create/initialize agent operators history page - - - Cannot reset operator. - Cannot reset operator. - Exception throw when dialog cannot refresh operator - - - Alert list: - Alert list: - Name of label on notifications page - - - Job list: - Job list: - Name of label on notifications page - - - E-mail - E-mail - Name of column on notifications page - - - Pager - Pager - Name of column on notifications page - - - Alert name - Alert name - Name of column on notifications page - - - Job name - Job name - Name of column on notifications page - - - Always - Always - Completion Action - - - Never - Never - Completion Action - - - On failure - On failure - Completion Action - - - On success - On success - Completion Action - - - Cannot modify alerts. - Cannot modify alerts. - Exception thrown when we cannot modify alerts - - - Cannot create script for modify alerts. - Cannot create script for modify alerts. - Exception thrown when we cannot create script that modify alerts - [Uncategorized (Local)] [Uncategorized (Local)] @@ -3015,42 +1801,6 @@ Cannot alter alert. - - Invalid Schedule - Invalid Schedule - Schedule error message - - - Select at least one day to be part of this weekly schedule. - Select at least one day to be part of this weekly schedule. - - - - The job schedule starting date cannot be greater than the ending date. - The job schedule starting date cannot be greater than the ending date. - - - - The job schedule starting time cannot be after the ending time. - The job schedule starting time cannot be after the ending time. - - - - The job schedule ending time must be after the starting time. - The job schedule ending time must be after the starting time. - - - - Start date must be on or after January 1, 1990. - Start date must be on or after January 1, 1990. - - - - There is already a schedule named '{0}' for this job. You must specify a different name. - There is already a schedule named '{0}' for this job. You must specify a different name. - . - Parameters: 0 - scheduleName (string) - SQL Server Agent Service Account SQL Server Agent Service Account @@ -3130,6 +1880,82 @@ . Parameters: 0 - sessionName (String) + + Invalid Schedule + Invalid Schedule + Schedule error message + + + Select at least one day to be part of this weekly schedule. + Select at least one day to be part of this weekly schedule. + + + + The job schedule starting date cannot be greater than the ending date. + The job schedule starting date cannot be greater than the ending date. + + + + The job schedule starting time cannot be after the ending time. + The job schedule starting time cannot be after the ending time. + + + + The job schedule ending time must be after the starting time. + The job schedule ending time must be after the starting time. + + + + Start date must be on or after January 1, 1990. + Start date must be on or after January 1, 1990. + + + + There is already a schedule named '{0}' for this job. You must specify a different name. + There is already a schedule named '{0}' for this job. You must specify a different name. + . + Parameters: 0 - scheduleName (string) + + + Job server is not available + Job server is not available + Exception thrown when job server is not available + + + Never + Never + + + + Path {0} is not a valid directory + Path {0} is not a valid directory + + + + For directory {0} a file with name {1} already exist + For directory {0} a file with name {1} already exist + + + + Beginning execution loop + Beginning execution loop + + + + An error occurred while the batch was being executed, but the error has been ignored. + An error occurred while the batch was being executed, but the error has been ignored. + + + + Batch execution completed {0} times... + Batch execution completed {0} times... + + + + Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} + Batch parser wrapper execution: {0} found... at line {1}: {2} Description: {3} + + \ No newline at end of file diff --git a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj index 6b9e11ab..1e49d364 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj +++ b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj @@ -24,7 +24,7 @@ - + @@ -32,18 +32,11 @@ + - - - Component - - - Component - - diff --git a/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs index 38a47f7c..d46d1be4 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs @@ -43,6 +43,7 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.UnitTests")] [assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.IntegrationTests")] +[assembly: InternalsVisibleTo("Microsoft.SqlTools.ManagedBatchParser.UnitTests")] [assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.Test.Common")] // Allowing internals visible access to Moq library to help testing diff --git a/test/CodeCoverage/codecoverage.bat b/test/CodeCoverage/codecoverage.bat index 30a2e243..ea57a404 100644 --- a/test/CodeCoverage/codecoverage.bat +++ b/test/CodeCoverage/codecoverage.bat @@ -85,4 +85,4 @@ DEL %REPOROOT%\src\Microsoft.SqlTools.ResourceProvider.Core\Microsoft.SqlTools.R COPY /Y %REPOROOT%\src\Microsoft.SqlTools.ResourceProvider.DefaultImpl\Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj.BAK %REPOROOT%\src\Microsoft.SqlTools.ResourceProvider.DefaultImpl\Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj DEL %REPOROOT%\src\Microsoft.SqlTools.ResourceProvider.DefaultImpl\Microsoft.SqlTools.ResourceProvider.DefaultImpl.csproj.BAK -EXIT +EXIT \ No newline at end of file diff --git a/test/CodeCoverage/package-lock.json b/test/CodeCoverage/package-lock.json index da7407e1..395158ba 100644 --- a/test/CodeCoverage/package-lock.json +++ b/test/CodeCoverage/package-lock.json @@ -9,10 +9,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz", "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==", "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ansi-colors": { @@ -20,7 +20,7 @@ "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "requires": { - "ansi-wrap": "0.1.0" + "ansi-wrap": "^0.1.0" } }, "ansi-gray": { @@ -51,8 +51,8 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" } }, "append-buffer": { @@ -60,7 +60,7 @@ "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz", "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=", "requires": { - "buffer-equal": "1.0.0" + "buffer-equal": "^1.0.0" } }, "archy": { @@ -78,7 +78,7 @@ "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz", "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", "requires": { - "make-iterator": "1.0.1" + "make-iterator": "^1.0.0" } }, "arr-flatten": { @@ -91,7 +91,7 @@ "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz", "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", "requires": { - "make-iterator": "1.0.1" + "make-iterator": "^1.0.0" } }, "arr-union": { @@ -114,8 +114,8 @@ "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", "requires": { - "array-slice": "1.1.0", - "is-number": "4.0.0" + "array-slice": "^1.0.0", + "is-number": "^4.0.0" }, "dependencies": { "is-number": { @@ -130,7 +130,7 @@ "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz", "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", "requires": { - "is-number": "4.0.0" + "is-number": "^4.0.0" }, "dependencies": { "is-number": { @@ -150,9 +150,9 @@ "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz", "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==", "requires": { - "default-compare": "1.0.0", - "get-value": "2.0.6", - "kind-of": "5.1.0" + "default-compare": "^1.0.0", + "get-value": "^2.0.6", + "kind-of": "^5.0.2" }, "dependencies": { "kind-of": { @@ -167,7 +167,7 @@ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -190,7 +190,7 @@ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "~2.1.0" } }, "assert-plus": { @@ -208,10 +208,10 @@ "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.1.tgz", "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==", "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0", - "process-nextick-args": "1.0.7", - "stream-exhaust": "1.0.2" + "end-of-stream": "^1.1.0", + "once": "^1.3.2", + "process-nextick-args": "^1.0.7", + "stream-exhaust": "^1.0.1" } }, "async-each": { @@ -224,7 +224,7 @@ "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", "requires": { - "async-done": "1.3.1" + "async-done": "^1.2.2" } }, "asynckit": { @@ -252,15 +252,15 @@ "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz", "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", "requires": { - "arr-filter": "1.1.2", - "arr-flatten": "1.1.0", - "arr-map": "2.0.2", - "array-each": "1.0.1", - "array-initial": "1.1.0", - "array-last": "1.3.0", - "async-done": "1.3.1", - "async-settle": "1.0.0", - "now-and-later": "2.0.0" + "arr-filter": "^1.1.1", + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "array-each": "^1.0.0", + "array-initial": "^1.0.0", + "array-last": "^1.1.1", + "async-done": "^1.2.2", + "async-settle": "^1.0.0", + "now-and-later": "^2.0.0" } }, "balanced-match": { @@ -273,13 +273,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -287,7 +287,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -295,7 +295,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -303,7 +303,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -311,9 +311,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -323,7 +323,7 @@ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "beeper": { @@ -341,7 +341,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -350,16 +350,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -367,7 +367,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -392,15 +392,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "callsite": { @@ -423,11 +423,11 @@ "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "chokidar": { @@ -435,19 +435,19 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.4", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "lodash.debounce": "4.0.8", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.1.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "class-utils": { @@ -455,10 +455,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -466,7 +466,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -476,9 +476,9 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone": { @@ -501,9 +501,9 @@ "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz", "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==", "requires": { - "inherits": "2.0.3", - "process-nextick-args": "2.0.0", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "process-nextick-args": "^2.0.0", + "readable-stream": "^2.3.5" }, "dependencies": { "process-nextick-args": { @@ -523,9 +523,9 @@ "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", "requires": { - "arr-map": "2.0.2", - "for-own": "1.0.0", - "make-iterator": "1.0.1" + "arr-map": "^2.0.2", + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" } }, "collection-visit": { @@ -533,8 +533,8 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-support": { @@ -547,7 +547,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "component-emitter": { @@ -565,10 +565,10 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "convert-source-map": { @@ -576,7 +576,7 @@ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.1" } }, "copy-descriptor": { @@ -589,8 +589,8 @@ "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", "requires": { - "each-props": "1.3.2", - "is-plain-object": "2.0.4" + "each-props": "^1.3.0", + "is-plain-object": "^2.0.1" } }, "core-util-is": { @@ -603,7 +603,7 @@ "resolved": "http://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "requires": { - "es5-ext": "0.10.46" + "es5-ext": "^0.10.9" } }, "dashdash": { @@ -611,7 +611,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "dateformat": { @@ -642,7 +642,7 @@ "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", "requires": { - "kind-of": "5.1.0" + "kind-of": "^5.0.2" }, "dependencies": { "kind-of": { @@ -662,7 +662,7 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "requires": { - "object-keys": "1.0.12" + "object-keys": "^1.0.12" } }, "define-property": { @@ -670,8 +670,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -679,7 +679,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -687,7 +687,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -695,9 +695,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -707,13 +707,13 @@ "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" } }, "delayed-stream": { @@ -731,7 +731,7 @@ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "requires": { - "readable-stream": "1.1.14" + "readable-stream": "~1.1.9" }, "dependencies": { "isarray": { @@ -744,10 +744,10 @@ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -762,10 +762,10 @@ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz", "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==", "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "each-props": { @@ -773,8 +773,8 @@ "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz", "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", "requires": { - "is-plain-object": "2.0.4", - "object.defaults": "1.1.0" + "is-plain-object": "^2.0.1", + "object.defaults": "^1.1.0" } }, "ecc-jsbn": { @@ -782,8 +782,8 @@ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "requires": { - "jsbn": "0.1.1", - "safer-buffer": "2.1.2" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "end-of-stream": { @@ -791,7 +791,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "error-ex": { @@ -799,7 +799,7 @@ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es5-ext": { @@ -807,9 +807,9 @@ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz", "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==", "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "1" } }, "es6-iterator": { @@ -817,9 +817,9 @@ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "requires": { - "d": "1.0.0", - "es5-ext": "0.10.46", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-symbol": { @@ -827,8 +827,8 @@ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "requires": { - "d": "1.0.0", - "es5-ext": "0.10.46" + "d": "1", + "es5-ext": "~0.10.14" } }, "es6-weak-map": { @@ -836,10 +836,10 @@ "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "requires": { - "d": "1.0.0", - "es5-ext": "0.10.46", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.14", + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" } }, "escape-string-regexp": { @@ -852,13 +852,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -866,7 +866,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -874,7 +874,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -884,7 +884,7 @@ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "requires": { - "homedir-polyfill": "1.0.1" + "homedir-polyfill": "^1.0.1" } }, "extend": { @@ -897,8 +897,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -906,7 +906,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -916,14 +916,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -931,7 +931,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -939,7 +939,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -947,7 +947,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -955,7 +955,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -963,9 +963,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -980,10 +980,10 @@ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", "requires": { - "ansi-gray": "0.1.1", - "color-support": "1.1.3", - "parse-node-version": "1.0.0", - "time-stamp": "1.1.0" + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "parse-node-version": "^1.0.0", + "time-stamp": "^1.0.0" } }, "fast-deep-equal": { @@ -1001,10 +1001,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -1012,7 +1012,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -1022,8 +1022,8 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "findup-sync": { @@ -1031,10 +1031,10 @@ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", "requires": { - "detect-file": "1.0.0", - "is-glob": "3.1.0", - "micromatch": "3.1.10", - "resolve-dir": "1.0.1" + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" }, "dependencies": { "is-glob": { @@ -1042,7 +1042,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -1052,11 +1052,11 @@ "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", "requires": { - "expand-tilde": "2.0.2", - "is-plain-object": "2.0.4", - "object.defaults": "1.1.0", - "object.pick": "1.3.0", - "parse-filepath": "1.0.2" + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" } }, "flagged-respawn": { @@ -1069,8 +1069,8 @@ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.4" } }, "for-in": { @@ -1083,7 +1083,7 @@ "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "forever-agent": { @@ -1096,9 +1096,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.7", - "mime-types": "2.1.21" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, "fragment-cache": { @@ -1106,7 +1106,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fs-mkdirp-stream": { @@ -1114,8 +1114,8 @@ "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", "requires": { - "graceful-fs": "4.1.15", - "through2": "2.0.5" + "graceful-fs": "^4.1.11", + "through2": "^2.0.3" } }, "fs.realpath": { @@ -1129,8 +1129,8 @@ "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", "optional": true, "requires": { - "nan": "2.11.1", - "node-pre-gyp": "0.10.0" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -1152,8 +1152,8 @@ "bundled": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -1164,7 +1164,7 @@ "version": "1.1.11", "bundled": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -1218,7 +1218,7 @@ "bundled": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -1231,14 +1231,14 @@ "bundled": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -1246,12 +1246,12 @@ "bundled": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -1264,7 +1264,7 @@ "bundled": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -1272,7 +1272,7 @@ "bundled": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -1280,8 +1280,8 @@ "bundled": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -1297,7 +1297,7 @@ "version": "1.0.0", "bundled": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -1309,7 +1309,7 @@ "version": "3.0.4", "bundled": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -1320,8 +1320,8 @@ "version": "2.2.4", "bundled": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -1329,7 +1329,7 @@ "bundled": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -1349,9 +1349,9 @@ "bundled": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -1359,16 +1359,16 @@ "bundled": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -1376,8 +1376,8 @@ "bundled": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -1390,8 +1390,8 @@ "bundled": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -1399,10 +1399,10 @@ "bundled": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -1418,7 +1418,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -1436,8 +1436,8 @@ "bundled": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -1455,10 +1455,10 @@ "bundled": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -1473,13 +1473,13 @@ "bundled": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -1487,7 +1487,7 @@ "bundled": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -1523,9 +1523,9 @@ "version": "1.0.2", "bundled": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -1533,14 +1533,14 @@ "bundled": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { "version": "3.0.1", "bundled": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -1553,13 +1553,13 @@ "bundled": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -1572,7 +1572,7 @@ "bundled": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -1610,7 +1610,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -1618,12 +1618,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-parent": { @@ -1631,8 +1631,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -1640,7 +1640,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -1650,16 +1650,16 @@ "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", "requires": { - "extend": "3.0.2", - "glob": "7.1.3", - "glob-parent": "3.1.0", - "is-negated-glob": "1.0.0", - "ordered-read-streams": "1.0.1", - "pumpify": "1.5.1", - "readable-stream": "2.3.6", - "remove-trailing-separator": "1.1.0", - "to-absolute-glob": "2.0.2", - "unique-stream": "2.2.1" + "extend": "^3.0.0", + "glob": "^7.1.1", + "glob-parent": "^3.1.0", + "is-negated-glob": "^1.0.0", + "ordered-read-streams": "^1.0.0", + "pumpify": "^1.3.5", + "readable-stream": "^2.1.5", + "remove-trailing-separator": "^1.0.1", + "to-absolute-glob": "^2.0.0", + "unique-stream": "^2.0.2" } }, "glob-watcher": { @@ -1667,12 +1667,12 @@ "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz", "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==", "requires": { - "anymatch": "2.0.0", - "async-done": "1.3.1", - "chokidar": "2.0.4", - "is-negated-glob": "1.0.0", - "just-debounce": "1.0.0", - "object.defaults": "1.1.0" + "anymatch": "^2.0.0", + "async-done": "^1.2.0", + "chokidar": "^2.0.0", + "is-negated-glob": "^1.0.0", + "just-debounce": "^1.0.0", + "object.defaults": "^1.1.0" } }, "global-modules": { @@ -1680,9 +1680,9 @@ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "requires": { - "global-prefix": "1.0.2", - "is-windows": "1.0.2", - "resolve-dir": "1.0.1" + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" } }, "global-prefix": { @@ -1690,11 +1690,11 @@ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "requires": { - "expand-tilde": "2.0.2", - "homedir-polyfill": "1.0.1", - "ini": "1.3.5", - "is-windows": "1.0.2", - "which": "1.3.1" + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" } }, "globby": { @@ -1702,12 +1702,12 @@ "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.3", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "glogg": { @@ -1715,7 +1715,7 @@ "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", "requires": { - "sparkles": "1.0.1" + "sparkles": "^1.0.0" } }, "graceful-fs": { @@ -1728,10 +1728,10 @@ "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz", "integrity": "sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=", "requires": { - "glob-watcher": "5.0.3", - "gulp-cli": "2.0.1", - "undertaker": "1.2.0", - "vinyl-fs": "3.0.3" + "glob-watcher": "^5.0.0", + "gulp-cli": "^2.0.0", + "undertaker": "^1.0.0", + "vinyl-fs": "^3.0.0" } }, "gulp-cli": { @@ -1739,35 +1739,36 @@ "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz", "integrity": "sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==", "requires": { - "ansi-colors": "1.1.0", - "archy": "1.0.0", - "array-sort": "1.0.0", - "color-support": "1.1.3", - "concat-stream": "1.6.2", - "copy-props": "2.0.4", - "fancy-log": "1.3.3", - "gulplog": "1.0.0", - "interpret": "1.1.0", - "isobject": "3.0.1", - "liftoff": "2.5.0", - "matchdep": "2.0.0", - "mute-stdout": "1.0.1", - "pretty-hrtime": "1.0.3", - "replace-homedir": "1.0.0", - "semver-greatest-satisfied-range": "1.1.0", - "v8flags": "3.1.1", - "yargs": "7.1.0" + "ansi-colors": "^1.0.1", + "archy": "^1.0.0", + "array-sort": "^1.0.0", + "color-support": "^1.1.3", + "concat-stream": "^1.6.0", + "copy-props": "^2.0.1", + "fancy-log": "^1.3.2", + "gulplog": "^1.0.0", + "interpret": "^1.1.0", + "isobject": "^3.0.1", + "liftoff": "^2.5.0", + "matchdep": "^2.0.0", + "mute-stdout": "^1.0.0", + "pretty-hrtime": "^1.0.0", + "replace-homedir": "^1.0.0", + "semver-greatest-satisfied-range": "^1.1.0", + "v8flags": "^3.0.1", + "yargs": "^7.1.0" } }, "gulp-hub": { "version": "github:frankwallis/gulp-hub#d461b9c700df9010d0a8694e4af1fb96d9f38bf4", + "from": "github:frankwallis/gulp-hub#registry-init", "requires": { - "callsite": "1.0.0", - "fwd": "0.2.2", - "glob": "5.0.15", - "gulp-util": "3.0.8", - "lodash": "3.10.1", - "undertaker-forward-reference": "0.1.0" + "callsite": "^1.0.0", + "fwd": "^0.2.2", + "glob": "^5.0.3", + "gulp-util": "^3.0.2", + "lodash": "^3.5.0", + "undertaker-forward-reference": "^0.1.0" }, "dependencies": { "glob": { @@ -1775,11 +1776,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -1789,9 +1790,9 @@ "resolved": "https://registry.npmjs.org/gulp-install/-/gulp-install-0.6.0.tgz", "integrity": "sha1-EVQfEfxfehnhjLPvjq255kuOVKo=", "requires": { - "gulp-util": "3.0.8", - "through2": "2.0.5", - "which": "1.3.1" + "gulp-util": "^3.0.4", + "through2": "^2.0.0", + "which": "^1.0.9" } }, "gulp-util": { @@ -1799,24 +1800,24 @@ "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "2.2.0", - "fancy-log": "1.3.3", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", + "array-differ": "^1.0.0", + "array-uniq": "^1.0.2", + "beeper": "^1.0.0", + "chalk": "^1.0.0", + "dateformat": "^2.0.0", + "fancy-log": "^1.1.0", + "gulplog": "^1.0.0", + "has-gulplog": "^0.1.0", + "lodash._reescape": "^3.0.0", + "lodash._reevaluate": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.template": "^3.0.0", + "minimist": "^1.1.0", + "multipipe": "^0.1.2", + "object-assign": "^3.0.0", "replace-ext": "0.0.1", - "through2": "2.0.5", - "vinyl": "0.5.3" + "through2": "^2.0.0", + "vinyl": "^0.5.0" }, "dependencies": { "clone": { @@ -1844,8 +1845,8 @@ "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", "requires": { - "clone": "1.0.4", - "clone-stats": "0.0.1", + "clone": "^1.0.0", + "clone-stats": "^0.0.1", "replace-ext": "0.0.1" } } @@ -1856,7 +1857,7 @@ "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "requires": { - "glogg": "1.0.1" + "glogg": "^1.0.0" } }, "har-schema": { @@ -1869,8 +1870,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "requires": { - "ajv": "6.6.1", - "har-schema": "2.0.0" + "ajv": "^6.5.5", + "har-schema": "^2.0.0" } }, "has-ansi": { @@ -1878,7 +1879,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-gulplog": { @@ -1886,7 +1887,7 @@ "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", "requires": { - "sparkles": "1.0.1" + "sparkles": "^1.0.0" } }, "has-symbols": { @@ -1899,9 +1900,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -1909,8 +1910,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -1918,7 +1919,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1928,7 +1929,7 @@ "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", "requires": { - "parse-passwd": "1.0.0" + "parse-passwd": "^1.0.0" } }, "hosted-git-info": { @@ -1941,9 +1942,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.15.2" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "inflight": { @@ -1951,8 +1952,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -1980,8 +1981,8 @@ "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "requires": { - "is-relative": "1.0.0", - "is-windows": "1.0.2" + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" } }, "is-accessor-descriptor": { @@ -1989,7 +1990,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1997,7 +1998,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2012,7 +2013,7 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "requires": { - "binary-extensions": "1.12.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -2025,7 +2026,7 @@ "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-data-descriptor": { @@ -2033,7 +2034,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -2041,7 +2042,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2051,9 +2052,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -2078,7 +2079,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -2086,7 +2087,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-negated-glob": { @@ -2099,7 +2100,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -2107,7 +2108,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2122,7 +2123,7 @@ "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -2130,7 +2131,7 @@ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-object": { @@ -2138,7 +2139,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-relative": { @@ -2146,7 +2147,7 @@ "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "requires": { - "is-unc-path": "1.0.0" + "is-unc-path": "^1.0.0" } }, "is-typedarray": { @@ -2159,7 +2160,7 @@ "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "requires": { - "unc-path-regex": "0.1.2" + "unc-path-regex": "^0.1.2" } }, "is-utf8": { @@ -2217,7 +2218,7 @@ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } }, "json-stringify-safe": { @@ -2256,8 +2257,8 @@ "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz", "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", "requires": { - "default-resolution": "2.0.0", - "es6-weak-map": "2.0.2" + "default-resolution": "^2.0.0", + "es6-weak-map": "^2.0.1" } }, "lazystream": { @@ -2265,7 +2266,7 @@ "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.5" } }, "lcid": { @@ -2273,7 +2274,7 @@ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "lead": { @@ -2281,7 +2282,7 @@ "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=", "requires": { - "flush-write-stream": "1.0.3" + "flush-write-stream": "^1.0.2" } }, "liftoff": { @@ -2289,14 +2290,14 @@ "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", "requires": { - "extend": "3.0.2", - "findup-sync": "2.0.0", - "fined": "1.1.0", - "flagged-respawn": "1.0.0", - "is-plain-object": "2.0.4", - "object.map": "1.0.1", - "rechoir": "0.6.2", - "resolve": "1.8.1" + "extend": "^3.0.0", + "findup-sync": "^2.0.0", + "fined": "^1.0.1", + "flagged-respawn": "^1.0.0", + "is-plain-object": "^2.0.4", + "object.map": "^1.0.0", + "rechoir": "^0.6.2", + "resolve": "^1.1.7" } }, "load-json-file": { @@ -2304,16 +2305,16 @@ "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "requires": { - "graceful-fs": "4.1.15", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "lodash": { "version": "3.10.1", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" }, "lodash._basecopy": { @@ -2371,7 +2372,7 @@ "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "requires": { - "lodash._root": "3.0.1" + "lodash._root": "^3.0.0" } }, "lodash.isarguments": { @@ -2389,9 +2390,9 @@ "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" } }, "lodash.restparam": { @@ -2404,15 +2405,15 @@ "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" + "lodash._basecopy": "^3.0.0", + "lodash._basetostring": "^3.0.0", + "lodash._basevalues": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.restparam": "^3.0.0", + "lodash.templatesettings": "^3.0.0" } }, "lodash.templatesettings": { @@ -2420,8 +2421,8 @@ "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0" } }, "make-iterator": { @@ -2429,7 +2430,7 @@ "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" } }, "map-cache": { @@ -2442,7 +2443,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "matchdep": { @@ -2450,9 +2451,9 @@ "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz", "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=", "requires": { - "findup-sync": "2.0.0", - "micromatch": "3.1.10", - "resolve": "1.8.1", + "findup-sync": "^2.0.0", + "micromatch": "^3.0.4", + "resolve": "^1.4.0", "stack-trace": "0.0.10" } }, @@ -2461,19 +2462,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "mime-db": { @@ -2486,7 +2487,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", "requires": { - "mime-db": "1.37.0" + "mime-db": "~1.37.0" } }, "minimatch": { @@ -2494,7 +2495,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -2507,8 +2508,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -2516,7 +2517,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -2550,17 +2551,17 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "next-tick": { @@ -2573,10 +2574,10 @@ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "requires": { - "hosted-git-info": "2.7.1", - "is-builtin-module": "1.0.0", - "semver": "5.6.0", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -2584,7 +2585,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "now-and-later": { @@ -2592,7 +2593,7 @@ "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.0.tgz", "integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=", "requires": { - "once": "1.4.0" + "once": "^1.3.2" } }, "number-is-nan": { @@ -2615,9 +2616,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -2625,7 +2626,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { @@ -2633,7 +2634,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2648,7 +2649,7 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.assign": { @@ -2656,10 +2657,10 @@ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", "requires": { - "define-properties": "1.1.3", - "function-bind": "1.1.1", - "has-symbols": "1.0.0", - "object-keys": "1.0.12" + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" } }, "object.defaults": { @@ -2667,10 +2668,10 @@ "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", "requires": { - "array-each": "1.0.1", - "array-slice": "1.1.0", - "for-own": "1.0.0", - "isobject": "3.0.1" + "array-each": "^1.0.1", + "array-slice": "^1.0.0", + "for-own": "^1.0.0", + "isobject": "^3.0.0" } }, "object.map": { @@ -2678,8 +2679,8 @@ "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", "requires": { - "for-own": "1.0.0", - "make-iterator": "1.0.1" + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" } }, "object.pick": { @@ -2687,7 +2688,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "object.reduce": { @@ -2695,8 +2696,8 @@ "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz", "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", "requires": { - "for-own": "1.0.0", - "make-iterator": "1.0.1" + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" } }, "once": { @@ -2704,7 +2705,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "ordered-read-streams": { @@ -2712,7 +2713,7 @@ "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "os-locale": { @@ -2720,7 +2721,7 @@ "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "parse-filepath": { @@ -2728,9 +2729,9 @@ "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", "requires": { - "is-absolute": "1.0.0", - "map-cache": "0.2.2", - "path-root": "0.1.1" + "is-absolute": "^1.0.0", + "map-cache": "^0.2.0", + "path-root": "^0.1.1" } }, "parse-json": { @@ -2738,7 +2739,7 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "parse-node-version": { @@ -2766,7 +2767,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -2789,7 +2790,7 @@ "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", "requires": { - "path-root-regex": "0.1.2" + "path-root-regex": "^0.1.0" } }, "path-root-regex": { @@ -2802,9 +2803,9 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "requires": { - "graceful-fs": "4.1.15", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "performance-now": { @@ -2827,7 +2828,7 @@ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "posix-character-classes": { @@ -2855,8 +2856,8 @@ "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "pumpify": { @@ -2864,9 +2865,9 @@ "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "requires": { - "duplexify": "3.6.1", - "inherits": "2.0.3", - "pump": "2.0.1" + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" } }, "punycode": { @@ -2884,9 +2885,9 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -2894,8 +2895,8 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "readable-stream": { @@ -2903,13 +2904,13 @@ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" }, "dependencies": { "process-nextick-args": { @@ -2924,9 +2925,9 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "requires": { - "graceful-fs": "4.1.15", - "micromatch": "3.1.10", - "readable-stream": "2.3.6" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "rechoir": { @@ -2934,7 +2935,7 @@ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "requires": { - "resolve": "1.8.1" + "resolve": "^1.1.6" } }, "regex-not": { @@ -2942,8 +2943,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "remove-bom-buffer": { @@ -2951,8 +2952,8 @@ "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", "requires": { - "is-buffer": "1.1.6", - "is-utf8": "0.2.1" + "is-buffer": "^1.1.5", + "is-utf8": "^0.2.1" } }, "remove-bom-stream": { @@ -2960,9 +2961,9 @@ "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz", "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=", "requires": { - "remove-bom-buffer": "3.0.0", - "safe-buffer": "5.1.2", - "through2": "2.0.5" + "remove-bom-buffer": "^3.0.0", + "safe-buffer": "^5.1.0", + "through2": "^2.0.3" } }, "remove-trailing-separator": { @@ -2990,9 +2991,9 @@ "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz", "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=", "requires": { - "homedir-polyfill": "1.0.1", - "is-absolute": "1.0.0", - "remove-trailing-separator": "1.1.0" + "homedir-polyfill": "^1.0.1", + "is-absolute": "^1.0.0", + "remove-trailing-separator": "^1.1.0" } }, "request": { @@ -3000,26 +3001,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.8.0", - "caseless": "0.12.0", - "combined-stream": "1.0.7", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.3", - "har-validator": "5.1.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.21", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.4.3", - "tunnel-agent": "0.6.0", - "uuid": "3.3.2" + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" } }, "require-directory": { @@ -3037,7 +3038,7 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "requires": { - "path-parse": "1.0.6" + "path-parse": "^1.0.5" } }, "resolve-dir": { @@ -3045,8 +3046,8 @@ "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "requires": { - "expand-tilde": "2.0.2", - "global-modules": "1.0.0" + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" } }, "resolve-options": { @@ -3054,7 +3055,7 @@ "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=", "requires": { - "value-or-function": "3.0.0" + "value-or-function": "^3.0.0" } }, "resolve-url": { @@ -3072,7 +3073,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { - "glob": "7.1.3" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -3085,7 +3086,7 @@ "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -3103,7 +3104,7 @@ "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz", "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=", "requires": { - "sver-compat": "1.5.0" + "sver-compat": "^1.5.0" } }, "set-blocking": { @@ -3116,10 +3117,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -3127,7 +3128,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -3137,14 +3138,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.1" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "define-property": { @@ -3152,7 +3153,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -3160,7 +3161,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -3170,9 +3171,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -3180,7 +3181,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -3188,7 +3189,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3196,7 +3197,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3204,9 +3205,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -3216,7 +3217,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { @@ -3224,7 +3225,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -3239,11 +3240,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { - "atob": "2.1.2", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-url": { @@ -3261,8 +3262,8 @@ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz", "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==", "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.2" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -3275,8 +3276,8 @@ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "requires": { - "spdx-exceptions": "2.2.0", - "spdx-license-ids": "3.0.2" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -3289,7 +3290,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sshpk": { @@ -3297,15 +3298,15 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz", "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==", "requires": { - "asn1": "0.2.4", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.2", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.2", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "stack-trace": { @@ -3318,8 +3319,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -3327,7 +3328,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -3347,9 +3348,9 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -3357,7 +3358,7 @@ "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -3365,7 +3366,7 @@ "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -3373,7 +3374,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "supports-color": { @@ -3386,8 +3387,8 @@ "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" } }, "through2": { @@ -3395,8 +3396,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" } }, "through2-filter": { @@ -3404,8 +3405,8 @@ "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", "requires": { - "through2": "2.0.5", - "xtend": "4.0.1" + "through2": "~2.0.0", + "xtend": "~4.0.0" } }, "time-stamp": { @@ -3418,8 +3419,8 @@ "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", "requires": { - "is-absolute": "1.0.0", - "is-negated-glob": "1.0.0" + "is-absolute": "^1.0.0", + "is-negated-glob": "^1.0.0" } }, "to-object-path": { @@ -3427,7 +3428,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -3435,7 +3436,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -3445,10 +3446,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -3456,8 +3457,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "to-through": { @@ -3465,7 +3466,7 @@ "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", "requires": { - "through2": "2.0.5" + "through2": "^2.0.3" } }, "tough-cookie": { @@ -3473,8 +3474,8 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "requires": { - "psl": "1.1.29", - "punycode": "1.4.1" + "psl": "^1.1.24", + "punycode": "^1.4.1" }, "dependencies": { "punycode": { @@ -3489,7 +3490,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -3512,15 +3513,15 @@ "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.0.tgz", "integrity": "sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=", "requires": { - "arr-flatten": "1.1.0", - "arr-map": "2.0.2", - "bach": "1.2.0", - "collection-map": "1.0.0", - "es6-weak-map": "2.0.2", - "last-run": "1.1.1", - "object.defaults": "1.1.0", - "object.reduce": "1.0.1", - "undertaker-registry": "1.0.1" + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "bach": "^1.0.0", + "collection-map": "^1.0.0", + "es6-weak-map": "^2.0.1", + "last-run": "^1.1.0", + "object.defaults": "^1.0.0", + "object.reduce": "^1.0.0", + "undertaker-registry": "^1.0.0" } }, "undertaker-forward-reference": { @@ -3548,10 +3549,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -3559,7 +3560,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -3567,10 +3568,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -3580,8 +3581,8 @@ "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", "requires": { - "json-stable-stringify": "1.0.1", - "through2-filter": "2.0.0" + "json-stable-stringify": "^1.0.0", + "through2-filter": "^2.0.0" } }, "unset-value": { @@ -3589,8 +3590,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -3598,9 +3599,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -3630,7 +3631,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "urix": { @@ -3658,7 +3659,7 @@ "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz", "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==", "requires": { - "homedir-polyfill": "1.0.1" + "homedir-polyfill": "^1.0.1" } }, "validate-npm-package-license": { @@ -3666,8 +3667,8 @@ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "requires": { - "spdx-correct": "3.0.2", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "value-or-function": { @@ -3680,9 +3681,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vinyl": { @@ -3690,12 +3691,12 @@ "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", "requires": { - "clone": "2.1.2", - "clone-buffer": "1.0.0", - "clone-stats": "1.0.0", - "cloneable-readable": "1.1.2", - "remove-trailing-separator": "1.1.0", - "replace-ext": "1.0.0" + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" } }, "vinyl-fs": { @@ -3703,23 +3704,23 @@ "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==", "requires": { - "fs-mkdirp-stream": "1.0.0", - "glob-stream": "6.1.0", - "graceful-fs": "4.1.15", - "is-valid-glob": "1.0.0", - "lazystream": "1.0.0", - "lead": "1.0.0", - "object.assign": "4.1.0", - "pumpify": "1.5.1", - "readable-stream": "2.3.6", - "remove-bom-buffer": "3.0.0", - "remove-bom-stream": "1.2.0", - "resolve-options": "1.1.0", - "through2": "2.0.5", - "to-through": "2.0.0", - "value-or-function": "3.0.0", - "vinyl": "2.2.0", - "vinyl-sourcemap": "1.1.0" + "fs-mkdirp-stream": "^1.0.0", + "glob-stream": "^6.1.0", + "graceful-fs": "^4.0.0", + "is-valid-glob": "^1.0.0", + "lazystream": "^1.0.0", + "lead": "^1.0.0", + "object.assign": "^4.0.4", + "pumpify": "^1.3.5", + "readable-stream": "^2.3.3", + "remove-bom-buffer": "^3.0.0", + "remove-bom-stream": "^1.2.0", + "resolve-options": "^1.1.0", + "through2": "^2.0.0", + "to-through": "^2.0.0", + "value-or-function": "^3.0.0", + "vinyl": "^2.0.0", + "vinyl-sourcemap": "^1.1.0" } }, "vinyl-sourcemap": { @@ -3727,13 +3728,13 @@ "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", "requires": { - "append-buffer": "1.0.2", - "convert-source-map": "1.6.0", - "graceful-fs": "4.1.15", - "normalize-path": "2.1.1", - "now-and-later": "2.0.0", - "remove-bom-buffer": "3.0.0", - "vinyl": "2.2.0" + "append-buffer": "^1.0.2", + "convert-source-map": "^1.5.0", + "graceful-fs": "^4.1.6", + "normalize-path": "^2.1.1", + "now-and-later": "^2.0.0", + "remove-bom-buffer": "^3.0.0", + "vinyl": "^2.0.0" } }, "which": { @@ -3741,7 +3742,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -3754,8 +3755,8 @@ "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -3778,19 +3779,19 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" } }, "yargs-parser": { @@ -3798,7 +3799,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "requires": { - "camelcase": "3.0.0" + "camelcase": "^3.0.0" } } } diff --git a/test/CodeCoverage/package.json b/test/CodeCoverage/package.json index 719ee887..fb5bd95d 100644 --- a/test/CodeCoverage/package.json +++ b/test/CodeCoverage/package.json @@ -13,6 +13,10 @@ "through2": "^2.0.3" }, "devDependencies": {}, + "repository": { + "type": "git", + "url": "https://github.com/Microsoft/sqltoolsservice.git" + }, "author": "Microsoft", "license": "MIT" } diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs index a145ab79..0c10f725 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserMockEventHandler.cs @@ -8,7 +8,7 @@ using System.Data.SqlClient; using System.Diagnostics; using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; -namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser +namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser { internal class BatchParserMockEventHandler : IBatchEventsHandler { diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserSqlCmdTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserSqlCmdTests.cs index 55054250..6bf8f75e 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserSqlCmdTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserSqlCmdTests.cs @@ -1,118 +1,118 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -using System; -using System.IO; -using Microsoft.SqlTools.ServiceLayer.BatchParser; -using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; -using Moq; -using Xunit; - -namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser -{ - public class BatchParserSqlCmdTests : IDisposable - { - private BatchParserSqlCmd bpcmd; - private PositionStruct testPOS; - public BatchParserSqlCmdTests() - { - bpcmd = new BatchParserSqlCmd(); - testPOS = new PositionStruct(); - bpcmd.SetVariable(testPOS, "variable1", "test1"); - bpcmd.SetVariable(testPOS, "variable2", "test2"); - bpcmd.SetVariable(testPOS, "variable3", "test3"); - } - - public void Dispose() - { - Dispose(true); - } - - private void Dispose(bool disposing) - { - if (disposing) - { - if (bpcmd != null) - { - bpcmd = null; - } - } - } - - [Fact] - public void CheckSetVariable() - { - Assert.Equal(bpcmd.InternalVariables.Count, 3); - bpcmd.SetVariable(testPOS, "variable4", "test4"); - bpcmd.SetVariable(testPOS, "variable5", "test5"); - bpcmd.SetVariable(testPOS, "variable6", "test6"); - Assert.Equal(bpcmd.InternalVariables.Count, 6); - } - - [Fact] - public void CheckSetNullValueVariable() - { - Assert.Equal(bpcmd.InternalVariables.Count, 3); - bpcmd.SetVariable(testPOS, "variable4", "test4"); - Assert.Equal(bpcmd.InternalVariables.Count, 4); - bpcmd.SetVariable(testPOS, "variable4", null); - Assert.Equal(bpcmd.InternalVariables.Count, 3); - } - - [Fact] - public void CheckGetVariable() - { - string value = bpcmd.GetVariable(testPOS, "variable1"); - Assert.Equal("test1", value); - value = bpcmd.GetVariable(testPOS, "variable2"); - Assert.Equal("test2", value); - value = bpcmd.GetVariable(testPOS, "variable3"); - Assert.Equal("test3", value); - } - - [Fact] - public void CheckGetNullVariable() - { - Assert.Null(bpcmd.GetVariable(testPOS, "variable6")); - } - - [Fact] - public void CheckInclude() - { - TextReader textReader = null; - string outString = "out"; - var result = bpcmd.Include(null, out textReader, out outString); - Assert.Equal(result, BatchParserAction.Abort); - - } - - [Fact] - public void CheckOnError() - { - var errorActionChanged = bpcmd.ErrorActionChanged; - var action = new OnErrorAction(); - var result = bpcmd.OnError(null, action); - Assert.Equal(result, BatchParserAction.Continue); - } - - [Fact] - public void CheckConnectionChangedDelegate() - { - var initial = bpcmd.ConnectionChanged; - bpcmd.ConnectionChanged = null; - Assert.Null(bpcmd.ConnectionChanged); - } - - [Fact] - public void CheckVariableSubstitutionDisabled() - { - bpcmd.DisableVariableSubstitution(); - bpcmd.SetVariable(testPOS, "variable1", "test"); - var result = bpcmd.GetVariable(testPOS, "variable1"); - Assert.Null(result); - } - - } -} +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using System; +using System.IO; +using Microsoft.SqlTools.ServiceLayer.BatchParser; +using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; +using Moq; +using Xunit; + +namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser +{ + public class BatchParserSqlCmdTests : IDisposable + { + private BatchParserSqlCmd bpcmd; + private PositionStruct testPOS; + public BatchParserSqlCmdTests() + { + bpcmd = new BatchParserSqlCmd(); + testPOS = new PositionStruct(); + bpcmd.SetVariable(testPOS, "variable1", "test1"); + bpcmd.SetVariable(testPOS, "variable2", "test2"); + bpcmd.SetVariable(testPOS, "variable3", "test3"); + } + + public void Dispose() + { + Dispose(true); + } + + private void Dispose(bool disposing) + { + if (disposing) + { + if (bpcmd != null) + { + bpcmd = null; + } + } + } + + [Fact] + public void CheckSetVariable() + { + Assert.Equal(bpcmd.InternalVariables.Count, 3); + bpcmd.SetVariable(testPOS, "variable4", "test4"); + bpcmd.SetVariable(testPOS, "variable5", "test5"); + bpcmd.SetVariable(testPOS, "variable6", "test6"); + Assert.Equal(bpcmd.InternalVariables.Count, 6); + } + + [Fact] + public void CheckSetNullValueVariable() + { + Assert.Equal(bpcmd.InternalVariables.Count, 3); + bpcmd.SetVariable(testPOS, "variable4", "test4"); + Assert.Equal(bpcmd.InternalVariables.Count, 4); + bpcmd.SetVariable(testPOS, "variable4", null); + Assert.Equal(bpcmd.InternalVariables.Count, 3); + } + + [Fact] + public void CheckGetVariable() + { + string value = bpcmd.GetVariable(testPOS, "variable1"); + Assert.Equal("test1", value); + value = bpcmd.GetVariable(testPOS, "variable2"); + Assert.Equal("test2", value); + value = bpcmd.GetVariable(testPOS, "variable3"); + Assert.Equal("test3", value); + } + + [Fact] + public void CheckGetNullVariable() + { + Assert.Null(bpcmd.GetVariable(testPOS, "variable6")); + } + + [Fact] + public void CheckInclude() + { + TextReader textReader = null; + string outString = "out"; + var result = bpcmd.Include(null, out textReader, out outString); + Assert.Equal(result, BatchParserAction.Abort); + + } + + [Fact] + public void CheckOnError() + { + var errorActionChanged = bpcmd.ErrorActionChanged; + var action = new OnErrorAction(); + var result = bpcmd.OnError(null, action); + Assert.Equal(result, BatchParserAction.Continue); + } + + [Fact] + public void CheckConnectionChangedDelegate() + { + var initial = bpcmd.ConnectionChanged; + bpcmd.ConnectionChanged = null; + Assert.Null(bpcmd.ConnectionChanged); + } + + [Fact] + public void CheckVariableSubstitutionDisabled() + { + bpcmd.DisableVariableSubstitution(); + bpcmd.SetVariable(testPOS, "variable1", "test"); + var result = bpcmd.GetVariable(testPOS, "variable1"); + Assert.Null(result); + } + + } +} diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs index ba5a01dc..6580ec67 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs @@ -1,272 +1,292 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -using System; -using System.Globalization; -using System.IO; -using System.Text; -using Microsoft.SqlTools.ServiceLayer.BatchParser; -using Microsoft.SqlTools.ServiceLayer.Test.Common; -using Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined; -using Xunit; -using Microsoft.SqlTools.ServiceLayer.QueryExecution; -using Microsoft.SqlTools.ServiceLayer.Utility; - -namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser -{ - public class BatchParserTests : BaselinedTest - { - private bool testFailed = false; - - public BatchParserTests() - { - InitializeTest(); - } - - public void InitializeTest() - { - CategoryName = "BatchParser"; - this.TraceOutputDirectory = RunEnvironmentInfo.GetTraceOutputLocation(); - TestInitialize(); - } - - [Fact] - public void VerifyThrowOnUnresolvedVariable() - { - string script = "print '$(NotDefined)'"; - StringBuilder output = new StringBuilder(); - - TestCommandHandler handler = new TestCommandHandler(output); - IVariableResolver resolver = new TestVariableResolver(new StringBuilder()); - using (Parser p = new Parser( - handler, - resolver, - new StringReader(script), - "test")) - { - p.ThrowOnUnresolvedVariable = true; - handler.SetParser(p); - - Assert.Throws(() => p.Parse()); - } - } - - private static Stream GenerateStreamFromString(string s) - { - MemoryStream stream = new MemoryStream(); - StreamWriter writer = new StreamWriter(stream); - writer.Write(s); - writer.Flush(); - stream.Position = 0; - return stream; - } - - public void TokenizeWithLexer(string filename, StringBuilder output) - { - // Create a new file by changing CRLFs to LFs and generate a new steam - // or the tokens generated by the lexer will always have off by one errors - string input = File.ReadAllText(filename).Replace("\r\n", "\n"); - var inputStream = GenerateStreamFromString(input); - using (Lexer lexer = new Lexer(new StreamReader(inputStream), filename)) - { - - string inputText = File.ReadAllText(filename); - inputText = inputText.Replace("\r\n", "\n"); - StringBuilder roundtripTextBuilder = new StringBuilder(); - StringBuilder outputBuilder = new StringBuilder(); - StringBuilder tokenizedInput = new StringBuilder(); - bool lexerError = false; - - Token token = null; - try - { - do - { - lexer.ConsumeToken(); - token = lexer.CurrentToken; - roundtripTextBuilder.Append(token.Text.Replace("\r\n", "\n")); - outputBuilder.AppendLine(GetTokenString(token)); - tokenizedInput.Append('[').Append(GetTokenCode(token.TokenType)).Append(':').Append(token.Text.Replace("\r\n", "\n")).Append(']'); - } while (token.TokenType != LexerTokenType.Eof); - } - catch (BatchParserException ex) - { - lexerError = true; - outputBuilder.AppendLine(string.Format(CultureInfo.CurrentCulture, "[ERROR: code {0} at {1} - {2} in {3}, message: {4}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Message)); - } - output.AppendLine("Lexer tokenized input:"); - output.AppendLine("======================"); - output.AppendLine(tokenizedInput.ToString()); - output.AppendLine("Tokens:"); - output.AppendLine("======="); - output.AppendLine(outputBuilder.ToString()); - - if (lexerError == false) - { - // Verify that all text from tokens can be recombined into original string - Assert.Equal(inputText, roundtripTextBuilder.ToString()); - } - } - } - - private string GetTokenCode(LexerTokenType lexerTokenType) - { - switch (lexerTokenType) - { - case LexerTokenType.Text: - return "T"; - case LexerTokenType.Whitespace: - return "WS"; - case LexerTokenType.NewLine: - return "NL"; - case LexerTokenType.Comment: - return "C"; - default: - return lexerTokenType.ToString(); - } - } - - private static void CopyToOutput(string sourceDirectory, string filename) - { - File.Copy(Path.Combine(sourceDirectory, filename), filename, true); - FileUtilities.SetFileReadWrite(filename); - } - - // [Fact] - public void BatchParserTest() - { - CopyToOutput(FilesLocation, "TS-err-cycle1.txt"); - CopyToOutput(FilesLocation, "cycle2.txt"); - Start("err-blockComment"); - Start("err-blockComment2"); - Start("err-varDefinition"); - Start("err-varDefinition2"); - Start("err-varDefinition3"); - Start("err-varDefinition4"); - Start("err-varDefinition5"); - Start("err-varDefinition6"); - Start("err-varDefinition7"); - Start("err-varDefinition8"); - Start("err-varDefinition9"); - Start("err-variableRef"); - Start("err-variableRef2"); - Start("err-variableRef3"); - Start("err-variableRef4"); - Start("err-cycle1"); - Start("input"); - Start("input2"); - Start("pass-blockComment"); - Start("pass-lineComment"); - Start("pass-lineComment2"); - Start("pass-noBlockComments"); - Start("pass-noLineComments"); - Start("pass-varDefinition"); - Start("pass-varDefinition2"); - Start("pass-varDefinition3"); - Start("pass-varDefinition4"); - Start("pass-command-and-comment"); - Assert.False(testFailed, "At least one of test cases failed. Check output for details."); - } - - public void TestParser(string filename, StringBuilder output) - { - try - { - // Create a new file by changing CRLFs to LFs and generate a new steam - // or the tokens generated by the lexer will always have off by one errors - TestCommandHandler commandHandler = new TestCommandHandler(output); - string input = File.ReadAllText(filename).Replace("\r\n", "\n"); - var inputStream = GenerateStreamFromString(input); - StreamReader streamReader = new StreamReader(inputStream); - - using (Parser parser = new Parser( - commandHandler, - new TestVariableResolver(output), - streamReader, - filename)) - { - commandHandler.SetParser(parser); - parser.Parse(); - } - } - catch (BatchParserException ex) - { - output.AppendLine(string.Format(CultureInfo.CurrentCulture, "[PARSER ERROR: code {0} at {1} - {2} in {3}, token text: {4}, message: {5}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Text, ex.Message)); - } - } - - private string GetPositionString(PositionStruct pos) - { - return string.Format(CultureInfo.InvariantCulture, "{0}:{1} [{2}]", pos.Line, pos.Column, pos.Offset); - } - - private string GetTokenString(Token token) - { - if (token == null) - { - return "(null)"; - } - else - { - string tokenText = token.Text; - if (tokenText != null) - { - tokenText = tokenText.Replace("\r\n", "\\n").Replace("\n", "\\n").Replace("\r", "\\r").Replace("\t", "\\t"); - } - string tokenFilename = token.Filename; - tokenFilename = GetFilenameOnly(tokenFilename); - return string.Format(CultureInfo.CurrentCulture, "[Token {0} at {1}({2}:{3} [{4}] - {5}:{6} [{7}]): '{8}']", - token.TokenType, - tokenFilename, - token.Begin.Line, token.Begin.Column, token.Begin.Offset, - token.End.Line, token.End.Column, token.End.Offset, - tokenText); - } - } - - internal static string GetFilenameOnly(string fullPath) - { - return fullPath != null ? Path.GetFileName(fullPath) : null; - } - - public override void Run() - { - string inputFilename = GetTestscriptFilePath(CurrentTestName); - StringBuilder output = new StringBuilder(); - - TokenizeWithLexer(inputFilename, output); - TestParser(inputFilename, output); - - string baselineFilename = GetBaselineFilePath(CurrentTestName); - string baseline; - - try - { - baseline = GetFileContent(baselineFilename).Replace("\r\n", "\n"); - } - catch (FileNotFoundException) - { - baseline = string.Empty; - } - - string outputString = output.ToString().Replace("\r\n", "\n"); - - //Console.WriteLine(baselineFilename); - - if (string.Compare(baseline, outputString, StringComparison.Ordinal) != 0) - { - DumpToTrace(CurrentTestName, outputString); - string outputFilename = Path.Combine(TraceFilePath, GetBaselineFileName(CurrentTestName)); - Console.WriteLine(":: Output does not match the baseline!"); - Console.WriteLine("code --diff \"" + baselineFilename + "\" \"" + outputFilename + "\""); - Console.WriteLine(); - Console.WriteLine(":: To update the baseline:"); - Console.WriteLine("copy \"" + outputFilename + "\" \"" + baselineFilename + "\""); - Console.WriteLine(); - testFailed = true; - } - } - } -} +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using System; +using System.Globalization; +using System.IO; +using System.Text; +using Microsoft.SqlTools.ServiceLayer.BatchParser; +using Microsoft.SqlTools.ServiceLayer.Test.Common; +using Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined; +using Xunit; +using Microsoft.SqlTools.ServiceLayer.Utility; +using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; +using Microsoft.SqlTools.ServiceLayer.IntegrationTests.TSQLExecutionEngine; + +namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser +{ + public class BatchParserTests : BaselinedTest + { + private bool testFailed = false; + + public BatchParserTests() + { + InitializeTest(); + } + + public void InitializeTest() + { + CategoryName = "BatchParser"; + this.TraceOutputDirectory = RunEnvironmentInfo.GetTraceOutputLocation(); + TestInitialize(); + } + + [Fact] + public void VerifyThrowOnUnresolvedVariable() + { + string script = "print '$(NotDefined)'"; + StringBuilder output = new StringBuilder(); + + TestCommandHandler handler = new TestCommandHandler(output); + IVariableResolver resolver = new TestVariableResolver(new StringBuilder()); + using (Parser p = new Parser( + handler, + resolver, + new StringReader(script), + "test")) + { + p.ThrowOnUnresolvedVariable = true; + handler.SetParser(p); + + Assert.Throws(() => p.Parse()); + } + } + + [Fact] + public void VerifyExecuteScript() + { + string query = "select @@version"; + ExecutionEngineTest executionEngineTest = new ExecutionEngineTest(); + executionEngineTest.TestInitialize(); + using (ExecutionEngine engine = new ExecutionEngine()) + { + engine.ExecuteScript(query); + } + } + + [Fact] + public void CanceltheBatch() + { + Batch batch = new Batch(); + batch.Cancel(); + } + + private static Stream GenerateStreamFromString(string s) + { + MemoryStream stream = new MemoryStream(); + StreamWriter writer = new StreamWriter(stream); + writer.Write(s); + writer.Flush(); + stream.Position = 0; + return stream; + } + + public void TokenizeWithLexer(string filename, StringBuilder output) + { + // Create a new file by changing CRLFs to LFs and generate a new steam + // or the tokens generated by the lexer will always have off by one errors + string input = File.ReadAllText(filename).Replace("\r\n", "\n"); + var inputStream = GenerateStreamFromString(input); + using (Lexer lexer = new Lexer(new StreamReader(inputStream), filename)) + { + + string inputText = File.ReadAllText(filename); + inputText = inputText.Replace("\r\n", "\n"); + StringBuilder roundtripTextBuilder = new StringBuilder(); + StringBuilder outputBuilder = new StringBuilder(); + StringBuilder tokenizedInput = new StringBuilder(); + bool lexerError = false; + + Token token = null; + try + { + do + { + lexer.ConsumeToken(); + token = lexer.CurrentToken; + roundtripTextBuilder.Append(token.Text.Replace("\r\n", "\n")); + outputBuilder.AppendLine(GetTokenString(token)); + tokenizedInput.Append('[').Append(GetTokenCode(token.TokenType)).Append(':').Append(token.Text.Replace("\r\n", "\n")).Append(']'); + } while (token.TokenType != LexerTokenType.Eof); + } + catch (BatchParserException ex) + { + lexerError = true; + outputBuilder.AppendLine(string.Format(CultureInfo.CurrentCulture, "[ERROR: code {0} at {1} - {2} in {3}, message: {4}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Message)); + } + output.AppendLine("Lexer tokenized input:"); + output.AppendLine("======================"); + output.AppendLine(tokenizedInput.ToString()); + output.AppendLine("Tokens:"); + output.AppendLine("======="); + output.AppendLine(outputBuilder.ToString()); + + if (lexerError == false) + { + // Verify that all text from tokens can be recombined into original string + Assert.Equal(inputText, roundtripTextBuilder.ToString()); + } + } + } + + private string GetTokenCode(LexerTokenType lexerTokenType) + { + switch (lexerTokenType) + { + case LexerTokenType.Text: + return "T"; + case LexerTokenType.Whitespace: + return "WS"; + case LexerTokenType.NewLine: + return "NL"; + case LexerTokenType.Comment: + return "C"; + default: + return lexerTokenType.ToString(); + } + } + + private static void CopyToOutput(string sourceDirectory, string filename) + { + File.Copy(Path.Combine(sourceDirectory, filename), filename, true); + FileUtilities.SetFileReadWrite(filename); + } + + // [Fact] + public void BatchParserTest() + { + CopyToOutput(FilesLocation, "TS-err-cycle1.txt"); + CopyToOutput(FilesLocation, "cycle2.txt"); + Start("err-blockComment"); + Start("err-blockComment2"); + Start("err-varDefinition"); + Start("err-varDefinition2"); + Start("err-varDefinition3"); + Start("err-varDefinition4"); + Start("err-varDefinition5"); + Start("err-varDefinition6"); + Start("err-varDefinition7"); + Start("err-varDefinition8"); + Start("err-varDefinition9"); + Start("err-variableRef"); + Start("err-variableRef2"); + Start("err-variableRef3"); + Start("err-variableRef4"); + Start("err-cycle1"); + Start("input"); + Start("input2"); + Start("pass-blockComment"); + Start("pass-lineComment"); + Start("pass-lineComment2"); + Start("pass-noBlockComments"); + Start("pass-noLineComments"); + Start("pass-varDefinition"); + Start("pass-varDefinition2"); + Start("pass-varDefinition3"); + Start("pass-varDefinition4"); + Start("pass-command-and-comment"); + Assert.False(testFailed, "At least one of test cases failed. Check output for details."); + } + + public void TestParser(string filename, StringBuilder output) + { + try + { + // Create a new file by changing CRLFs to LFs and generate a new steam + // or the tokens generated by the lexer will always have off by one errors + TestCommandHandler commandHandler = new TestCommandHandler(output); + string input = File.ReadAllText(filename).Replace("\r\n", "\n"); + var inputStream = GenerateStreamFromString(input); + StreamReader streamReader = new StreamReader(inputStream); + + using (Parser parser = new Parser( + commandHandler, + new TestVariableResolver(output), + streamReader, + filename)) + { + commandHandler.SetParser(parser); + parser.Parse(); + } + } + catch (BatchParserException ex) + { + output.AppendLine(string.Format(CultureInfo.CurrentCulture, "[PARSER ERROR: code {0} at {1} - {2} in {3}, token text: {4}, message: {5}]", ex.ErrorCode, GetPositionString(ex.Begin), GetPositionString(ex.End), GetFilenameOnly(ex.Begin.Filename), ex.Text, ex.Message)); + } + } + + private string GetPositionString(PositionStruct pos) + { + return string.Format(CultureInfo.InvariantCulture, "{0}:{1} [{2}]", pos.Line, pos.Column, pos.Offset); + } + + private string GetTokenString(Token token) + { + if (token == null) + { + return "(null)"; + } + else + { + string tokenText = token.Text; + if (tokenText != null) + { + tokenText = tokenText.Replace("\r\n", "\\n").Replace("\n", "\\n").Replace("\r", "\\r").Replace("\t", "\\t"); + } + string tokenFilename = token.Filename; + tokenFilename = GetFilenameOnly(tokenFilename); + return string.Format(CultureInfo.CurrentCulture, "[Token {0} at {1}({2}:{3} [{4}] - {5}:{6} [{7}]): '{8}']", + token.TokenType, + tokenFilename, + token.Begin.Line, token.Begin.Column, token.Begin.Offset, + token.End.Line, token.End.Column, token.End.Offset, + tokenText); + } + } + + internal static string GetFilenameOnly(string fullPath) + { + return fullPath != null ? Path.GetFileName(fullPath) : null; + } + + public override void Run() + { + string inputFilename = GetTestscriptFilePath(CurrentTestName); + StringBuilder output = new StringBuilder(); + + TokenizeWithLexer(inputFilename, output); + TestParser(inputFilename, output); + + string baselineFilename = GetBaselineFilePath(CurrentTestName); + string baseline; + + try + { + baseline = GetFileContent(baselineFilename).Replace("\r\n", "\n"); + } + catch (FileNotFoundException) + { + baseline = string.Empty; + } + + string outputString = output.ToString().Replace("\r\n", "\n"); + + //Console.WriteLine(baselineFilename); + + if (string.Compare(baseline, outputString, StringComparison.Ordinal) != 0) + { + DumpToTrace(CurrentTestName, outputString); + string outputFilename = Path.Combine(TraceFilePath, GetBaselineFileName(CurrentTestName)); + Console.WriteLine(":: Output does not match the baseline!"); + Console.WriteLine("code --diff \"" + baselineFilename + "\" \"" + outputFilename + "\""); + Console.WriteLine(); + Console.WriteLine(":: To update the baseline:"); + Console.WriteLine("copy \"" + outputFilename + "\" \"" + baselineFilename + "\""); + Console.WriteLine(); + testFailed = true; + } + } + } +} diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserWrapperTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserWrapperTests.cs index 51ac76d0..b6448140 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserWrapperTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserWrapperTests.cs @@ -1,69 +1,74 @@ -using System; -using Microsoft.SqlTools.ServiceLayer.BatchParser; -using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; -using Xunit; - -namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser -{ - public class BatchParserWrapperTests - { - [Fact] - public void CheckSimpleSingleSQLBatchStatement() - { - using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) - { - string sqlScript = "select * from sys.objects"; - var batches = parserWrapper.GetBatches(sqlScript); - Assert.Equal(1, batches.Count); - BatchDefinition batch = batches[0]; - Assert.Equal(sqlScript, batch.BatchText); - Assert.Equal(1, batch.StartLine); - Assert.Equal(1, batch.StartColumn); - Assert.Equal(2, batch.EndLine); - Assert.Equal(sqlScript.Length+1, batch.EndColumn); - Assert.Equal(1, batch.BatchExecutionCount); - } - } - - [Fact] - public void CheckSQLBatchStatementWithRepeatExecution() - { - using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) - { - string sqlScript = "select * from sys.object" + Environment.NewLine + "GO 2"; - var batches = parserWrapper.GetBatches(sqlScript); - Assert.Equal(1, batches.Count); - BatchDefinition batch = batches[0]; - Assert.Equal(2, batch.BatchExecutionCount); - } - } - - [Fact] - public void CheckComment() - { - using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) - { - string sqlScript = "-- this is a comment --"; - var batches = parserWrapper.GetBatches(sqlScript); - Assert.Equal(1, batches.Count); - BatchDefinition batch = batches[0]; - Assert.Equal(sqlScript, batch.BatchText); - Assert.Equal(1, batch.StartLine); - Assert.Equal(1, batch.StartColumn); - Assert.Equal(2, batch.EndLine); - Assert.Equal(sqlScript.Length+1, batch.EndColumn); - } - } - - [Fact] - public void CheckNoOps() - { - using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) - { - string sqlScript = "GO"; - var batches = parserWrapper.GetBatches(sqlScript); - Assert.Equal(0, batches.Count); - } - } - } -} +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using System; +using Microsoft.SqlTools.ServiceLayer.BatchParser; +using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode; +using Xunit; + +namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser +{ + public class BatchParserWrapperTests + { + [Fact] + public void CheckSimpleSingleSQLBatchStatement() + { + using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) + { + string sqlScript = "select * from sys.objects"; + var batches = parserWrapper.GetBatches(sqlScript); + Assert.Equal(1, batches.Count); + BatchDefinition batch = batches[0]; + Assert.Equal(sqlScript, batch.BatchText); + Assert.Equal(1, batch.StartLine); + Assert.Equal(1, batch.StartColumn); + Assert.Equal(2, batch.EndLine); + Assert.Equal(sqlScript.Length + 1, batch.EndColumn); + Assert.Equal(1, batch.BatchExecutionCount); + } + } + + [Fact] + public void CheckSQLBatchStatementWithRepeatExecution() + { + using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) + { + string sqlScript = "select * from sys.object" + Environment.NewLine + "GO 2"; + var batches = parserWrapper.GetBatches(sqlScript); + Assert.Equal(1, batches.Count); + BatchDefinition batch = batches[0]; + Assert.Equal(2, batch.BatchExecutionCount); + } + } + + [Fact] + public void CheckComment() + { + using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) + { + string sqlScript = "-- this is a comment --"; + var batches = parserWrapper.GetBatches(sqlScript); + Assert.Equal(1, batches.Count); + BatchDefinition batch = batches[0]; + Assert.Equal(sqlScript, batch.BatchText); + Assert.Equal(1, batch.StartLine); + Assert.Equal(1, batch.StartColumn); + Assert.Equal(2, batch.EndLine); + Assert.Equal(sqlScript.Length + 1, batch.EndColumn); + } + } + + [Fact] + public void CheckNoOps() + { + using (BatchParserWrapper parserWrapper = new BatchParserWrapper()) + { + string sqlScript = "GO"; + var batches = parserWrapper.GetBatches(sqlScript); + Assert.Equal(0, batches.Count); + } + } + } +} \ No newline at end of file diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestCommandHandler.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestCommandHandler.cs index 9ccdfdc4..9979b0fa 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestCommandHandler.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestCommandHandler.cs @@ -9,7 +9,7 @@ using System.Text; using System.Globalization; using Microsoft.SqlTools.ServiceLayer.BatchParser; -namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser +namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser { internal class TestCommandHandler : ICommandHandler { diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestVariableResolver.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestVariableResolver.cs index ab8c7384..c4b116bd 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestVariableResolver.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/TestVariableResolver.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.SqlTools.ServiceLayer.BatchParser; -namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser +namespace Microsoft.SqlTools.ManagedBatchParser.UnitTests.BatchParser { internal sealed class TestVariableResolver : IVariableResolver { diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj index 75ea5c97..c246c75c 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj @@ -22,11 +22,11 @@ ../../bin/ref/Castle.Core.dll - - + + diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj index fc459e42..c9aa721f 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj @@ -15,7 +15,7 @@ - + diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/SrTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/SrTests.cs index 224b75ac..0d5a1829 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/SrTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/SrTests.cs @@ -26,16 +26,6 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility Assert.NotNull(ServiceLayerSr.QueryServiceFileWrapperNotInitialized); Assert.NotNull(ServiceLayerSr.QueryServiceColumnNull); Assert.NotNull(ServiceLayerSr.Culture); - Assert.NotNull(ServiceLayerSr.BatchParser_CircularReference); - Assert.NotNull(ServiceLayerSr.BatchParser_CommentNotTerminated); - Assert.NotNull(ServiceLayerSr.BatchParser_IncorrectSyntax); - Assert.NotNull(ServiceLayerSr.BatchParser_StringNotTerminated); - Assert.NotNull(ServiceLayerSr.BatchParser_VariableNotDefined); - Assert.NotNull(ServiceLayerSr.BatchParserWrapperExecutionEngineBatchCancelling); - Assert.NotNull(ServiceLayerSr.BatchParserWrapperExecutionEngineBatchMessage); - Assert.NotNull(ServiceLayerSr.BatchParserWrapperExecutionEngineBatchResultSetFinished); - Assert.NotNull(ServiceLayerSr.BatchParserWrapperExecutionEngineBatchResultSetProcessing); - Assert.NotNull(ServiceLayerSr.BatchParserWrapperExecutionEngineError); Assert.NotNull(ServiceLayerSr.BatchParserWrapperExecutionError); Assert.NotNull(ServiceLayerSr.ConnectionParamsValidateNullConnection); Assert.NotNull(ServiceLayerSr.ConnectionParamsValidateNullOwnerUri); @@ -48,23 +38,6 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility Assert.NotNull(ServiceLayerSr.ConnectionServiceDbErrorDefaultNotConnected("")); Assert.NotNull(ServiceLayerSr.ConnectionServiceListDbErrorNotConnected("")); Assert.NotNull(ServiceLayerSr.ConnectionServiceListDbErrorNullOwnerUri); - Assert.NotNull(ServiceLayerSr.EE_BatchError_Exception); - Assert.NotNull(ServiceLayerSr.EE_BatchExecutionError_Halting); - Assert.NotNull(ServiceLayerSr.EE_BatchExecutionError_Ignoring); - Assert.NotNull(ServiceLayerSr.EE_BatchExecutionInfo_RowsAffected); - Assert.NotNull(ServiceLayerSr.EE_BatchSqlMessageNoLineInfo); - Assert.NotNull(ServiceLayerSr.EE_BatchSqlMessageNoProcedureInfo); - Assert.NotNull(ServiceLayerSr.EE_BatchSqlMessageWithProcedureInfo); - Assert.NotNull(ServiceLayerSr.EE_ExecutionError_CommandNotSupported); - Assert.NotNull(ServiceLayerSr.EE_ExecutionError_VariableNotFound); - Assert.NotNull(ServiceLayerSr.EE_ExecutionInfo_FinalizingLoop); - Assert.NotNull(ServiceLayerSr.EE_ExecutionInfo_InitializingLoop); - Assert.NotNull(ServiceLayerSr.EE_ExecutionInfo_QueryCancelledbyUser); - Assert.NotNull(ServiceLayerSr.EE_ExecutionNotYetCompleteError); - Assert.NotNull(ServiceLayerSr.EE_ScriptError_Error); - Assert.NotNull(ServiceLayerSr.EE_ScriptError_FatalError); - Assert.NotNull(ServiceLayerSr.EE_ScriptError_ParsingSyntax); - Assert.NotNull(ServiceLayerSr.EE_ScriptError_Warning); Assert.NotNull(ServiceLayerSr.ErrorEmptyStringReplacement); Assert.NotNull(ServiceLayerSr.PeekDefinitionAzureError("")); Assert.NotNull(ServiceLayerSr.PeekDefinitionDatabaseError); @@ -104,7 +77,6 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility Assert.NotNull(ServiceLayerSr.QueryServiceSubsetBatchOutOfRange); Assert.NotNull(ServiceLayerSr.QueryServiceSubsetResultSetOutOfRange); Assert.NotNull(ServiceLayerSr.TestLocalizationConstant); - Assert.NotNull(ServiceLayerSr.TroubleshootingAssistanceMessage); Assert.NotNull(ServiceLayerSr.WorkspaceServiceBufferPositionOutOfOrder(0,0,0,0)); Assert.NotNull(ServiceLayerSr.WorkspaceServicePositionColumnOutOfRange(0)); Assert.NotNull(ServiceLayerSr.WorkspaceServicePositionLineOutOfRange);