Rework genproj to use gensources to build sources list for each profile and host platform (#8985)

* Update genproj makefile to include gensources
Update genproj argument parser to be more generous about displaying help

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Fix rebase issue

* Checkpoint

* Checkpoint

* Fix built sources only being added to one profile

* Fix typo

* Checkpoint

* Fix indentation

* Use csc instead of mcs

* Checkpoint

* Fix BUILT_SOURCES only being handled for the first profile processed

* Checkpoint

* Checkpoint

* Strip double slashes from paths to fix spurious csproj change

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint: Fix genproj compilation

* Checkpoint

* Checkpoint

* Checkpoint

* Fix crash when no targets were loaded (due to an error)

* Checkpoint

* Checkpoint

* Checkpoint

* Fix TryParseTargetInto bug

* Checkpoint

* Shuffle exclude logic around so that it works correctly during genproj diffing

* Remove gensources tracing

* Checkpoint

* Fix handling of oddball sources paths from executable.make

* Fix jay not being set to build

* Fix wrong slashes being used for embedded resource paths

* [csproj] Update project files

1 files changed, 48 insertions, 46 deletions

diff --git a/mcs/class/System.Data.Linq/System.Data.Linq.csproj b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
index 976bf02a824..74e75cadfa5 100644
--- a/mcs/class/System.Data.Linq/System.Data.Linq.csproj
+++ b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+  <!-- @BUILT_SOURCES@ -->

   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="..\..\build\common\Locale.cs" />

@@ -56,80 +57,82 @@
     <Compile Include="src\DbLinq.Firebird\FirebirdExpressionTranslator.cs" />

     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Columns.cs" />

     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Constraints.cs" />

-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.StoredProcedures.cs" />

     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Tables.cs" />

+    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Firebird\FirebirdSqlProvider.cs" />

     <Compile Include="src\DbLinq.Firebird\FirebirdVendor.cs" />

     <Compile Include="src\DbLinq.Ingres\IngresDataContext.cs" />

     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Columns.cs" />

     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Constraints.cs" />

-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.StoredProcedures.cs" />

     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Tables.cs" />

+    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Ingres\IngresSqlProvider.cs" />

     <Compile Include="src\DbLinq.Ingres\IngresVendor.cs" />

     <Compile Include="src\DbLinq.MySql\MySqlDataContext.cs" />

     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Columns.cs" />

     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Constraints.cs" />

-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.cs" />

     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.StoredProcedures.cs" />

     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Tables.cs" />

+    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.cs" />

     <Compile Include="src\DbLinq.MySql\MySqlSqlProvider.cs" />

     <Compile Include="src\DbLinq.MySql\MySqlVendor.cs" />

     <Compile Include="src\DbLinq.Oracle\OracleDataContext.cs" />

     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Columns.cs" />

     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Constraints.cs" />

-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.StoredProcedures.cs" />

     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Tables.cs" />

+    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Oracle\OracleSqlProvider.cs" />

     <Compile Include="src\DbLinq.Oracle\OracleVendor.cs" />

     <Compile Include="src\DbLinq.PostgreSql\PgsqlDataContext.cs" />

     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Columns.cs" />

     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Constraints.cs" />

-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.cs" />

     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.StoredProcedures.cs" />

     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Tables.cs" />

+    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.cs" />

     <Compile Include="src\DbLinq.PostgreSql\PgsqlSqlProvider.cs" />

     <Compile Include="src\DbLinq.PostgreSql\PgsqlVendor.cs" />

+    <Compile Include="src\DbLinq.SqlServer\SqlServerDataContext.cs" />

+    <Compile Include="src\DbLinq.SqlServer\SqlServerExpressionTranslator.cs" />

+    <Compile Include="src\DbLinq.SqlServer\SqlServerSchemaLoader.cs" />

+    <Compile Include="src\DbLinq.SqlServer\SqlServerSqlProvider.cs" />

+    <Compile Include="src\DbLinq.SqlServer\SqlServerTypeConversions.cs" />

+    <Compile Include="src\DbLinq.SqlServer\SqlServerVendor.cs" />

     <Compile Include="src\DbLinq.Sqlite\Schema\DataCommand.cs" />

     <Compile Include="src\DbLinq.Sqlite\SqliteDataContext.cs" />

     <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Columns.cs" />

     <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Constraints.cs" />

-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Tables.cs" />

+    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.cs" />

     <Compile Include="src\DbLinq.Sqlite\SqliteSqlProvider.cs" />

     <Compile Include="src\DbLinq.Sqlite\SqliteVendor.cs" />

-    <Compile Include="src\DbLinq.SqlServer\SqlServerDataContext.cs" />

-    <Compile Include="src\DbLinq.SqlServer\SqlServerExpressionTranslator.cs" />

-    <Compile Include="src\DbLinq.SqlServer\SqlServerSchemaLoader.cs" />

-    <Compile Include="src\DbLinq.SqlServer\SqlServerSqlProvider.cs" />

-    <Compile Include="src\DbLinq.SqlServer\SqlServerTypeConversions.cs" />

-    <Compile Include="src\DbLinq.SqlServer\SqlServerVendor.cs" />

     <Compile Include="src\DbLinq\Data\Linq\ChangeAction.cs" />

     <Compile Include="src\DbLinq\Data\Linq\ChangeSet.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\DBLinqExtendedAttributte.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\DataContext.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\DataLoadOptions.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseContext.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseTransaction.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Database\ITransactionalCommand.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseConnection.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseContext.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseTransaction.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\TransactionalCommand.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Database\ITransactionalCommand.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\DataContext.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\DataLoadOptions.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\DBLinqExtendedAttributte.cs" />

     <Compile Include="src\DbLinq\Data\Linq\EntityRef.cs" />

     <Compile Include="src\DbLinq\Data\Linq\EntitySet.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Identity\IdentityKey.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\IExecuteResult.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\IMemberModificationHandler.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\ITable.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\IVendorProvider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityProvider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReader.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReaderFactory.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Identity\IdentityKey.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityProviderReader.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReader.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReaderFactory.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\IExecuteResult.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\IMemberModificationHandler.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Implementation\DisabledEntityTracker.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityState.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTrack.cs" />

@@ -138,8 +141,7 @@
     <Compile Include="src\DbLinq\Data\Linq\Implementation\MemberModificationHandler.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Implementation\QueryProvider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Implementation\VendorProvider.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\ITable.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\IVendorProvider.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributeMappingSource.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAbstractMetaDataMember.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAssociationMetaDataMember.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedColumnMetaDataMember.cs" />

@@ -148,16 +150,10 @@
     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaModel.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaTable.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaType.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributeMappingSource.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\LambdaMetaAccessor.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\MappingContext.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Mapping\XmlMappingSource.cs" />

     <Compile Include="src\DbLinq\Data\Linq\RefreshMode.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlLiteralPart.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlParameterPart.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlPart.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatement.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatementBuilder.cs" />

     <Compile Include="src\DbLinq\Data\Linq\SqlClient\FirebirdProvider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\SqlClient\IngresProvider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\SqlClient\MySqlProvider.cs" />

@@ -166,8 +162,13 @@
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2000Provider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2005Provider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2008Provider.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqliteProvider.cs" />

     <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqlServerProvider.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqliteProvider.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlLiteralPart.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlParameterPart.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlPart.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatement.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatementBuilder.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\AbstractQuery.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\BuilderContext.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\DeleteQuery.cs" />

@@ -197,6 +198,7 @@
     <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\UnaryExpressionMutator.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionPrecedence.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionQuery.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionTier.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ColumnExpression.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\CustomExpressionType.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\EntitySetExpression.cs" />

@@ -219,35 +221,34 @@
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SubSelectExpression.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableExpression.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableJoinType.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionTier.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataMapper.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataRecordReader.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionDispatcher.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionLanguageParser.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionOptimizer.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionQualifier.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IPrequelAnalyzer.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryBuilder.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryCache.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryRunner.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISpecialExpressionTranslator.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISqlBuilder.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataMapper.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataRecordReader.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Analyzer.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Registrar.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionLanguageParser.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionOptimizer.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionQualifier.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\LineGrouping.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\PrequelAnalyzer.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.Upsert.cs" />

+    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryCache.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryRunner.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SpecialExpressionTranslator.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SqlBuilder.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IPrequelAnalyzer.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryBuilder.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryCache.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryRunner.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISpecialExpressionTranslator.cs" />

-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISqlBuilder.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\ParameterizedQuery.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\QueryContext.cs" />

     <Compile Include="src\DbLinq\Data\Linq\Sugar\SelectQuery.cs" />

@@ -255,11 +256,11 @@
     <Compile Include="src\DbLinq\Data\Linq\Table.cs" />

     <Compile Include="src\DbLinq\DbLinqToDoAttribute.cs" />

     <Compile Include="src\DbLinq\Factory\DbLinqAttribute.cs" />

-    <Compile Include="src\DbLinq\Factory\Implementation\ReflectionObjectFactory.cs" />

     <Compile Include="src\DbLinq\Factory\IObjectFactory.cs" />

+    <Compile Include="src\DbLinq\Factory\Implementation\ReflectionObjectFactory.cs" />

     <Compile Include="src\DbLinq\Factory\ObjectFactory.cs" />

-    <Compile Include="src\DbLinq\Language\ILanguages.cs" />

     <Compile Include="src\DbLinq\Language\ILanguageWords.cs" />

+    <Compile Include="src\DbLinq\Language\ILanguages.cs" />

     <Compile Include="src\DbLinq\Language\Implementation\AbstractEndPluralWords.cs" />

     <Compile Include="src\DbLinq\Language\Implementation\AbstractWords.cs" />

     <Compile Include="src\DbLinq\Language\Implementation\Languages.cs" />

@@ -277,8 +278,8 @@
     <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.Adapter.cs" />

     <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.cs" />

     <Compile Include="src\DbLinq\Schema\Dbml\DbmlSerializer.cs" />

-    <Compile Include="src\DbLinq\Schema\Implementation\NameFormatter.cs" />

     <Compile Include="src\DbLinq\Schema\INameFormatter.cs" />

+    <Compile Include="src\DbLinq\Schema\Implementation\NameFormatter.cs" />

     <Compile Include="src\DbLinq\Schema\Name.cs" />

     <Compile Include="src\DbLinq\Schema\NameFormat.cs" />

     <Compile Include="src\DbLinq\Schema\ParameterName.cs" />

@@ -356,8 +357,11 @@
     <Compile Include="src\DbLinq\Vendor\IDataName.cs" />

     <Compile Include="src\DbLinq\Vendor\IDataTableColumn.cs" />

     <Compile Include="src\DbLinq\Vendor\IDataType.cs" />

+    <Compile Include="src\DbLinq\Vendor\INameAliases.cs" />

+    <Compile Include="src\DbLinq\Vendor\ISchemaLoader.cs" />

+    <Compile Include="src\DbLinq\Vendor\ISqlProvider.cs" />

+    <Compile Include="src\DbLinq\Vendor\IVendor.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Columns.cs" />

-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataName.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataTableColumn.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.ForeignKey.cs" />

@@ -365,15 +369,13 @@
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.StoredProcedures.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Tables.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.TypeMapping.cs" />

+    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\SqlProvider.cs" />

-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />

     <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.ProcedureResult.cs" />

-    <Compile Include="src\DbLinq\Vendor\INameAliases.cs" />

-    <Compile Include="src\DbLinq\Vendor\ISchemaLoader.cs" />

-    <Compile Include="src\DbLinq\Vendor\ISqlProvider.cs" />

-    <Compile Include="src\DbLinq\Vendor\IVendor.cs" />

+    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />

     <Compile Include="src\DbLinq\Vendor\VendorAttribute.cs" />

   </ItemGroup>

+  <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

   <ItemGroup>

     <ProjectReference Include="../System/System.csproj" />