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 7c2965eda294e35b644059bf493b44aa290aebb6..919fbcce6fc84fbfce0aaf71233447708c9d1667 100644 --- a/.gitignore +++ b/.gitignore @@ -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/ @@ -262,5 +265,9 @@ __pycache__/ *.pyc #cake -tools/ -dist/ \ No newline at end of file +tools/* +!tools/packages.config +dist/ + +# Dotnet Tool Manifest +.config/* diff --git a/src/Logging.Tests/Logging.Tests.csproj b/src/Logging.Tests/Logging.Tests.csproj index 82191e83fcdae234c99a9b75d1ba9ef656614b2e..e15831b7417c7a83616e44febf614e7d04e88126 100644 --- a/src/Logging.Tests/Logging.Tests.csproj +++ b/src/Logging.Tests/Logging.Tests.csproj @@ -9,13 +9,8 @@ <ProjectReference Include="..\Logging\Logging.csproj" /> </ItemGroup> <ItemGroup> - <PackageReference Include="Consul" Version="1.6.1.1" /> - <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" /> - <PackageReference Include="NLog" Version="4.7.6" /> - <PackageReference Include="NLog.Config" Version="4.7.6" /> - <PackageReference Include="NLog.Schema" Version="4.7.6" /> <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/Logging.Tests/Properties/AssemblyInfo.cs b/src/Logging.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index def4036de815ce0187566b5f7513438b61b04d4b..0000000000000000000000000000000000000000 --- a/src/Logging.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("Logging.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/Logging/Logging.csproj b/src/Logging/Logging.csproj index 1a9be1fadffe2e3777a9bf82f45bce84ff7097e0..136867dc9283bcdd2ef7a379271678cc104a569f 100644 --- a/src/Logging/Logging.csproj +++ b/src/Logging/Logging.csproj @@ -1,14 +1,22 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Library</OutputType> <RootNamespace>Coscine.Logging</RootNamespace> <AssemblyName>Coscine.Logging</AssemblyName> <TargetFrameworks>net5.0;net461</TargetFrameworks> - <Version>1.3.0</Version></PropertyGroup> + <Version>1.3.0</Version> + </PropertyGroup> <PropertyGroup> - <SignAssembly>true</SignAssembly> + <Authors>RWTH Aachen University</Authors> + <Company>IT Center, RWTH Aachen University</Company> + <Copyright>2021 IT Center, RWTH Aachen University</Copyright> + <Description>Logging is a part of the Coscine group.</Description> + <PackageLicenseExpression>MIT</PackageLicenseExpression> + <PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/libraries/Logging</PackageProjectUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> </PropertyGroup> <PropertyGroup> + <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Coscine.Logging.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> @@ -16,10 +24,8 @@ </ItemGroup> <ItemGroup> <PackageReference Include="Consul" Version="1.6.1.1" /> - <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" /> + <PackageReference Include="NLog" Version="4.7.7" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> - <PackageReference Include="NLog" Version="4.7.6" /> - <PackageReference Include="NLog.Config" Version="4.7.6" /> - <PackageReference Include="NLog.Schema" Version="4.7.6" /> + <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/Logging/Logging.nuspec b/src/Logging/Logging.nuspec deleted file mode 100644 index 986eb657905d2c27d77301d6bd6aafc5a8d957ce..0000000000000000000000000000000000000000 --- a/src/Logging/Logging.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/logging</projectUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>$description$</description> - <copyright>$copyright$</copyright> - </metadata> -</package> \ No newline at end of file diff --git a/src/Logging/Properties/AssemblyInfo.cs b/src/Logging/Properties/AssemblyInfo.cs deleted file mode 100644 index c5a2aad52c196aa6a28353371679efe7d4d1dfec..0000000000000000000000000000000000000000 --- a/src/Logging/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by Cake. -// </auto-generated> -//------------------------------------------------------------------------------ -using System.Reflection; - -[assembly: AssemblyDescription("Logging is a part of the CoScInE group.")] -[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")] \ No newline at end of file