diff --git a/src/Database.T4/DataModel/CsDatabase.tt b/src/Database.T4/DataModel/CsDatabase.tt index db000cc4f9c7c2797e04326d2eda8d263efc7e84..ad2eb0270db7257506b4a58cef16f3c1e2b6983a 100644 --- a/src/Database.T4/DataModel/CsDatabase.tt +++ b/src/Database.T4/DataModel/CsDatabase.tt @@ -3,22 +3,23 @@ <#@ include file="$(ProjectDir)\LinqToDB.Templates\LinqToDB.SqlServer.Tools.ttinclude" #> <#@ include file="$(ProjectDir)\LinqToDB.Templates\PluralizationService.ttinclude" #> -<#@ assembly name="$(ProjectDir)..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll"#> -<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.9.0\lib\net461\Coscine.Migrations.dll" #> -<#@ assembly name="$(ProjectDir)..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll" #> +<#@ assembly name="$(ProjectDir)..\packages\Coscine.Configuration.1.6.0\lib\net461\Coscine.Configuration.dll"#> +<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.11.0\lib\net461\Coscine.Migrations.dll" #> +<#@ assembly name="$(ProjectDir)..\packages\Coscine.Database.Helpers.1.2.0\lib\net461\Coscine.Database.Helpers.dll" #> +<#@ assembly name="$(ProjectDir)..\packages\Consul.1.6.1.1\lib\net461\Consul.dll"#> <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll"#> <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll"#> -<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Runner.3.2.8\lib\net461\FluentMigrator.Runner.dll"#> -<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Runner.Core.3.2.8\lib\net461\FluentMigrator.Runner.Core.dll"#> +<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Runner.3.2.11\lib\net461\FluentMigrator.Runner.dll"#> +<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Runner.Core.3.2.11\lib\net461\FluentMigrator.Runner.Core.dll"#> <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.Logging.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll"#> <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.Options.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll"#> -<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Abstractions.3.2.8\lib\net461\FluentMigrator.Abstractions.dll"#> +<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Abstractions.3.2.11\lib\net461\FluentMigrator.Abstractions.dll"#> <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll"#> -<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Runner.SqlServer.3.2.8\lib\net461\FluentMigrator.Runner.SqlServer.dll"#> -<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll"#> +<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Runner.SqlServer.3.2.11\lib\net461\FluentMigrator.Runner.SqlServer.dll"#> +<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.3.2.11\lib\net461\FluentMigrator.dll"#> <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll"#> -<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Extensions.SqlServer.3.2.8\lib\net461\FluentMigrator.Extensions.SqlServer.dll"#> +<#@ assembly name="$(ProjectDir)..\packages\FluentMigrator.Extensions.SqlServer.3.2.11\lib\net461\FluentMigrator.Extensions.SqlServer.dll"#> <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll"#> <#@ import namespace="System" #> diff --git a/src/Database.T4/Database.T4.csproj b/src/Database.T4/Database.T4.csproj index 8d5c3335634337d9de5e3c51f9b3de38a8f46630..ff025aaec91c520699207af7d69f61bb816f5a2e 100644 --- a/src/Database.T4/Database.T4.csproj +++ b/src/Database.T4/Database.T4.csproj @@ -40,83 +40,88 @@ <AssemblyOriginatorKeyFile>Coscine.Database.T4.Key.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> - <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> - <HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath> + <Reference Include="Consul, Version=1.6.1.1, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> + <HintPath>..\packages\Consul.1.6.1.1\lib\net461\Consul.dll</HintPath> </Reference> - <Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath> + <Reference Include="Coscine.Configuration, Version=1.6.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Configuration.1.6.0\lib\net461\Coscine.Configuration.dll</HintPath> </Reference> - <Reference Include="Coscine.Database.Helpers, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath> + <Reference Include="Coscine.Database.Helpers, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Database.Helpers.1.2.0\lib\net461\Coscine.Database.Helpers.dll</HintPath> </Reference> - <Reference Include="Coscine.Migrations, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Migrations.1.9.0\lib\net461\Coscine.Migrations.dll</HintPath> + <Reference Include="Coscine.Migrations, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Migrations.1.11.0\lib\net461\Coscine.Migrations.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="FluentMigrator, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.3.2.11\lib\net461\FluentMigrator.dll</HintPath> </Reference> - <Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath> + <Reference Include="FluentMigrator.Abstractions, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Abstractions.3.2.11\lib\net461\FluentMigrator.Abstractions.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Abstractions, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Abstractions.3.2.8\lib\net461\FluentMigrator.Abstractions.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.Oracle, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.Oracle.3.2.11\lib\net461\FluentMigrator.Extensions.Oracle.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.Oracle, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.Oracle.3.2.8\lib\net461\FluentMigrator.Extensions.Oracle.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.Postgres, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.Postgres.3.2.11\lib\net461\FluentMigrator.Extensions.Postgres.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.Postgres, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.Postgres.3.2.8\lib\net461\FluentMigrator.Extensions.Postgres.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.SqlAnywhere, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.11\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.SqlAnywhere, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.8\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.SqlServer, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.SqlServer.3.2.11\lib\net461\FluentMigrator.Extensions.SqlServer.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.SqlServer, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.SqlServer.3.2.8\lib\net461\FluentMigrator.Extensions.SqlServer.dll</HintPath> + <Reference Include="FluentMigrator.Runner, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.3.2.11\lib\net461\FluentMigrator.Runner.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.3.2.8\lib\net461\FluentMigrator.Runner.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Core, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Core.3.2.11\lib\net461\FluentMigrator.Runner.Core.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Core, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Core.3.2.8\lib\net461\FluentMigrator.Runner.Core.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Db2, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Db2.3.2.11\lib\net461\FluentMigrator.Runner.Db2.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Db2, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Db2.3.2.8\lib\net461\FluentMigrator.Runner.Db2.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Firebird, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Firebird.3.2.11\lib\net461\FluentMigrator.Runner.Firebird.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Firebird, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Firebird.3.2.8\lib\net461\FluentMigrator.Runner.Firebird.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Hana, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Hana.3.2.11\lib\net461\FluentMigrator.Runner.Hana.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Hana, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Hana.3.2.8\lib\net461\FluentMigrator.Runner.Hana.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Jet, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Jet.3.2.11\lib\net461\FluentMigrator.Runner.Jet.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Jet, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Jet.3.2.8\lib\net461\FluentMigrator.Runner.Jet.dll</HintPath> + <Reference Include="FluentMigrator.Runner.MySql, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.MySql.3.2.11\lib\net461\FluentMigrator.Runner.MySql.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.MySql, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.MySql.3.2.8\lib\net461\FluentMigrator.Runner.MySql.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Oracle, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Oracle.3.2.11\lib\net461\FluentMigrator.Runner.Oracle.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Oracle, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Oracle.3.2.8\lib\net461\FluentMigrator.Runner.Oracle.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Postgres, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Postgres.3.2.11\lib\net461\FluentMigrator.Runner.Postgres.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Postgres, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Postgres.3.2.8\lib\net461\FluentMigrator.Runner.Postgres.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Redshift, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Redshift.3.2.11\lib\net461\FluentMigrator.Runner.Redshift.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Redshift, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Redshift.3.2.8\lib\net461\FluentMigrator.Runner.Redshift.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SqlAnywhere, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.11\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SqlAnywhere, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.8\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SQLite, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SQLite.3.2.11\lib\net461\FluentMigrator.Runner.SQLite.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SQLite, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SQLite.3.2.8\lib\net461\FluentMigrator.Runner.SQLite.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SqlServer, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlServer.3.2.11\lib\net461\FluentMigrator.Runner.SqlServer.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SqlServer, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SqlServer.3.2.8\lib\net461\FluentMigrator.Runner.SqlServer.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SqlServerCe, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\lib\net461\FluentMigrator.Runner.SqlServerCe.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SqlServerCe, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\lib\net461\FluentMigrator.Runner.SqlServerCe.dll</HintPath> + <Reference Include="linq2db, Version=3.1.0.0, Culture=neutral, PublicKeyToken=e41013125f9e410a, processorArchitecture=MSIL"> + <HintPath>..\packages\linq2db.3.1.0\lib\net46\linq2db.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="linq2db, Version=3.1.1.0, Culture=neutral, PublicKeyToken=e41013125f9e410a, processorArchitecture=MSIL"> - <HintPath>..\packages\linq2db.3.1.1\lib\net46\linq2db.dll</HintPath> + <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> </Reference> - <Reference Include="Microsoft.Data.Sqlite, Version=3.1.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\packages\Microsoft.Data.Sqlite.Core.3.1.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath> + <Reference Include="Microsoft.Data.Sqlite, Version=5.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.2\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath> </Reference> <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath> @@ -139,21 +144,21 @@ <Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.2.669, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.2\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath> + <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.core, Version=2.0.2.669, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.core.2.0.2\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath> + <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.2.669, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.2\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath> + <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.2.669, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.2\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath> + <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath> </Reference> <Reference Include="System" /> - <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath> + <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath> </Reference> <Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath> @@ -161,16 +166,25 @@ <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.Configuration" /> <Reference Include="System.Core" /> + <Reference Include="System.Data.SqlClient, Version=4.6.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Data.SqlClient.4.8.2\lib\net461\System.Data.SqlClient.dll</HintPath> + </Reference> + <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath> + </Reference> <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath> + <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath> </Reference> <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Numerics" /> - <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath> + <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath> + </Reference> + <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath> </Reference> - <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath> + <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath> </Reference> <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> @@ -248,10 +262,10 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" /> - <Error Condition="!Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets'))" /> <Error Condition="!Exists('..\packages\linq2db.SqlServer.3.1.0\build\linq2db.SqlServer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\linq2db.SqlServer.3.1.0\build\linq2db.SqlServer.props'))" /> + <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" /> + <Error Condition="!Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets'))" /> </Target> - <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" /> - <Import Project="..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets" Condition="Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" /> + <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" /> + <Import Project="..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets" Condition="Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" /> </Project> \ No newline at end of file diff --git a/src/Database.T4/app.config b/src/Database.T4/app.config index 122ba238a468a90dff2e3492241357ae48e22154..cc9d4ebe2829756614748d7b0c2b17175fa1f4de 100644 --- a/src/Database.T4/app.config +++ b/src/Database.T4/app.config @@ -4,7 +4,7 @@ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> @@ -22,6 +22,30 @@ <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" /> </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> + </dependentAssembly> </assemblyBinding> </runtime> </configuration> \ No newline at end of file diff --git a/src/Database.T4/packages.config b/src/Database.T4/packages.config index 1c684c8140f2728eb1ca7126439a4d3cb711d73b..733a6e2b28e0b068eff2e96bd3c4bb99550fffb5 100644 --- a/src/Database.T4/packages.config +++ b/src/Database.T4/packages.config @@ -1,33 +1,31 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Consul" version="0.7.2.6" targetFramework="net461" /> - <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" /> - <package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" /> - <package id="Coscine.Migrations" version="1.9.0" targetFramework="net461" /> - <package id="FluentMigrator" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.Postgres" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.SqlAnywhere" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.SqlServer" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Core" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Db2" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Firebird" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Hana" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Jet" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.MySql" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Oracle" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Postgres" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Redshift" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SqlAnywhere" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SQLite" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SqlServer" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SqlServerCe" version="3.2.8" targetFramework="net461" /> - <package id="linq2db" version="3.1.1" targetFramework="net461" /> + <package id="Consul" version="1.6.1.1" targetFramework="net461" /> + <package id="Coscine.Configuration" version="1.6.0" targetFramework="net461" /> + <package id="Coscine.Database.Helpers" version="1.2.0" targetFramework="net461" /> + <package id="Coscine.Migrations" version="1.11.0" targetFramework="net461" /> + <package id="FluentMigrator" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Abstractions" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.Oracle" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.Postgres" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.SqlAnywhere" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.SqlServer" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Core" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Db2" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Firebird" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Hana" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Jet" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.MySql" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Oracle" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Postgres" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Redshift" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SqlAnywhere" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SQLite" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SqlServer" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SqlServerCe" version="3.2.11" targetFramework="net461" /> + <package id="linq2db" version="3.1.0" targetFramework="net461" /> <package id="linq2db.SqlServer" version="3.1.0" targetFramework="net461" /> - <package id="Microsoft.Data.Sqlite" version="3.1.5" targetFramework="net461" /> - <package id="Microsoft.Data.Sqlite.Core" version="3.1.5" targetFramework="net461" /> <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.1" targetFramework="net461" /> <package id="Microsoft.Extensions.DependencyInjection" version="2.0.0" targetFramework="net461" /> <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" /> @@ -35,14 +33,9 @@ <package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.1" targetFramework="net461" /> <package id="Microsoft.Extensions.Options" version="2.0.1" targetFramework="net461" /> <package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" /> - <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.2" targetFramework="net461" /> - <package id="SQLitePCLRaw.core" version="2.0.2" targetFramework="net461" /> - <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.2" targetFramework="net461" /> - <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.2" targetFramework="net461" /> - <package id="System.Buffers" version="4.4.0" targetFramework="net461" /> + <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net461" /> <package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" /> - <package id="System.Memory" version="4.5.3" targetFramework="net461" /> - <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" /> - <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" /> + <package id="System.Data.SqlClient" version="4.8.2" targetFramework="net461" /> + <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" /> <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> </packages> \ No newline at end of file diff --git a/src/Database.Tests/Database.Tests.csproj b/src/Database.Tests/Database.Tests.csproj index b75e392bb89dfd4dc400c18a38d0c7aa14839641..a2d9beeee46c6854fe48485cf12c271e5fac7621 100644 --- a/src/Database.Tests/Database.Tests.csproj +++ b/src/Database.Tests/Database.Tests.csproj @@ -34,83 +34,87 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> - <HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath> + <Reference Include="Consul, Version=1.6.1.1, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> + <HintPath>..\packages\Consul.1.6.1.1\lib\net461\Consul.dll</HintPath> </Reference> - <Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath> + <Reference Include="Coscine.Configuration, Version=1.6.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Configuration.1.6.0\lib\net461\Coscine.Configuration.dll</HintPath> </Reference> - <Reference Include="Coscine.Database.Helpers, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath> + <Reference Include="Coscine.Database.Helpers, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Database.Helpers.1.2.0\lib\net461\Coscine.Database.Helpers.dll</HintPath> </Reference> - <Reference Include="Coscine.Migrations, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Migrations.1.9.0\lib\net461\Coscine.Migrations.dll</HintPath> + <Reference Include="Coscine.Migrations, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Migrations.1.11.0\lib\net461\Coscine.Migrations.dll</HintPath> + <Private>True</Private> </Reference> - <Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath> + <Reference Include="FluentMigrator, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.3.2.11\lib\net461\FluentMigrator.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Abstractions, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Abstractions.3.2.8\lib\net461\FluentMigrator.Abstractions.dll</HintPath> + <Reference Include="FluentMigrator.Abstractions, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Abstractions.3.2.11\lib\net461\FluentMigrator.Abstractions.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.Oracle, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.Oracle.3.2.8\lib\net461\FluentMigrator.Extensions.Oracle.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.Oracle, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.Oracle.3.2.11\lib\net461\FluentMigrator.Extensions.Oracle.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.Postgres, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.Postgres.3.2.8\lib\net461\FluentMigrator.Extensions.Postgres.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.Postgres, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.Postgres.3.2.11\lib\net461\FluentMigrator.Extensions.Postgres.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.SqlAnywhere, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.8\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.SqlAnywhere, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.11\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Extensions.SqlServer, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Extensions.SqlServer.3.2.8\lib\net461\FluentMigrator.Extensions.SqlServer.dll</HintPath> + <Reference Include="FluentMigrator.Extensions.SqlServer, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.SqlServer.3.2.11\lib\net461\FluentMigrator.Extensions.SqlServer.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.3.2.8\lib\net461\FluentMigrator.Runner.dll</HintPath> + <Reference Include="FluentMigrator.Runner, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.3.2.11\lib\net461\FluentMigrator.Runner.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Core, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Core.3.2.8\lib\net461\FluentMigrator.Runner.Core.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Core, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Core.3.2.11\lib\net461\FluentMigrator.Runner.Core.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Db2, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Db2.3.2.8\lib\net461\FluentMigrator.Runner.Db2.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Db2, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Db2.3.2.11\lib\net461\FluentMigrator.Runner.Db2.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Firebird, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Firebird.3.2.8\lib\net461\FluentMigrator.Runner.Firebird.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Firebird, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Firebird.3.2.11\lib\net461\FluentMigrator.Runner.Firebird.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Hana, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Hana.3.2.8\lib\net461\FluentMigrator.Runner.Hana.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Hana, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Hana.3.2.11\lib\net461\FluentMigrator.Runner.Hana.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Jet, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Jet.3.2.8\lib\net461\FluentMigrator.Runner.Jet.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Jet, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Jet.3.2.11\lib\net461\FluentMigrator.Runner.Jet.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.MySql, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.MySql.3.2.8\lib\net461\FluentMigrator.Runner.MySql.dll</HintPath> + <Reference Include="FluentMigrator.Runner.MySql, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.MySql.3.2.11\lib\net461\FluentMigrator.Runner.MySql.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Oracle, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Oracle.3.2.8\lib\net461\FluentMigrator.Runner.Oracle.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Oracle, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Oracle.3.2.11\lib\net461\FluentMigrator.Runner.Oracle.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Postgres, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Postgres.3.2.8\lib\net461\FluentMigrator.Runner.Postgres.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Postgres, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Postgres.3.2.11\lib\net461\FluentMigrator.Runner.Postgres.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.Redshift, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.Redshift.3.2.8\lib\net461\FluentMigrator.Runner.Redshift.dll</HintPath> + <Reference Include="FluentMigrator.Runner.Redshift, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Redshift.3.2.11\lib\net461\FluentMigrator.Runner.Redshift.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SqlAnywhere, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.8\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SqlAnywhere, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.11\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SQLite, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SQLite.3.2.8\lib\net461\FluentMigrator.Runner.SQLite.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SQLite, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SQLite.3.2.11\lib\net461\FluentMigrator.Runner.SQLite.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SqlServer, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SqlServer.3.2.8\lib\net461\FluentMigrator.Runner.SqlServer.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SqlServer, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlServer.3.2.11\lib\net461\FluentMigrator.Runner.SqlServer.dll</HintPath> </Reference> - <Reference Include="FluentMigrator.Runner.SqlServerCe, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> - <HintPath>..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\lib\net461\FluentMigrator.Runner.SqlServerCe.dll</HintPath> + <Reference Include="FluentMigrator.Runner.SqlServerCe, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\lib\net461\FluentMigrator.Runner.SqlServerCe.dll</HintPath> </Reference> <Reference Include="linq2db, Version=3.1.1.0, Culture=neutral, PublicKeyToken=e41013125f9e410a, processorArchitecture=MSIL"> <HintPath>..\packages\linq2db.3.1.1\lib\net46\linq2db.dll</HintPath> </Reference> - <Reference Include="Microsoft.Data.Sqlite, Version=3.1.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\packages\Microsoft.Data.Sqlite.Core.3.1.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath> + <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Data.Sqlite, Version=5.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.2\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath> </Reference> <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath> @@ -136,21 +140,21 @@ <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.2.669, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.2\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath> + <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.core, Version=2.0.2.669, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.core.2.0.2\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath> + <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.2.669, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.2\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath> + <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath> </Reference> - <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.2.669, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.2\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath> + <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath> </Reference> <Reference Include="System" /> - <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath> + <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath> </Reference> <Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <HintPath>..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath> @@ -158,16 +162,25 @@ <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.Configuration" /> <Reference Include="System.Core" /> + <Reference Include="System.Data.SqlClient, Version=4.6.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Data.SqlClient.4.8.2\lib\net461\System.Data.SqlClient.dll</HintPath> + </Reference> + <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath> + </Reference> <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath> + <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath> </Reference> <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Numerics" /> - <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath> + <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath> + </Reference> + <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath> </Reference> - <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath> + <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath> </Reference> <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath> @@ -208,9 +221,9 @@ </PropertyGroup> <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" /> - <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" /> - <Error Condition="!Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets'))" /> + <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" /> + <Error Condition="!Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets'))" /> </Target> - <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" /> - <Import Project="..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets" Condition="Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" /> + <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" /> + <Import Project="..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets" Condition="Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" /> </Project> \ No newline at end of file diff --git a/src/Database.Tests/app.config b/src/Database.Tests/app.config index 2bfe81dcff84119345d5bb5e87f803a3ac41ef7d..263260f1506437a59128e11e130b1bdb3325e463 100644 --- a/src/Database.Tests/app.config +++ b/src/Database.Tests/app.config @@ -4,7 +4,7 @@ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> @@ -16,7 +16,31 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" /> </dependentAssembly> </assemblyBinding> </runtime> diff --git a/src/Database.Tests/packages.config b/src/Database.Tests/packages.config index 89a165fab5119fac7040142da38eaca373fd5f96..33eacaa3aba08b532993da963d096fee80aca4b8 100644 --- a/src/Database.Tests/packages.config +++ b/src/Database.Tests/packages.config @@ -1,32 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Consul" version="0.7.2.6" targetFramework="net461" /> - <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" /> - <package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" /> - <package id="Coscine.Migrations" version="1.9.0" targetFramework="net461" /> - <package id="FluentMigrator" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.Postgres" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.SqlAnywhere" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Extensions.SqlServer" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Core" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Db2" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Firebird" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Hana" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Jet" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.MySql" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Oracle" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Postgres" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.Redshift" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SqlAnywhere" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SQLite" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SqlServer" version="3.2.8" targetFramework="net461" /> - <package id="FluentMigrator.Runner.SqlServerCe" version="3.2.8" targetFramework="net461" /> - <package id="linq2db" version="3.1.1" targetFramework="net461" /> - <package id="Microsoft.Data.Sqlite" version="3.1.5" targetFramework="net461" /> - <package id="Microsoft.Data.Sqlite.Core" version="3.1.5" targetFramework="net461" /> + <package id="Consul" version="1.6.1.1" targetFramework="net461" /> + <package id="Coscine.Configuration" version="1.6.0" targetFramework="net461" /> + <package id="Coscine.Database.Helpers" version="1.2.0" targetFramework="net461" /> + <package id="Coscine.Migrations" version="1.11.0" targetFramework="net461" /> + <package id="FluentMigrator" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Abstractions" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.Oracle" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.Postgres" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.SqlAnywhere" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Extensions.SqlServer" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Core" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Db2" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Firebird" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Hana" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Jet" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.MySql" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Oracle" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Postgres" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.Redshift" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SqlAnywhere" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SQLite" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SqlServer" version="3.2.11" targetFramework="net461" /> + <package id="FluentMigrator.Runner.SqlServerCe" version="3.2.11" targetFramework="net461" /> <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.1" targetFramework="net461" /> <package id="Microsoft.Extensions.DependencyInjection" version="2.0.0" targetFramework="net461" /> <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" /> @@ -36,14 +33,9 @@ <package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" /> <package id="NUnit" version="3.12.0" targetFramework="net461" /> <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net461" /> - <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.2" targetFramework="net461" /> - <package id="SQLitePCLRaw.core" version="2.0.2" targetFramework="net461" /> - <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.2" targetFramework="net461" /> - <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.2" targetFramework="net461" /> - <package id="System.Buffers" version="4.4.0" targetFramework="net461" /> + <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net461" /> <package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" /> - <package id="System.Memory" version="4.5.3" targetFramework="net461" /> - <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" /> - <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" /> + <package id="System.Data.SqlClient" version="4.8.2" targetFramework="net461" /> + <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" /> <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" /> </packages> \ No newline at end of file diff --git a/src/Database/App.config b/src/Database/App.config index 122ba238a468a90dff2e3492241357ae48e22154..7a04aeac7dc23cbfd709fcce639c8fd7a1a20ae1 100644 --- a/src/Database/App.config +++ b/src/Database/App.config @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> + <configSections> + <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + </configSections> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> @@ -24,4 +28,9 @@ </dependentAssembly> </assemblyBinding> </runtime> + <entityFramework> + <providers> + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> + </providers> + </entityFramework> </configuration> \ No newline at end of file diff --git a/src/Database/Database.csproj b/src/Database/Database.csproj index 09a49f9aa40d8d6dc91532b0e8c10988f3c539c2..4cabd595ac9a676c88018d82a8917b907edd8b48 100644 --- a/src/Database/Database.csproj +++ b/src/Database/Database.csproj @@ -39,11 +39,17 @@ <AssemblyOriginatorKeyFile>Coscine.Database.Key.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> - <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> - <HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath> + <Reference Include="Consul, Version=1.6.1.1, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"> + <HintPath>..\packages\Consul.1.6.1.1\lib\net461\Consul.dll</HintPath> </Reference> - <Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> - <HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath> + <Reference Include="Coscine.Configuration, Version=1.6.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Configuration.1.6.0\lib\net461\Coscine.Configuration.dll</HintPath> + </Reference> + <Reference Include="Coscine.Database.Helpers, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Database.Helpers.1.2.0\lib\net461\Coscine.Database.Helpers.dll</HintPath> + </Reference> + <Reference Include="Coscine.Migrations, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Coscine.Migrations.1.10.0\lib\net461\Coscine.Migrations.dll</HintPath> </Reference> <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath> @@ -51,22 +57,148 @@ <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath> </Reference> + <Reference Include="FluentMigrator, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.3.2.11\lib\net461\FluentMigrator.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Abstractions, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Abstractions.3.2.11\lib\net461\FluentMigrator.Abstractions.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Extensions.Oracle, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.Oracle.3.2.11\lib\net461\FluentMigrator.Extensions.Oracle.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Extensions.Postgres, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.Postgres.3.2.11\lib\net461\FluentMigrator.Extensions.Postgres.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Extensions.SqlAnywhere, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.11\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Extensions.SqlServer, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Extensions.SqlServer.3.2.11\lib\net461\FluentMigrator.Extensions.SqlServer.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.3.2.11\lib\net461\FluentMigrator.Runner.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Core, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Core.3.2.11\lib\net461\FluentMigrator.Runner.Core.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Db2, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Db2.3.2.11\lib\net461\FluentMigrator.Runner.Db2.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Firebird, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Firebird.3.2.11\lib\net461\FluentMigrator.Runner.Firebird.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Hana, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Hana.3.2.11\lib\net461\FluentMigrator.Runner.Hana.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Jet, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Jet.3.2.11\lib\net461\FluentMigrator.Runner.Jet.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.MySql, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.MySql.3.2.11\lib\net461\FluentMigrator.Runner.MySql.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Oracle, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Oracle.3.2.11\lib\net461\FluentMigrator.Runner.Oracle.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Postgres, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Postgres.3.2.11\lib\net461\FluentMigrator.Runner.Postgres.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.Redshift, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.Redshift.3.2.11\lib\net461\FluentMigrator.Runner.Redshift.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.SqlAnywhere, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.11\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.SQLite, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SQLite.3.2.11\lib\net461\FluentMigrator.Runner.SQLite.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.SqlServer, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlServer.3.2.11\lib\net461\FluentMigrator.Runner.SqlServer.dll</HintPath> + </Reference> + <Reference Include="FluentMigrator.Runner.SqlServerCe, Version=3.2.11.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL"> + <HintPath>..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\lib\net461\FluentMigrator.Runner.SqlServerCe.dll</HintPath> + </Reference> <Reference Include="linq2db, Version=3.1.1.0, Culture=neutral, PublicKeyToken=e41013125f9e410a, processorArchitecture=MSIL"> <HintPath>..\packages\linq2db.3.1.1\lib\net46\linq2db.dll</HintPath> </Reference> <Reference Include="LinqKit, Version=1.1.17.0, Culture=neutral, PublicKeyToken=bc217f8844052a91, processorArchitecture=MSIL"> <HintPath>..\packages\LinqKit.1.1.17\lib\net45\LinqKit.dll</HintPath> </Reference> + <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Data.Sqlite, Version=5.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Data.Sqlite.Core.5.0.2\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Extensions.DependencyInjection, Version=5.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.5.0.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Extensions.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath> + </Reference> <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> + <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath> + </Reference> + <Reference Include="SQLitePCLRaw.core, Version=2.0.4.976, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath> + </Reference> + <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.4.976, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath> + </Reference> + <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.4.976, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL"> + <HintPath>..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath> + </Reference> <Reference Include="System" /> + <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath> + </Reference> + <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath> + </Reference> <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.Configuration" /> <Reference Include="System.Core" /> + <Reference Include="System.Data.SqlClient, Version=4.6.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Data.SqlClient.4.8.2\lib\net461\System.Data.SqlClient.dll</HintPath> + </Reference> + <Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath> + </Reference> <Reference Include="System.DirectoryServices" /> + <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath> + </Reference> <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Numerics" /> + <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath> + </Reference> + <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath> + </Reference> + <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath> + </Reference> + <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> + <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath> + </Reference> <Reference Include="System.Web" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> @@ -89,6 +221,7 @@ <Compile Include="Models\LogModel.cs" /> <Compile Include="ReturnObjects\DisciplineObject.cs" /> <Compile Include="ReturnObjects\ExternalAuthenticatorsObject.cs" /> + <Compile Include="ReturnObjects\ExternalIdsObject.cs" /> <Compile Include="ReturnObjects\FeatureObject.cs" /> <Compile Include="ReturnObjects\GitlabResourceTypeObject.cs" /> <Compile Include="ReturnObjects\IReturnObject.cs" /> @@ -163,6 +296,10 @@ </PropertyGroup> <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" /> <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" /> + <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" /> + <Error Condition="!Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets'))" /> </Target> <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" /> + <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" /> + <Import Project="..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets" Condition="Exists('..\packages\FluentMigrator.Runner.SqlServerCe.3.2.11\build\netstandard2.0\FluentMigrator.Runner.SqlServerCe.targets')" /> </Project> \ No newline at end of file diff --git a/src/Database/ReturnObjects/ExternalIdsObject.cs b/src/Database/ReturnObjects/ExternalIdsObject.cs new file mode 100644 index 0000000000000000000000000000000000000000..880d6f781b5e88cc3ad1aa69d083954c226a1546 --- /dev/null +++ b/src/Database/ReturnObjects/ExternalIdsObject.cs @@ -0,0 +1,23 @@ +using System; + +namespace Coscine.Database.ReturnObjects +{ + [Serializable] + public class ExternalIdsObject : IReturnObject + { + public Guid Id { get; set; } + public Guid UserId { get; set; } + public Guid ExternalAuthenticatorId { get; set; } + public string Organization { get; set; } + public string ExternalId { get; set; } + + public ExternalIdsObject(Guid id, Guid userId, Guid externalAuthenticatorId, string organization, string externalId) + { + Id = id; + UserId = userId; + ExternalAuthenticatorId = externalAuthenticatorId; + Organization = organization; + ExternalId = externalId; + } + } +} diff --git a/src/Database/packages.config b/src/Database/packages.config index 31d2edbcb414e1ebdecbcaf28e6d74a7b82a67a1..127fa64355de7b05ff5285c95b6f4820bd22dce5 100644 --- a/src/Database/packages.config +++ b/src/Database/packages.config @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Consul" version="0.7.2.6" targetFramework="net461" /> - <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" /> + <package id="Consul" version="1.6.1.1" targetFramework="net461" /> + <package id="Coscine.Configuration" version="1.6.0" targetFramework="net461" /> <package id="EntityFramework" version="6.4.4" targetFramework="net461" /> - <package id="linq2db" version="3.1.1" targetFramework="net461" /> - <package id="LinqKit" version="1.1.17" targetFramework="net461" /> - <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" /> + <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net461" /> </packages> \ No newline at end of file