Update projects for netcoreapp2.1 SDK (#603)

* Update projects for netcoreapp2.1 SDK

* Fix whitespace

* Fix issue in Nuget config file

RefreshDllsForTestRun.cmd

@@ -5,8 +5,8 @@ IF [%_BuildConfiguration%] NEQ []  GOTO Start
 SET _BuildConfiguration=Debug
 
 :Start
-SET _PerfTestSourceLocation="%WORKINGDIR%\test\Microsoft.SqlTools.ServiceLayer.PerfTests\bin\%_BuildConfiguration%\netcoreapp2.0\win7-x64\publish"
+SET _PerfTestSourceLocation="%WORKINGDIR%\test\Microsoft.SqlTools.ServiceLayer.PerfTests\bin\%_BuildConfiguration%\netcoreapp2.1\win7-x64\publish"
-SET _ServiceSourceLocation="%WORKINGDIR%\src\Microsoft.SqlTools.ServiceLayer\bin\%_BuildConfiguration%\netcoreapp2.0\win7-x64\publish"
+SET _ServiceSourceLocation="%WORKINGDIR%\src\Microsoft.SqlTools.ServiceLayer\bin\%_BuildConfiguration%\netcoreapp2.1\win7-x64\publish"
 
 
 

build.cake

@@ -252,7 +252,7 @@ Task("TestCore")
     {
         var logFile = System.IO.Path.Combine(logFolder, $"{testProject}-core-result.trx");
         var testWorkingDir = System.IO.Path.Combine(testFolder, testProject);
-        Run(dotnetcli, $"test -f netcoreapp2.0 --logger \"trx;LogFileName={logFile}\"", testWorkingDir)
+        Run(dotnetcli, $"test -f netcoreapp2.1 --logger \"trx;LogFileName={logFile}\"", testWorkingDir)
             .ExceptionOnError($"Test {testProject} failed for .NET Core.");
     }
 });

build.json

@@ -3,17 +3,17 @@
   "DotNetFolder": ".dotnet",
   "DotNetInstallScriptURL": "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain",
   "DotNetChannel": "preview",
-  "DotNetVersion": "1.0.0-preview2-003121",
+  "DotNetVersion": "2.1.300-preview3-008627",
   "BuildToolsFolder": ".tools",
   "ArtifactsFolder": "artifacts",
   "PackageName": "Microsoft.SqlTools.ServiceLayer",
   "TestProjects": {
     "Microsoft.SqlTools.ServiceLayer.UnitTests": [
-      "netcoreapp2.0"
+      "netcoreapp2.1"
    ]
   },
   "Frameworks": [  
-    "netcoreapp2.0"
+    "netcoreapp2.1"
   ],
   "MainProjects": [     
     "Microsoft.SqlTools.ServiceLayer",

nuget.config

@@ -2,6 +2,7 @@
 <configuration >
   <packageSources>
     <clear />
+    <add key="Nuget Preview" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="Nuget" value="https://www.nuget.org/api/v2" />
     <add key="DataTools Nuget" value="./bin/nuget" />    
   </packageSources>

src/Microsoft.SqlTools.Credentials/Localization/sr.cs

@@ -27,7 +27,7 @@ namespace Microsoft.SqlTools.Credentials
                 Keys.Culture = value;
             }
         }
-
+
 
         public static string CredentialsServiceInvalidCriticalHandle
         {
@@ -35,7 +35,7 @@ namespace Microsoft.SqlTools.Credentials
             {
                 return Keys.GetString(Keys.CredentialsServiceInvalidCriticalHandle);
             }
-        }
+        }
 
         public static string CredentialsServicePasswordLengthExceeded
         {
@@ -43,7 +43,7 @@ namespace Microsoft.SqlTools.Credentials
             {
                 return Keys.GetString(Keys.CredentialsServicePasswordLengthExceeded);
             }
-        }
+        }
 
         public static string CredentialsServiceTargetForDelete
         {
@@ -51,7 +51,7 @@ namespace Microsoft.SqlTools.Credentials
             {
                 return Keys.GetString(Keys.CredentialsServiceTargetForDelete);
             }
-        }
+        }
 
         public static string CredentialsServiceTargetForLookup
         {
@@ -59,7 +59,7 @@ namespace Microsoft.SqlTools.Credentials
             {
                 return Keys.GetString(Keys.CredentialsServiceTargetForLookup);
             }
-        }
+        }
 
         public static string CredentialServiceWin32CredentialDisposed
         {
@@ -67,7 +67,7 @@ namespace Microsoft.SqlTools.Credentials
             {
                 return Keys.GetString(Keys.CredentialServiceWin32CredentialDisposed);
             }
-        }
+        }
 
         [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
         public class Keys
@@ -75,22 +75,22 @@ namespace Microsoft.SqlTools.Credentials
             static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.Credentials.Localization.SR", typeof(SR).GetTypeInfo().Assembly);
 
             static CultureInfo _culture = null;
-
+
-
+
-            public const string CredentialsServiceInvalidCriticalHandle = "CredentialsServiceInvalidCriticalHandle";
+            public const string CredentialsServiceInvalidCriticalHandle = "CredentialsServiceInvalidCriticalHandle";
-
+
-
+
-            public const string CredentialsServicePasswordLengthExceeded = "CredentialsServicePasswordLengthExceeded";
+            public const string CredentialsServicePasswordLengthExceeded = "CredentialsServicePasswordLengthExceeded";
-
+
-
+
-            public const string CredentialsServiceTargetForDelete = "CredentialsServiceTargetForDelete";
+            public const string CredentialsServiceTargetForDelete = "CredentialsServiceTargetForDelete";
-
+
-
+
-            public const string CredentialsServiceTargetForLookup = "CredentialsServiceTargetForLookup";
+            public const string CredentialsServiceTargetForLookup = "CredentialsServiceTargetForLookup";
-
+
-
+
-            public const string CredentialServiceWin32CredentialDisposed = "CredentialServiceWin32CredentialDisposed";
+            public const string CredentialServiceWin32CredentialDisposed = "CredentialServiceWin32CredentialDisposed";
-
+
 
             private Keys()
             { }
@@ -111,7 +111,7 @@ namespace Microsoft.SqlTools.Credentials
             {
                 return resourceManager.GetString(key, _culture);
             }
-
+
-        }
+        }
-    }
+    }
-}
+}

src/Microsoft.SqlTools.Credentials/Localization/sr.resx

@@ -120,21 +120,21 @@
   <data name="CredentialsServiceInvalidCriticalHandle" xml:space="preserve">
     <value>Invalid CriticalHandle!</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialsServicePasswordLengthExceeded" xml:space="preserve">
     <value>The password has exceeded 512 bytes</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialsServiceTargetForDelete" xml:space="preserve">
     <value>Target must be specified to delete a credential</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialsServiceTargetForLookup" xml:space="preserve">
     <value>Target must be specified to check existance of a credential</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialServiceWin32CredentialDisposed" xml:space="preserve">
     <value>Win32Credential object is already disposed</value>
     <comment></comment>
-  </data>
+  </data>
-</root>
+</root>

src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MicrosoftSqlToolsCredentials</AssemblyName>
 	  <OutputType>Exe</OutputType>		
 	  <EnableDefaultItems>false</EnableDefaultItems>

src/Microsoft.SqlTools.Hosting/Localization/sr.cs

@@ -27,7 +27,7 @@ namespace Microsoft.SqlTools.Hosting
                 Keys.Culture = value;
             }
         }
-
+
 
         public static string CredentialsServiceInvalidCriticalHandle
         {
@@ -35,7 +35,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.CredentialsServiceInvalidCriticalHandle);
             }
-        }
+        }
 
         public static string CredentialsServicePasswordLengthExceeded
         {
@@ -43,7 +43,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.CredentialsServicePasswordLengthExceeded);
             }
-        }
+        }
 
         public static string CredentialsServiceTargetForDelete
         {
@@ -51,7 +51,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.CredentialsServiceTargetForDelete);
             }
-        }
+        }
 
         public static string CredentialsServiceTargetForLookup
         {
@@ -59,7 +59,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.CredentialsServiceTargetForLookup);
             }
-        }
+        }
 
         public static string CredentialServiceWin32CredentialDisposed
         {
@@ -67,7 +67,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.CredentialServiceWin32CredentialDisposed);
             }
-        }
+        }
 
         public static string ServiceAlreadyRegistered
         {
@@ -75,7 +75,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.ServiceAlreadyRegistered);
             }
-        }
+        }
 
         public static string MultipleServicesFound
         {
@@ -83,7 +83,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.MultipleServicesFound);
             }
-        }
+        }
 
         public static string IncompatibleServiceForExtensionLoader
         {
@@ -91,7 +91,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.IncompatibleServiceForExtensionLoader);
             }
-        }
+        }
 
         public static string ServiceProviderNotSet
         {
@@ -99,7 +99,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.ServiceProviderNotSet);
             }
-        }
+        }
 
         public static string ServiceNotFound
         {
@@ -107,7 +107,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.ServiceNotFound);
             }
-        }
+        }
 
         public static string ServiceNotOfExpectedType
         {
@@ -115,7 +115,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.ServiceNotOfExpectedType);
             }
-        }
+        }
 
         public static string HostingUnexpectedEndOfStream
         {
@@ -123,7 +123,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.HostingUnexpectedEndOfStream);
             }
-        }
+        }
 
         public static string HostingHeaderMissingColon
         {
@@ -131,7 +131,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.HostingHeaderMissingColon);
             }
-        }
+        }
 
         public static string HostingHeaderMissingContentLengthHeader
         {
@@ -139,7 +139,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.HostingHeaderMissingContentLengthHeader);
             }
-        }
+        }
 
         public static string HostingHeaderMissingContentLengthValue
         {
@@ -147,7 +147,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return Keys.GetString(Keys.HostingHeaderMissingContentLengthValue);
             }
-        }
+        }
 
         [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
         public class Keys
@@ -155,52 +155,52 @@ namespace Microsoft.SqlTools.Hosting
             static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.Hosting.Localization.SR", typeof(SR).GetTypeInfo().Assembly);
 
             static CultureInfo _culture = null;
-
+
-
+
-            public const string CredentialsServiceInvalidCriticalHandle = "CredentialsServiceInvalidCriticalHandle";
+            public const string CredentialsServiceInvalidCriticalHandle = "CredentialsServiceInvalidCriticalHandle";
-
+
-
+
-            public const string CredentialsServicePasswordLengthExceeded = "CredentialsServicePasswordLengthExceeded";
+            public const string CredentialsServicePasswordLengthExceeded = "CredentialsServicePasswordLengthExceeded";
-
+
-
+
-            public const string CredentialsServiceTargetForDelete = "CredentialsServiceTargetForDelete";
+            public const string CredentialsServiceTargetForDelete = "CredentialsServiceTargetForDelete";
-
+
-
+
-            public const string CredentialsServiceTargetForLookup = "CredentialsServiceTargetForLookup";
+            public const string CredentialsServiceTargetForLookup = "CredentialsServiceTargetForLookup";
-
+
-
+
-            public const string CredentialServiceWin32CredentialDisposed = "CredentialServiceWin32CredentialDisposed";
+            public const string CredentialServiceWin32CredentialDisposed = "CredentialServiceWin32CredentialDisposed";
-
+
-
+
-            public const string ServiceAlreadyRegistered = "ServiceAlreadyRegistered";
+            public const string ServiceAlreadyRegistered = "ServiceAlreadyRegistered";
-
+
-
+
-            public const string MultipleServicesFound = "MultipleServicesFound";
+            public const string MultipleServicesFound = "MultipleServicesFound";
-
+
-
+
-            public const string IncompatibleServiceForExtensionLoader = "IncompatibleServiceForExtensionLoader";
+            public const string IncompatibleServiceForExtensionLoader = "IncompatibleServiceForExtensionLoader";
-
+
-
+
-            public const string ServiceProviderNotSet = "ServiceProviderNotSet";
+            public const string ServiceProviderNotSet = "ServiceProviderNotSet";
-
+
-
+
-            public const string ServiceNotFound = "ServiceNotFound";
+            public const string ServiceNotFound = "ServiceNotFound";
-
+
-
+
-            public const string ServiceNotOfExpectedType = "ServiceNotOfExpectedType";
+            public const string ServiceNotOfExpectedType = "ServiceNotOfExpectedType";
-
+
-
+
-            public const string HostingUnexpectedEndOfStream = "HostingUnexpectedEndOfStream";
+            public const string HostingUnexpectedEndOfStream = "HostingUnexpectedEndOfStream";
-
+
-
+
-            public const string HostingHeaderMissingColon = "HostingHeaderMissingColon";
+            public const string HostingHeaderMissingColon = "HostingHeaderMissingColon";
-
+
-
+
-            public const string HostingHeaderMissingContentLengthHeader = "HostingHeaderMissingContentLengthHeader";
+            public const string HostingHeaderMissingContentLengthHeader = "HostingHeaderMissingContentLengthHeader";
-
+
-
+
-            public const string HostingHeaderMissingContentLengthValue = "HostingHeaderMissingContentLengthValue";
+            public const string HostingHeaderMissingContentLengthValue = "HostingHeaderMissingContentLengthValue";
-
+
 
             private Keys()
             { }
@@ -221,7 +221,7 @@ namespace Microsoft.SqlTools.Hosting
             {
                 return resourceManager.GetString(key, _culture);
             }
-
+
-        }
+        }
-    }
+    }
-}
+}

src/Microsoft.SqlTools.Hosting/Localization/sr.resx

@@ -120,61 +120,61 @@
   <data name="CredentialsServiceInvalidCriticalHandle" xml:space="preserve">
     <value>Invalid CriticalHandle!</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialsServicePasswordLengthExceeded" xml:space="preserve">
     <value>The password has exceeded 512 bytes</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialsServiceTargetForDelete" xml:space="preserve">
     <value>Target must be specified to delete a credential</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialsServiceTargetForLookup" xml:space="preserve">
     <value>Target must be specified to check existance of a credential</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="CredentialServiceWin32CredentialDisposed" xml:space="preserve">
     <value>Win32Credential object is already disposed</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="ServiceAlreadyRegistered" xml:space="preserve">
     <value>Cannot register service for type {0}, one or more services already registered</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="MultipleServicesFound" xml:space="preserve">
     <value>Multiple services found for type {0}, expected only 1</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="IncompatibleServiceForExtensionLoader" xml:space="preserve">
     <value>Service of type {0} cannot be created by ExtensionLoader&lt;{1}&gt;</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="ServiceProviderNotSet" xml:space="preserve">
     <value>SetServiceProvider() was not called to establish the required service provider</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="ServiceNotFound" xml:space="preserve">
     <value>Service {0} was not found in the service provider</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="ServiceNotOfExpectedType" xml:space="preserve">
     <value>Service of Type {0} is not compatible with registered Type {1}</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="HostingUnexpectedEndOfStream" xml:space="preserve">
     <value>MessageReader's input stream ended unexpectedly, terminating</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="HostingHeaderMissingColon" xml:space="preserve">
     <value>Message header must separate key and value using ':'</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="HostingHeaderMissingContentLengthHeader" xml:space="preserve">
     <value>Fatal error: Content-Length header must be provided</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="HostingHeaderMissingContentLengthValue" xml:space="preserve">
     <value>Fatal error: Content-Length value is not an integer</value>
     <comment></comment>
-  </data>
+  </data>
-</root>
+</root>

src/Microsoft.SqlTools.ResourceProvider.Core/Localization/sr.cs

@@ -27,7 +27,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
                 Keys.Culture = value;
             }
         }
-
+
 
         public static string NoSubscriptionsFound
         {
@@ -35,7 +35,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.NoSubscriptionsFound);
             }
-        }
+        }
 
         public static string AzureServerNotFound
         {
@@ -43,7 +43,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.AzureServerNotFound);
             }
-        }
+        }
 
         public static string AzureSubscriptionFailedErrorMessage
         {
@@ -51,7 +51,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.AzureSubscriptionFailedErrorMessage);
             }
-        }
+        }
 
         public static string DatabaseDiscoveryFailedErrorMessage
         {
@@ -59,7 +59,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.DatabaseDiscoveryFailedErrorMessage);
             }
-        }
+        }
 
         public static string FirewallRuleAccessForbidden
         {
@@ -67,7 +67,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.FirewallRuleAccessForbidden);
             }
-        }
+        }
 
         public static string FirewallRuleCreationFailed
         {
@@ -75,7 +75,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.FirewallRuleCreationFailed);
             }
-        }
+        }
 
         public static string FirewallRuleCreationFailedWithError
         {
@@ -83,7 +83,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.FirewallRuleCreationFailedWithError);
             }
-        }
+        }
 
         public static string InvalidIpAddress
         {
@@ -91,7 +91,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.InvalidIpAddress);
             }
-        }
+        }
 
         public static string InvalidServerTypeErrorMessage
         {
@@ -99,7 +99,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.InvalidServerTypeErrorMessage);
             }
-        }
+        }
 
         public static string LoadingExportableFailedGeneralErrorMessage
         {
@@ -107,7 +107,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.LoadingExportableFailedGeneralErrorMessage);
             }
-        }
+        }
 
         public static string FirewallRuleUnsupportedConnectionType
         {
@@ -115,7 +115,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return Keys.GetString(Keys.FirewallRuleUnsupportedConnectionType);
             }
-        }
+        }
 
         [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
         public class Keys
@@ -123,40 +123,40 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ResourceProvider.Core.Localization.SR", typeof(SR).GetTypeInfo().Assembly);
 
             static CultureInfo _culture = null;
-
+
-
+
-            public const string NoSubscriptionsFound = "NoSubscriptionsFound";
+            public const string NoSubscriptionsFound = "NoSubscriptionsFound";
-
+
-
+
-            public const string AzureServerNotFound = "AzureServerNotFound";
+            public const string AzureServerNotFound = "AzureServerNotFound";
-
+
-
+
-            public const string AzureSubscriptionFailedErrorMessage = "AzureSubscriptionFailedErrorMessage";
+            public const string AzureSubscriptionFailedErrorMessage = "AzureSubscriptionFailedErrorMessage";
-
+
-
+
-            public const string DatabaseDiscoveryFailedErrorMessage = "DatabaseDiscoveryFailedErrorMessage";
+            public const string DatabaseDiscoveryFailedErrorMessage = "DatabaseDiscoveryFailedErrorMessage";
-
+
-
+
-            public const string FirewallRuleAccessForbidden = "FirewallRuleAccessForbidden";
+            public const string FirewallRuleAccessForbidden = "FirewallRuleAccessForbidden";
-
+
-
+
-            public const string FirewallRuleCreationFailed = "FirewallRuleCreationFailed";
+            public const string FirewallRuleCreationFailed = "FirewallRuleCreationFailed";
-
+
-
+
-            public const string FirewallRuleCreationFailedWithError = "FirewallRuleCreationFailedWithError";
+            public const string FirewallRuleCreationFailedWithError = "FirewallRuleCreationFailedWithError";
-
+
-
+
-            public const string InvalidIpAddress = "InvalidIpAddress";
+            public const string InvalidIpAddress = "InvalidIpAddress";
-
+
-
+
-            public const string InvalidServerTypeErrorMessage = "InvalidServerTypeErrorMessage";
+            public const string InvalidServerTypeErrorMessage = "InvalidServerTypeErrorMessage";
-
+
-
+
-            public const string LoadingExportableFailedGeneralErrorMessage = "LoadingExportableFailedGeneralErrorMessage";
+            public const string LoadingExportableFailedGeneralErrorMessage = "LoadingExportableFailedGeneralErrorMessage";
-
+
-
+
-            public const string FirewallRuleUnsupportedConnectionType = "FirewallRuleUnsupportedConnectionType";
+            public const string FirewallRuleUnsupportedConnectionType = "FirewallRuleUnsupportedConnectionType";
-
+
 
             private Keys()
             { }
@@ -177,7 +177,7 @@ namespace Microsoft.SqlTools.ResourceProvider.Core
             {
                 return resourceManager.GetString(key, _culture);
             }
-
+
-        }
+        }
-    }
+    }
-}
+}

src/Microsoft.SqlTools.ResourceProvider.Core/Localization/sr.resx

@@ -120,45 +120,45 @@
   <data name="NoSubscriptionsFound" xml:space="preserve">
     <value>No subscriptions were found for the currently logged in user account.</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="AzureServerNotFound" xml:space="preserve">
     <value>The server you specified {0} does not exist in any subscription in {1}. Either you have signed in with an incorrect account or your server was removed from subscription(s) in this account. Please check your account and try again.</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="AzureSubscriptionFailedErrorMessage" xml:space="preserve">
     <value>An error occurred while getting Azure subscriptions: {0}</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="DatabaseDiscoveryFailedErrorMessage" xml:space="preserve">
     <value>An error occurred while getting databases from servers of type {0} from {1}</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FirewallRuleAccessForbidden" xml:space="preserve">
     <value>{0} does not have permission to change the server firewall rule. Try again with a different account that is an Owner or Contributor of the Azure subscription or the server.</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FirewallRuleCreationFailed" xml:space="preserve">
     <value>An error occurred while creating a new firewall rule.</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FirewallRuleCreationFailedWithError" xml:space="preserve">
     <value>An error occurred while creating a new firewall rule: '{0}'</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="InvalidIpAddress" xml:space="preserve">
     <value>Invalid IP address</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="InvalidServerTypeErrorMessage" xml:space="preserve">
     <value>Server Type is invalid.</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="LoadingExportableFailedGeneralErrorMessage" xml:space="preserve">
     <value>A required dll cannot be loaded. Please repair your application.</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FirewallRuleUnsupportedConnectionType" xml:space="preserve">
     <value>Cannot open a firewall rule for the specified connection type</value>
     <comment></comment>
-  </data>
+  </data>
-</root>
+</root>

src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Localization/sr.cs

@@ -27,7 +27,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
                 Keys.Culture = value;
             }
         }
-
+
 
         public static string FailedToGetAzureDatabasesErrorMessage
         {
@@ -35,7 +35,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.FailedToGetAzureDatabasesErrorMessage);
             }
-        }
+        }
 
         public static string FailedToGetAzureSubscriptionsErrorMessage
         {
@@ -43,7 +43,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.FailedToGetAzureSubscriptionsErrorMessage);
             }
-        }
+        }
 
         public static string FailedToGetAzureResourceGroupsErrorMessage
         {
@@ -51,7 +51,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.FailedToGetAzureResourceGroupsErrorMessage);
             }
-        }
+        }
 
         public static string FailedToGetAzureSqlServersErrorMessage
         {
@@ -59,7 +59,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.FailedToGetAzureSqlServersErrorMessage);
             }
-        }
+        }
 
         public static string FailedToGetAzureSqlServersWithError
         {
@@ -67,7 +67,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.FailedToGetAzureSqlServersWithError);
             }
-        }
+        }
 
         public static string FirewallRuleCreationFailed
         {
@@ -75,7 +75,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.FirewallRuleCreationFailed);
             }
-        }
+        }
 
         public static string FirewallRuleCreationFailedWithError
         {
@@ -83,7 +83,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.FirewallRuleCreationFailedWithError);
             }
-        }
+        }
 
         public static string UnsupportedAuthType
         {
@@ -91,7 +91,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.UnsupportedAuthType);
             }
-        }
+        }
 
         public static string UserNotFoundError
         {
@@ -99,7 +99,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.UserNotFoundError);
             }
-        }
+        }
 
         public static string UserNeedsAuthenticationError
         {
@@ -107,7 +107,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return Keys.GetString(Keys.UserNeedsAuthenticationError);
             }
-        }
+        }
 
         [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
         public class Keys
@@ -115,37 +115,37 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ResourceProvider.DefaultImpl.Localization.SR", typeof(SR).GetTypeInfo().Assembly);
 
             static CultureInfo _culture = null;
-
+
-
+
-            public const string FailedToGetAzureDatabasesErrorMessage = "FailedToGetAzureDatabasesErrorMessage";
+            public const string FailedToGetAzureDatabasesErrorMessage = "FailedToGetAzureDatabasesErrorMessage";
-
+
-
+
-            public const string FailedToGetAzureSubscriptionsErrorMessage = "FailedToGetAzureSubscriptionsErrorMessage";
+            public const string FailedToGetAzureSubscriptionsErrorMessage = "FailedToGetAzureSubscriptionsErrorMessage";
-
+
-
+
-            public const string FailedToGetAzureResourceGroupsErrorMessage = "FailedToGetAzureResourceGroupsErrorMessage";
+            public const string FailedToGetAzureResourceGroupsErrorMessage = "FailedToGetAzureResourceGroupsErrorMessage";
-
+
-
+
-            public const string FailedToGetAzureSqlServersErrorMessage = "FailedToGetAzureSqlServersErrorMessage";
+            public const string FailedToGetAzureSqlServersErrorMessage = "FailedToGetAzureSqlServersErrorMessage";
-
+
-
+
-            public const string FailedToGetAzureSqlServersWithError = "FailedToGetAzureSqlServersWithError";
+            public const string FailedToGetAzureSqlServersWithError = "FailedToGetAzureSqlServersWithError";
-
+
-
+
-            public const string FirewallRuleCreationFailed = "FirewallRuleCreationFailed";
+            public const string FirewallRuleCreationFailed = "FirewallRuleCreationFailed";
-
+
-
+
-            public const string FirewallRuleCreationFailedWithError = "FirewallRuleCreationFailedWithError";
+            public const string FirewallRuleCreationFailedWithError = "FirewallRuleCreationFailedWithError";
-
+
-
+
-            public const string UnsupportedAuthType = "UnsupportedAuthType";
+            public const string UnsupportedAuthType = "UnsupportedAuthType";
-
+
-
+
-            public const string UserNotFoundError = "UserNotFoundError";
+            public const string UserNotFoundError = "UserNotFoundError";
-
+
-
+
-            public const string UserNeedsAuthenticationError = "UserNeedsAuthenticationError";
+            public const string UserNeedsAuthenticationError = "UserNeedsAuthenticationError";
-
+
 
             private Keys()
             { }
@@ -166,7 +166,7 @@ namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
             {
                 return resourceManager.GetString(key, _culture);
             }
-
+
-        }
+        }
-    }
+    }
-}
+}

src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Localization/sr.resx

@@ -120,41 +120,41 @@
   <data name="FailedToGetAzureDatabasesErrorMessage" xml:space="preserve">
     <value>An error occurred while getting Azure databases</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FailedToGetAzureSubscriptionsErrorMessage" xml:space="preserve">
     <value>An error occurred while getting Azure subscriptions: {0}</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FailedToGetAzureResourceGroupsErrorMessage" xml:space="preserve">
     <value>An error occurred while getting Azure resource groups: {0}</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FailedToGetAzureSqlServersErrorMessage" xml:space="preserve">
     <value>An error occurred while getting Azure Sql Servers</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FailedToGetAzureSqlServersWithError" xml:space="preserve">
     <value>An error occurred while getting Azure Sql Servers: '{0}'</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FirewallRuleCreationFailed" xml:space="preserve">
     <value>An error occurred while creating a new firewall rule.</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="FirewallRuleCreationFailedWithError" xml:space="preserve">
     <value>An error occurred while creating a new firewall rule: '{0}'</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="UnsupportedAuthType" xml:space="preserve">
     <value>Unsupported account type '{0}' for this provider</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="UserNotFoundError" xml:space="preserve">
     <value>No user was found, cannot execute the operation</value>
     <comment></comment>
-  </data>
+  </data>
   <data name="UserNeedsAuthenticationError" xml:space="preserve">
     <value>The current user must be reauthenticated before executing this operation </value>
     <comment></comment>
-  </data>
+  </data>
-</root>
+</root>

src/Microsoft.SqlTools.ResourceProvider/Localization/sr.cs

@@ -27,7 +27,7 @@ namespace Microsoft.SqlTools.ResourceProvider
                 Keys.Culture = value;
             }
         }
-
+
 
         [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
         public class Keys
@@ -35,7 +35,7 @@ namespace Microsoft.SqlTools.ResourceProvider
             static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ResourceProvider.Localization.SR", typeof(SR).GetTypeInfo().Assembly);
 
             static CultureInfo _culture = null;
-
+
 
             private Keys()
             { }
@@ -56,7 +56,7 @@ namespace Microsoft.SqlTools.ResourceProvider
             {
                 return resourceManager.GetString(key, _culture);
             }
-
+
-        }
+        }
-    }
+    }
-}
+}

src/Microsoft.SqlTools.ResourceProvider/Localization/sr.resx

@@ -117,4 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-</root>
+</root>

src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <PackageId>SqlToolsResourceProviderService</PackageId>
     <AssemblyName>SqlToolsResourceProviderService</AssemblyName>
     <OutputType>Exe</OutputType>

src/Microsoft.SqlTools.Serialization/Microsoft.SqlTools.Serialization.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <PackageId>SqlSerializationService</PackageId>
     <AssemblyName>SqlSerializationService</AssemblyName>
     <Company>Microsoft</Company>

src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MicrosoftSqlToolsServiceLayer</AssemblyName>
     <OutputType>Exe</OutputType>
     <EnableDefaultItems>false</EnableDefaultItems>

test/CodeCoverage/codecoverage.bat

@@ -52,7 +52,7 @@ dotnet restore %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests\
 dotnet build %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj %DOTNETCONFIG% 
 
 SET TEST_SERVER=localhost
-SET SQLTOOLSSERVICE_EXE=%REPOROOT%\src\Microsoft.SqlTools.ServiceLayer\bin\Integration\netcoreapp2.0\win7-x64\MicrosoftSqlToolsServiceLayer.exe
+SET SQLTOOLSSERVICE_EXE=%REPOROOT%\src\Microsoft.SqlTools.ServiceLayer\bin\Integration\netcoreapp2.1\win7-x64\MicrosoftSqlToolsServiceLayer.exe
 SET SERVICECODECOVERAGE=True
 SET CODECOVERAGETOOL="%WORKINGDIR%packages\OpenCover.4.6.684\tools\OpenCover.Console.exe"
 SET CODECOVERAGEOUTPUT=coverage.xml
@@ -61,11 +61,11 @@ REM dotnet.exe test %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.TestDriver.T
 
 SET SERVICECODECOVERAGE=FALSE
 
-%CODECOVERAGETOOL% -mergeoutput -register:user -target:dotnet.exe -targetargs:"test %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj %DOTNETCONFIG%" -oldstyle -filter:"+[Microsoft.SqlTools.*]* +[MicrosoftSqlToolsServiceLayer*]* +[MicrosoftSqlToolsCredentials*]* -[xunit*]* -[Microsoft.SqlTools.ServiceLayer.Test*]* -[Microsoft.SqlTools.ServiceLayer.*Test*]*" -output:coverage.xml -searchdirs:%REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests\bin\Debug\netcoreapp2.0
+%CODECOVERAGETOOL% -mergeoutput -register:user -target:dotnet.exe -targetargs:"test %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj %DOTNETCONFIG%" -oldstyle -filter:"+[Microsoft.SqlTools.*]* +[MicrosoftSqlToolsServiceLayer*]* +[MicrosoftSqlToolsCredentials*]* -[xunit*]* -[Microsoft.SqlTools.ServiceLayer.Test*]* -[Microsoft.SqlTools.ServiceLayer.*Test*]*" -output:coverage.xml -searchdirs:%REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.TestDriver.Tests\bin\Debug\netcoreapp2.1
 
-%CODECOVERAGETOOL% -mergeoutput -register:user -target:dotnet.exe -targetargs:"test %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.UnitTests\Microsoft.SqlTools.ServiceLayer.UnitTests.csproj %DOTNETCONFIG%" -oldstyle -filter:"+[Microsoft.SqlTools.*]* +[MicrosoftSqlToolsServiceLayer*]* +[MicrosoftSqlToolsCredentials*]* -[xunit*]* -[Microsoft.SqlTools.ServiceLayer.*Test*]* -[Microsoft.SqlTools.ServiceLayer.Test*]*" -output:coverage.xml -searchdirs:%REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.UnitTests\bin\Debug\netcoreapp2.0
+%CODECOVERAGETOOL% -mergeoutput -register:user -target:dotnet.exe -targetargs:"test %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.UnitTests\Microsoft.SqlTools.ServiceLayer.UnitTests.csproj %DOTNETCONFIG%" -oldstyle -filter:"+[Microsoft.SqlTools.*]* +[MicrosoftSqlToolsServiceLayer*]* +[MicrosoftSqlToolsCredentials*]* -[xunit*]* -[Microsoft.SqlTools.ServiceLayer.*Test*]* -[Microsoft.SqlTools.ServiceLayer.Test*]*" -output:coverage.xml -searchdirs:%REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.UnitTests\bin\Debug\netcoreapp2.1
 
-%CODECOVERAGETOOL% -mergeoutput -register:user -target:dotnet.exe -targetargs:"test %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.IntegrationTests\Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj %DOTNETCONFIG%" -oldstyle -filter:"+[Microsoft.SqlTools.*]* +[MicrosoftSqlToolsServiceLayer*]* +[MicrosoftSqlToolsCredentials*]* [Microsoft.SqlTools.*]* -[xunit*]* -[Microsoft.SqlTools.ServiceLayer.Test*]* -[Microsoft.SqlTools.ServiceLayer.*Test*]*" -output:coverage.xml -searchdirs:%REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.IntegrationTests\bin\Debug\netcoreapp2.0
+%CODECOVERAGETOOL% -mergeoutput -register:user -target:dotnet.exe -targetargs:"test %REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.IntegrationTests\Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj %DOTNETCONFIG%" -oldstyle -filter:"+[Microsoft.SqlTools.*]* +[MicrosoftSqlToolsServiceLayer*]* +[MicrosoftSqlToolsCredentials*]* [Microsoft.SqlTools.*]* -[xunit*]* -[Microsoft.SqlTools.ServiceLayer.Test*]* -[Microsoft.SqlTools.ServiceLayer.*Test*]*" -output:coverage.xml -searchdirs:%REPOROOT%\test\Microsoft.SqlTools.ServiceLayer.IntegrationTests\bin\Debug\netcoreapp2.1
 
 REM Generate the report
 "%WORKINGDIR%packages\OpenCoverToCoberturaConverter.0.2.4.0\tools\OpenCoverToCoberturaConverter.exe"  -input:coverage.xml -output:outputCobertura.xml -sources:%REPOROOT%\src\Microsoft.SqlTools.ServiceLayer

test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
 	  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DebugType>portable</DebugType>
     <AssemblyName>Microsoft.SqlTools.ServiceLayer.IntegrationTests</AssemblyName>

test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
 	  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DebugType>portable</DebugType>
     <AssemblyName>Microsoft.SqlTools.ServiceLayer.PerfTests</AssemblyName>

test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <DebugType>portable</DebugType>
     <AssemblyName>Microsoft.SqlTools.ServiceLayer.TestDriver.Tests</AssemblyName>
     <OutputType>Exe</OutputType>

test/Microsoft.SqlTools.ServiceLayer.TestDriver/Driver/ServiceTestDriver.cs

@@ -51,7 +51,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Driver
             {
                 // Include a fallback value to for running tests within visual studio
                 serviceHostExecutable =
-                    @"..\..\..\..\..\src\Microsoft.SqlTools.ServiceLayer\bin\Debug\netcoreapp2.0\win7-x64\MicrosoftSqlToolsServiceLayer.exe";
+                    @"..\..\..\..\..\src\Microsoft.SqlTools.ServiceLayer\bin\Debug\netcoreapp2.1\win7-x64\MicrosoftSqlToolsServiceLayer.exe";
             }
 
             serviceHostExecutable = Path.GetFullPath(serviceHostExecutable);

test/Microsoft.SqlTools.ServiceLayer.TestDriver/Microsoft.SqlTools.ServiceLayer.TestDriver.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
 	<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
 	<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
 	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/Microsoft.SqlTools.ServiceLayer.TestEnvConfig.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>Microsoft.SqlTools.ServiceLayer.TestEnvConfig</AssemblyName>
     <OutputType>Exe</OutputType>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Configuration">
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
     <IsPackable>false</IsPackable>
@@ -34,7 +34,7 @@
     <ProjectReference Include="../../test/Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="obj\Debug\netcoreapp2.0\" />
+    <Folder Include="obj\Debug\netcoreapp2.1\" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />