Return back Root namespace and moved resouces to subfolder

This will prevent conflicts between Strings in main project and providers

Author: alex-kulakov

Orm/Xtensive.Orm.SqlServer/Orm.Providers.SqlServer/SearchConditionCompilerV09.cs

@@ -11,7 +11,7 @@
 using Xtensive.Orm.FullTextSearchCondition;
 using Xtensive.Orm.FullTextSearchCondition.Interfaces;
 using Xtensive.Orm.FullTextSearchCondition.Nodes;
-using Xtensive.Orm.SqlServer;
+using Xtensive.SqlServer.Resources;
 
 namespace Xtensive.Orm.Providers.SqlServer
 {

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs

@@ -11,8 +11,8 @@
 using System.Linq;
 using Xtensive.Core;
 using Xtensive.Orm;
-using Xtensive.Orm.SqlServer;
 using Xtensive.Sql.Info;
+using Xtensive.SqlServer.Resources;
 using SqlServerConnection = System.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/ErrorMessageParser.cs

@@ -11,7 +11,7 @@
 using System.Text.RegularExpressions;
 using Xtensive.Core;
 using System.Collections.ObjectModel;
-using Xtensive.Orm.SqlServer;
+using Xtensive.SqlServer.Resources;
 
 namespace Xtensive.Sql.Drivers.SqlServer
 {

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/Compiler.cs

@@ -12,7 +12,7 @@
 using Xtensive.Sql.Model;
 using Xtensive.Sql.Ddl;
 using Xtensive.Sql.Dml;
-using Xtensive.Orm.SqlServer;
+using Xtensive.SqlServer.Resources;
 
 namespace Xtensive.Sql.Drivers.SqlServer.v09
 {

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/Translator.cs

@@ -13,7 +13,7 @@
 using Xtensive.Sql.Model;
 using Xtensive.Sql.Ddl;
 using Xtensive.Sql.Dml;
-using Xtensive.Orm.SqlServer;
+using Xtensive.SqlServer.Resources;
 
 namespace Xtensive.Sql.Drivers.SqlServer.v09
 {

…ensive.Orm.SqlServer/Strings.Designer.cs …/SqlServer.Resources/Strings.Designer.csOrm/Xtensive.Orm.SqlServer/Strings.Designer.cs renamed to Orm/Xtensive.Orm.SqlServer/SqlServer.Resources/Strings.Designer.cs Orm/Xtensive.Orm.SqlServer/Strings.Designer.cs renamed to Orm/Xtensive.Orm.SqlServer/SqlServer.Resources/Strings.Designer.cs

@@ -6,7 +6,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>Xtensive.Orm.SqlServer</RootNamespace>
+    <RootNamespace>Xtensive</RootNamespace>
     <PackageId>Xtensive.Orm.SqlServer</PackageId>
     <Title>$(DoProductName) provider for MS SQL Server</Title>
     <AssemblyTitle>$(Title)</AssemblyTitle>
@@ -25,15 +25,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Strings.Designer.cs">
+    <Compile Update="SqlServer.Resources\Strings.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Strings.resx">
+    <EmbeddedResource Update="SqlServer.Resources\Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>