Skip to content
Snippets Groups Projects
Commit cf8ec31d authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/2020-20' into 'master' 

Sprint/2020 20

See merge request coscine/cs/database!101
parents a7a491c5 8665a4eb
Branches
Tags v1.26.0
1 merge request!101Sprint/2020 20
Hide whitespace changes
Inline Side-by-side
Showing
with 67 additions and 11 deletions
src/Database.T4/DataModel/CsDatabase.tt
+ 1
− 1
View file @ cf8ec31d
......@@ -4,7 +4,7 @@
<#@ 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.7.0\lib\net461\Coscine.Migrations.dll" #>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.8.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\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll"#>
......
src/Database.T4/Database.T4.csproj
+ 25
− 4
View file @ cf8ec31d
......@@ -49,8 +49,8 @@
<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>
<Reference Include="Coscine.Migrations, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.7.0\lib\net461\Coscine.Migrations.dll</HintPath>
<Reference Include="Coscine.Migrations, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.8.0\lib\net461\Coscine.Migrations.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>
......@@ -112,8 +112,8 @@
<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>
<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>
<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>
......@@ -186,6 +186,7 @@
</ItemGroup>
<Import Project="CustomT4.targets" />
<ItemGroup>
<None Include="amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
<None Include="CustomT4.targets" />
<Compile Include="DataModel\CsDatabase.generated.cs">
<AutoGen>True</AutoGen>
......@@ -193,6 +194,7 @@
<DependentUpon>CsDatabase.tt</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<None Include="x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
......@@ -224,7 +226,26 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<Content Include="amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="amd64\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="amd64\sqlceca40.dll" />
<Content Include="amd64\sqlcecompact40.dll" />
<Content Include="amd64\sqlceer40EN.dll" />
<Content Include="amd64\sqlceme40.dll" />
<Content Include="amd64\sqlceqp40.dll" />
<Content Include="amd64\sqlcese40.dll" />
<Content Include="LinqToDB.Templates\CopyMe.SqlServer.tt.txt" />
<Content Include="runtimes\win-arm\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x64\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x86\native\e_sqlite3.dll" />
<Content Include="x86\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="x86\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="x86\sqlceca40.dll" />
<Content Include="x86\sqlcecompact40.dll" />
<Content Include="x86\sqlceer40EN.dll" />
<Content Include="x86\sqlceme40.dll" />
<Content Include="x86\sqlceqp40.dll" />
<Content Include="x86\sqlcese40.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
......
src/Database.T4/Properties/AssemblyInfo.cs
+ 1
− 1
View file @ cf8ec31d
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.T4")]
[assembly: AssemblyVersion("1.25.0")]
[assembly: AssemblyFileVersion("1.25.0")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1060-affil0001")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0005")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
src/Database.T4/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest 0 → 100644
+ 6
− 0
View file @ cf8ec31d
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<noInheritable></noInheritable>
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="amd64" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
<file name="msvcr90.dll" hashalg="SHA1" hash="1b065fdf0cb8516b0553128eae4af39c5f8eeb46"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>Vy8CgQgbu3qH5JHTK0op4kR8114=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="45d3027d87eade77317e92994790598c755b3920"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>QTJu3Gttpt8hhCktGelNeXj4Yp8=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="e77fd69f7c88f34329d8a95c3179f67ead330217"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>1ruqF7/L+m1tqnJVscaOtNRNHIE=</dsig:DigestValue></asmv2:hash></file>
</assembly>
\ No newline at end of file
src/Database.T4/amd64/Microsoft.VC90.CRT/README_ENU.txt 0 → 100644
NaN GiB (NaN%)
View file @ cf8ec31d
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
src/Database.T4/amd64/Microsoft.VC90.CRT/msvcr90.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/amd64/sqlceca40.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/amd64/sqlcecompact40.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/amd64/sqlceer40EN.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/amd64/sqlceme40.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/amd64/sqlceqp40.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/amd64/sqlcese40.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/packages.config
+ 2
− 2
View file @ cf8ec31d
......@@ -3,7 +3,7 @@
<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.7.0" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.8.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" />
......@@ -24,7 +24,7 @@
<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.0" targetFramework="net461" />
<package id="linq2db" version="3.1.1" 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" />
......
src/Database.T4/runtimes/win-arm/native/e_sqlite3.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/runtimes/win-x64/native/e_sqlite3.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.T4/runtimes/win-x86/native/e_sqlite3.dll 0 → 100644
+ 0
− 0
View file @ cf8ec31d
File added
src/Database.Tests/Database.Tests.csproj
+ 25
− 2
View file @ cf8ec31d
......@@ -43,8 +43,8 @@
<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>
<Reference Include="Coscine.Migrations, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.7.0\lib\net461\Coscine.Migrations.dll</HintPath>
<Reference Include="Coscine.Migrations, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.8.0\lib\net461\Coscine.Migrations.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>
......@@ -189,8 +189,10 @@
<Compile Include="TestCoscineDB.cs" />
</ItemGroup>
<ItemGroup>
<None Include="amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
<None Include="app.config" />
<None Include="packages.config" />
<None Include="x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
......@@ -201,6 +203,27 @@
<Name>Database</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="amd64\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="amd64\sqlceca40.dll" />
<Content Include="amd64\sqlcecompact40.dll" />
<Content Include="amd64\sqlceer40EN.dll" />
<Content Include="amd64\sqlceme40.dll" />
<Content Include="amd64\sqlceqp40.dll" />
<Content Include="amd64\sqlcese40.dll" />
<Content Include="runtimes\win-arm\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x64\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x86\native\e_sqlite3.dll" />
<Content Include="x86\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="x86\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="x86\sqlceca40.dll" />
<Content Include="x86\sqlcecompact40.dll" />
<Content Include="x86\sqlceer40EN.dll" />
<Content Include="x86\sqlceme40.dll" />
<Content Include="x86\sqlceqp40.dll" />
<Content Include="x86\sqlcese40.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
......
src/Database.Tests/Properties/AssemblyInfo.cs
+ 1
− 1
View file @ cf8ec31d
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.Tests")]
[assembly: AssemblyVersion("1.25.0")]
[assembly: AssemblyFileVersion("1.25.0")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1060-affil0001")]
[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0005")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
src/Database.Tests/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest 0 → 100644
+ 6
− 0
View file @ cf8ec31d
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<noInheritable></noInheritable>
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="amd64" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
<file name="msvcr90.dll" hashalg="SHA1" hash="1b065fdf0cb8516b0553128eae4af39c5f8eeb46"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>Vy8CgQgbu3qH5JHTK0op4kR8114=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="45d3027d87eade77317e92994790598c755b3920"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>QTJu3Gttpt8hhCktGelNeXj4Yp8=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="e77fd69f7c88f34329d8a95c3179f67ead330217"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>1ruqF7/L+m1tqnJVscaOtNRNHIE=</dsig:DigestValue></asmv2:hash></file>
</assembly>
\ No newline at end of file
src/Database.Tests/amd64/Microsoft.VC90.CRT/README_ENU.txt 0 → 100644
NaN GiB (NaN%)
View file @ cf8ec31d
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment