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/Configuration.Tests/Configuration.Tests.csproj b/src/Configuration.Tests/Configuration.Tests.csproj index 3b8e2e141febf3c4bddfe1d56d7bda695e366132..56f924d7f85050d26e49eade172ba4d71a8c4efa 100644 --- a/src/Configuration.Tests/Configuration.Tests.csproj +++ b/src/Configuration.Tests/Configuration.Tests.csproj @@ -6,14 +6,11 @@ <TargetFrameworks>net5.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\configuration\Configuration.csproj"> - <Project>{97fc4a08-a089-4823-9aeb-d05b36be931d}</Project> - <Name>Configuration</Name> - </ProjectReference> + <ProjectReference Include="..\configuration\Configuration.csproj" /> </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" /> - <PackageReference Include="NUnit" Version="3.13.0" /> + <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 diff --git a/src/Configuration.Tests/Properties/AssemblyInfo.cs b/src/Configuration.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 91e3ec639edf591ca0710cc81de7487372f6a9d7..0000000000000000000000000000000000000000 --- a/src/Configuration.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by Cake. -// </auto-generated> -//------------------------------------------------------------------------------ -using System.Reflection; - -[assembly: AssemblyDescription("Configuration.Tests is a part of the CoScInE group.")] -[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")] - diff --git a/src/Configuration.sln b/src/Configuration.sln index e6440b81c1a30b9ada072b10b16f49029c743dd1..b4fa2e673706d64fd4c818686749d3ec5b3f5051 100644 --- a/src/Configuration.sln +++ b/src/Configuration.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29009.5 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration", "configuration\Configuration.csproj", "{97FC4A08-A089-4823-9AEB-D05B36BE931D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Configuration", "configuration\Configuration.csproj", "{97FC4A08-A089-4823-9AEB-D05B36BE931D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration.Tests", "configuration.Tests\Configuration.Tests.csproj", "{DC9FB8C0-CD6B-4C0B-8BA6-5C14668B7DA4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Configuration.Tests", "configuration.Tests\Configuration.Tests.csproj", "{DC9FB8C0-CD6B-4C0B-8BA6-5C14668B7DA4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Configuration/Configuration.csproj b/src/Configuration/Configuration.csproj index 1f87c03b6d33a7a74ef33cd152e2575b81c1a4a3..74664a51387005eb8d4ff41e6ca727212ca2c960 100644 --- a/src/Configuration/Configuration.csproj +++ b/src/Configuration/Configuration.csproj @@ -1,14 +1,22 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Library</OutputType> <RootNamespace>Coscine.Configuration</RootNamespace> <AssemblyName>Coscine.Configuration</AssemblyName> <TargetFrameworks>net5.0;net461</TargetFrameworks> - <Version>1.6.0</Version></PropertyGroup> + <Version>1.6.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>Configuration is a part of the Coscine group.</Description> + <PackageLicenseExpression>MIT</PackageLicenseExpression> + <PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/libraries/Configuration</PackageProjectUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> </PropertyGroup> <PropertyGroup> + <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Coscine.Configuration.Key.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> diff --git a/src/Configuration/Configuration.nuspec b/src/Configuration/Configuration.nuspec deleted file mode 100644 index 60611db69b82e686c8b730926481cacd0a509297..0000000000000000000000000000000000000000 --- a/src/Configuration/Configuration.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/configuration</projectUrl> - <requireLicenseAcceptance>true</requireLicenseAcceptance> - <description>$description$</description> - <copyright>$copyright$</copyright> - </metadata> -</package> \ No newline at end of file diff --git a/src/Configuration/Properties/AssemblyInfo.cs b/src/Configuration/Properties/AssemblyInfo.cs deleted file mode 100644 index 463c1a6a4a7476a01b89a75ff7d4362383a26118..0000000000000000000000000000000000000000 --- a/src/Configuration/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by Cake. -// </auto-generated> -//------------------------------------------------------------------------------ -using System.Reflection; - -[assembly: AssemblyDescription("Configuration is a part of the CoScInE group.")] -[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")] -