diff --git a/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.1.12.nupkg b/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.1.12.nupkg
deleted file mode 100644
index dc01f6b9..00000000
Binary files a/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.1.12.nupkg and /dev/null differ
diff --git a/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.17049.0.nupkg b/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.17049.0.nupkg
new file mode 100644
index 00000000..3154dadb
Binary files /dev/null and b/bin/nuget/Microsoft.SqlServer.Management.SqlScriptPublishModel.140.17049.0.nupkg differ
diff --git a/bin/nuget/Microsoft.SqlServer.Smo.14.0.17028.nupkg b/bin/nuget/Microsoft.SqlServer.Smo.14.0.17028.nupkg
deleted file mode 100644
index dc26312e..00000000
Binary files a/bin/nuget/Microsoft.SqlServer.Smo.14.0.17028.nupkg and /dev/null differ
diff --git a/bin/nuget/Microsoft.SqlServer.Smo.140.17049.0.nupkg b/bin/nuget/Microsoft.SqlServer.Smo.140.17049.0.nupkg
new file mode 100644
index 00000000..e79d8fc1
Binary files /dev/null and b/bin/nuget/Microsoft.SqlServer.Smo.140.17049.0.nupkg differ
diff --git a/docs/samples/jsonrpc/netcore/executequery/project.json b/docs/samples/jsonrpc/netcore/executequery/project.json
index 7fbc78f7..6a081889 100644
--- a/docs/samples/jsonrpc/netcore/executequery/project.json
+++ b/docs/samples/jsonrpc/netcore/executequery/project.json
@@ -4,7 +4,7 @@
"buildOptions": {
"debugType": "portable",
"emitEntryPoint": true
- },
+ },
"dependencies": {
"Microsoft.SqlTools.ServiceLayer": {
"target": "project"
@@ -12,11 +12,11 @@
"Newtonsoft.Json": "9.0.1",
"System.Data.Common": "4.1.0",
"System.Data.SqlClient": "4.4.0-sqltools-24613-04",
- "Microsoft.SqlServer.Smo": "14.0.17028",
+ "Microsoft.SqlServer.Smo": "140.17049.0",
"System.Security.SecureString": "4.0.0",
"System.Collections.Specialized": "4.0.1",
"System.ComponentModel.TypeConverter": "4.1.0",
- "System.Diagnostics.Contracts": "4.0.1",
+ "System.Diagnostics.Contracts": "4.0.1",
"System.Diagnostics.TraceSource": "4.0.0",
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
diff --git a/docs/samples/smo/netcore/ModifySetting/project.json b/docs/samples/smo/netcore/ModifySetting/project.json
index b046cbdc..912dedb8 100644
--- a/docs/samples/smo/netcore/ModifySetting/project.json
+++ b/docs/samples/smo/netcore/ModifySetting/project.json
@@ -5,7 +5,7 @@
"emitEntryPoint": true
},
"dependencies": {
- "Microsoft.SqlServer.Smo": "14.0.17028"
+ "Microsoft.SqlServer.Smo": "140.17049.0"
},
"frameworks": {
"netcoreapp1.0": {
diff --git a/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs b/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs
index 94a3d9cf..142bd9cf 100644
--- a/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs
+++ b/src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs
@@ -56,4 +56,26 @@ namespace Microsoft.SqlTools.Utility
return obj.HasValue && obj.Value;
}
}
+
+ public static class ExceptionExtensions
+ {
+ ///
+ /// Returns true if the passed exception or any inner exception is an OperationCanceledException instance.
+ ///
+ public static bool IsOperationCanceledException(this Exception e)
+ {
+ Exception current = e;
+ while (current != null)
+ {
+ if (current is OperationCanceledException)
+ {
+ return true;
+ }
+
+ current = current.InnerException;
+ }
+
+ return false;
+ }
+ }
}
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
index 64342d99..0ecdf44b 100755
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
@@ -2157,6 +2157,30 @@ namespace Microsoft.SqlTools.ServiceLayer
}
}
+ public static string ScriptingParams_ConnectionString_Property_Invalid
+ {
+ get
+ {
+ return Keys.GetString(Keys.ScriptingParams_ConnectionString_Property_Invalid);
+ }
+ }
+
+ public static string ScriptingParams_FilePath_Property_Invalid
+ {
+ get
+ {
+ return Keys.GetString(Keys.ScriptingParams_FilePath_Property_Invalid);
+ }
+ }
+
+ public static string ScriptingListObjectsCompleteParams_ConnectionString_Property_Invalid
+ {
+ get
+ {
+ return Keys.GetString(Keys.ScriptingListObjectsCompleteParams_ConnectionString_Property_Invalid);
+ }
+ }
+
public static string ConnectionServiceListDbErrorNotConnected(string uri)
{
return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri);
@@ -3075,6 +3099,15 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string SchemaHierarchy_ColumnEncryptionKeys = "SchemaHierarchy_ColumnEncryptionKeys";
+ public const string ScriptingParams_ConnectionString_Property_Invalid = "ScriptingParams_ConnectionString_Property_Invalid";
+
+
+ public const string ScriptingParams_FilePath_Property_Invalid = "ScriptingParams_FilePath_Property_Invalid";
+
+
+ public const string ScriptingListObjectsCompleteParams_ConnectionString_Property_Invalid = "ScriptingListObjectsCompleteParams_ConnectionString_Property_Invalid";
+
+
private Keys()
{ }
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
index 03e831de..bc2d0904 100755
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
@@ -1251,4 +1251,16 @@
Column Encryption Keys
+
+ Error parsing ScriptingParams.ConnectionString property.
+
+
+
+ Invalid directory specified by the ScriptingParams.FilePath property.
+
+
+
+ Error parsing ScriptingListObjectsCompleteParams.ConnectionString property.
+
+
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
index 518320ed..190816a6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
@@ -623,3 +623,11 @@ SchemaHierarchy_ColumnMasterKeys = Column Master Keys
SchemaHierarchy_ColumnEncryptionKeys = Column Encryption Keys
+############################################################################
+# Scripting Service
+
+ScriptingParams_ConnectionString_Property_Invalid = Error parsing ScriptingParams.ConnectionString property.
+
+ScriptingParams_FilePath_Property_Invalid = Invalid directory specified by the ScriptingParams.FilePath property.
+
+ScriptingListObjectsCompleteParams_ConnectionString_Property_Invalid = Error parsing ScriptingListObjectsCompleteParams.ConnectionString property.
\ 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 db7ae2a5..8fd4b025 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
@@ -1416,6 +1416,21 @@
Server
+
+ Error parsing ScriptingParams.ConnectionString property.
+ Error parsing ScriptingParams.ConnectionString property.
+
+
+
+ Invalid directory specified by the ScriptingParams.FilePath property.
+ Invalid directory specified by the ScriptingParams.FilePath property.
+
+
+
+ Error parsing ScriptingListObjectsCompleteParams.ConnectionString property.
+ Error parsing ScriptingListObjectsCompleteParams.ConnectionString property.
+
+