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

Sprint/2021 03

See merge request !8

.config/dotnet-tools.json

-{
-  "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

.gitignore

@@ -268,3 +268,6 @@ __pycache__/
 tools/*
 !tools/packages.config
 dist/
+
+# Dotnet Tool Manifest
+.config/*

src/Database.Helpers.Tests/Database.Helpers.Tests.csproj

@@ -9,10 +9,8 @@
 		<ProjectReference Include="..\Database.Helpers\Database.Helpers.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Consul" Version="1.6.1.1" />
-		<PackageReference Include="Coscine.Configuration" Version="*-*" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-		<PackageReference Include="NUnit" Version="3.13.0" />
+		<PackageReference Include="NUnit" Version="3.13.1" />
 		<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
 	</ItemGroup>
 </Project>
\ No newline at end of file

src/Database.Helpers.Tests/Properties/AssemblyInfo.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by Cake.
-// </auto-generated>
-//------------------------------------------------------------------------------
-using System.Reflection;
-
-[assembly: AssemblyDescription("Database.Helpers.Tests is a part of the CoScInE group.")]
-[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
\ No newline at end of file

src/Database.Helpers.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30320.27
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Database.Helpers", "Database.Helpers\Database.Helpers.csproj", "{C4551DDC-B648-4EC4-A1AD-584F0B9A019D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Database.Helpers", "Database.Helpers\Database.Helpers.csproj", "{C4551DDC-B648-4EC4-A1AD-584F0B9A019D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Database.Helpers.Tests", "Database.Helpers.Tests\Database.Helpers.Tests.csproj", "{AC22690F-5194-4CED-BE4D-B32F7954A88C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Database.Helpers.Tests", "Database.Helpers.Tests\Database.Helpers.Tests.csproj", "{AC22690F-5194-4CED-BE4D-B32F7954A88C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Database.Helpers/Database.Helpers.csproj

@@ -4,10 +4,19 @@
 		<RootNamespace>Coscine.Database.Helpers</RootNamespace>
 		<AssemblyName>Coscine.Database.Helpers</AssemblyName>
 		<TargetFrameworks>net5.0;net461</TargetFrameworks>
-	<Version>1.2.0</Version></PropertyGroup>
+		<Version>1.2.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>Database.Helpers is a part of the Coscine group.</Description>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/libraries/Database.Helpers</PackageProjectUrl>
+		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Consul" Version="1.6.1.1" />
-		<PackageReference Include="Coscine.Configuration" Version="*-*" />
+		<PackageReference Include="Coscine.Configuration" Version="2.*-*" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
 	</ItemGroup>
 </Project>
\ No newline at end of file

src/Database.Helpers/Database.Helpers.nuspec

-<?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/database.helpers</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-  </metadata>
-</package>
\ No newline at end of file

src/Database.Helpers/DatabaseMasterHelper.cs

@@ -32,7 +32,7 @@ namespace Coscine.Database.Helpers
             }
         }
 
-        public void CreateDatabse(string dbDatabase)
+        public void CreateDatabase(string dbDatabase)
         {
             var sqlCommandBuilder = new SqlCommandBuilder();
             using (var connection = new SqlConnection(ConnectionSettings.GetConnectionString(false)))
@@ -83,7 +83,7 @@ namespace Coscine.Database.Helpers
         {
             if (!DatabaseExists(dbDatabase))
             {
-                CreateDatabse(dbDatabase);
+                CreateDatabase(dbDatabase);
             }
         }
 

src/Database.Helpers/Properties/AssemblyInfo.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by Cake.
-// </auto-generated>
-//------------------------------------------------------------------------------
-using System.Reflection;
-
-[assembly: AssemblyDescription("Database.Helpers is a part of the CoScInE group.")]
-[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")]
\ No newline at end of file