diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json deleted file mode 100644 index 952d361b7260d2209a0308fe8b6221679099ffa6..0000000000000000000000000000000000000000 --- a/.config/dotnet-tools.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 diff --git a/.gitignore b/.gitignore index d2df1da5b5077d597142e85e19812ba900a4e81c..919fbcce6fc84fbfce0aaf71233447708c9d1667 100644 --- a/.gitignore +++ b/.gitignore @@ -268,3 +268,6 @@ __pycache__/ tools/* !tools/packages.config dist/ + +# Dotnet Tool Manifest +.config/* diff --git a/src/Database.Helpers.Tests/Database.Helpers.Tests.csproj b/src/Database.Helpers.Tests/Database.Helpers.Tests.csproj index 63b6d91340f79a3c55e09261bbd8a619b3557253..cd1c83e774cf18d81eada533e4d22cc74f9fbe52 100644 --- a/src/Database.Helpers.Tests/Database.Helpers.Tests.csproj +++ b/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 diff --git a/src/Database.Helpers.Tests/Properties/AssemblyInfo.cs b/src/Database.Helpers.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 3265f63c9e1a5f53534fb28a3124e49cd1c661ec..0000000000000000000000000000000000000000 --- a/src/Database.Helpers.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -//------------------------------------------------------------------------------ -// <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 diff --git a/src/Database.Helpers.sln b/src/Database.Helpers.sln index 84a423768b8cdba87acb587c88faee9beb88c0fd..e3a8f71785d41b28eebb78f9e5fbfbcb5d69f669 100644 --- a/src/Database.Helpers.sln +++ b/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 diff --git a/src/Database.Helpers/Database.Helpers.csproj b/src/Database.Helpers/Database.Helpers.csproj index 042ecc782c3270d4d58b49578e05db945b89f908..78f4afaf995d6e68a6adaa7d5ecd59d57413b76c 100644 --- a/src/Database.Helpers/Database.Helpers.csproj +++ b/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 diff --git a/src/Database.Helpers/Database.Helpers.nuspec b/src/Database.Helpers/Database.Helpers.nuspec deleted file mode 100644 index 06ded9afd4fc3daf6d349b4ab37bb1df3802c0bd..0000000000000000000000000000000000000000 --- a/src/Database.Helpers/Database.Helpers.nuspec +++ /dev/null @@ -1,15 +0,0 @@ -<?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 diff --git a/src/Database.Helpers/DatabaseMasterHelper.cs b/src/Database.Helpers/DatabaseMasterHelper.cs index 6a00cbea9320dafa143b3dd3b78760758f9e1a4c..33955d8555967fd2177bd3de67141e16ec7ee60d 100644 --- a/src/Database.Helpers/DatabaseMasterHelper.cs +++ b/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); } } diff --git a/src/Database.Helpers/Properties/AssemblyInfo.cs b/src/Database.Helpers/Properties/AssemblyInfo.cs deleted file mode 100644 index b1bdd205c83a71c05166cfdbf1f503216f0dd19c..0000000000000000000000000000000000000000 --- a/src/Database.Helpers/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -//------------------------------------------------------------------------------ -// <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