Commit 3e5cd5c6 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/2021-03' into 'master'

Sprint/2021 03

See merge request !48
parents c4cb2b69 c5077a52
{
"version": 1,
"isRoot": true,
"tools": {
"gitversion.tool": {
"version": "5.6.4",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-version-cli": {
"version": "2.1.1",
"commands": [
"dotnet-version"
]
}
}
}
\ No newline at end of file
......@@ -10,6 +10,9 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Database connection for t4 class generation from database
**/*.generated.cs
# Build results
[Dd]ebug/
[Dd]ebugPublic/
......@@ -265,3 +268,6 @@ __pycache__/
tools/*
!tools/packages.config
dist/
# Dotnet Tool Manifest
.config/*
......@@ -6,16 +6,11 @@
<TargetFrameworks>net5.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Coscine.Configuration" Version="1.6.0" />
<PackageReference Include="Coscine.Database.Helpers" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="NUnit" Version="3.13.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<ProjectReference Include="..\Migrations\Migrations.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Migrations\Migrations.csproj">
<Project>{447e8ba5-30e3-4521-b6f6-51a064098026}</Project>
<Name>Migrations</Name>
</ProjectReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup>
</Project>
\ No newline at end of file
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by Cake.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Reflection;
[assembly: AssemblyDescription("Migrations.Tests is a part of the CoScInE group.")]
[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
\ No newline at end of file
......@@ -4,10 +4,17 @@
<RootNamespace>Coscine.Migrations</RootNamespace>
<AssemblyName>Coscine.Migrations</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<Version>1.11.0</Version></PropertyGroup>
<ItemGroup>
<None Remove="Migrations\Migration202101181145DFNAAI_up.sql" />
</ItemGroup>
<Version>1.11.0</Version>
</PropertyGroup>
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
<Company>IT Center, RWTH Aachen University</Company>
<Copyright>2021 IT Center, RWTH Aachen University</Copyright>
<Description>Migrations is a part of the Coscine group.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/libraries/Migrations</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Assets\dfg_structure.rdf" />
<EmbeddedResource Include="Assets\Institutes.csv" />
......@@ -18,11 +25,8 @@
<EmbeddedResource Include="Migrations\Migration202101181145DFNAAI_up.sql" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Coscine.Configuration" Version="1.6.0" />
<PackageReference Include="Coscine.Database.Helpers" Version="1.2.0" />
<PackageReference Include="FluentMigrator" Version="3.2.11" />
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.2.11" />
<PackageReference Include="Coscine.Configuration" Version="2.*-*" />
<PackageReference Include="Coscine.Database.Helpers" Version="2.*-*" />
<PackageReference Include="FluentMigrator.Runner" Version="3.2.11" />
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="3.2.11" />
</ItemGroup>
</Project>
\ No newline at end of file
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<authors>rwth-aachen</authors>
<owners>rwth-aachen</owners>
<license type="expression">MIT</license>
<projectUrl>https://git.rwth-aachen.de/coscine/cs/migrations</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<copyright>$copyright$</copyright>
</metadata>
</package>
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by Cake.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Reflection;
[assembly: AssemblyDescription("Migrations is a part of the CoScInE group.")]
[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
\ No newline at end of file
......@@ -6,18 +6,6 @@
<TargetFrameworks>net5.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Migrations\Migrations.csproj">
<Project>{447e8ba5-30e3-4521-b6f6-51a064098026}</Project>
<Name>Migrations</Name>
</ProjectReference>
<ProjectReference Include="..\Migrations\Migrations.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Consul" Version="1.6.1.1" />
<PackageReference Include="Coscine.Configuration" Version="*-*" />
<PackageReference Include="Coscine.Database.Helpers" Version="*-*" />
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by Cake.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Reflection;
[assembly: AssemblyDescription("Migrator is a part of the CoScInE group.")]
[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment