FIX: project configuration fixes

jslachta · Dec 6, 2022 · f60b4ba · f60b4ba
1 parent 1b3768b
commit f60b4ba
Show file tree

Hide file tree

Showing 8 changed files with 558 additions and 26 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -32,4 +32,4 @@ jobs:
       uses: coverallsapp/[email protected]
       with:
           github-token: ${{ secrets.github_token }}
-          path-to-lcov: ${{ github.workspace }}/Coverage/lcov.info
+          path-to-lcov: ${{ github.workspace }}/out/coverage/lcov.info
diff --git a/src/CodeAnalysis.ruleset b/src/CodeAnalysis.ruleset
diff --git a/src/Configuration.targets b/src/Configuration.targets
@@ -1,26 +1,13 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<Import Project="Version.targets" />
-
-	<!-- Common -->
 	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<Platforms>AnyCPU</Platforms>
 		<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))</RepoRoot>
-		<!--<CodeAnalysisRuleSet>$(RepoRoot)\Configuration\CodeAnalysis.ruleset</CodeAnalysisRuleSet>-->
-	</PropertyGroup>
-
-	<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
-		<DebugSymbols>true</DebugSymbols>
-		<DebugType>full</DebugType>
-		<Optimize>false</Optimize>
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
+		<CodeAnalysisRuleSet>$(RepoRoot)\src\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+		<IsPackable Condition="'$(PackageId)' != ''">true</IsPackable>
+		<IsPackable Condition="'$(PackageId)' == ''">false</IsPackable>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="$(Configuration.Contains('Release'))">
-		<DebugType>pdbonly</DebugType>
-		<Optimize>true</Optimize>
-		<DefineConstants>TRACE</DefineConstants>
-	</PropertyGroup>
+	<Import Project="Version.targets" />
 
 </Project>
diff --git a/src/LocaleNames.Test/LocaleNames.Test.csproj b/src/LocaleNames.Test/LocaleNames.Test.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\Configuration.targets" />
 	<PropertyGroup>
 		<TargetFramework>net70</TargetFramework>
-		<IsPackable>false</IsPackable>
 		<CollectCoverage>true</CollectCoverage>
 		<ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
 		<CoverletOutputFormat>lcov</CoverletOutputFormat>
-		<CoverletOutput>$(RepoRoot)\Coverage\lcov.info</CoverletOutput>
+		<CoverletOutput>$(RepoRoot)\out\coverage\lcov.info</CoverletOutput>
 	</PropertyGroup>
+	<Import Project="..\Configuration.targets" />
 	<ItemGroup>
 		<ProjectReference Include="..\LocaleNames\LocaleNames.csproj" />
 	</ItemGroup>

diff --git a/src/LocaleNames.sln b/src/LocaleNames.sln
@@ -11,6 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrepareLocaleData", "Prepar
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CE53DF98-DC29-4708-9737-2D6F42A76CD7}"
 	ProjectSection(SolutionItems) = preProject
+		CodeAnalysis.ruleset = CodeAnalysis.ruleset
 		Configuration.targets = Configuration.targets
 		..\LICENSE = ..\LICENSE
 		..\README.md = ..\README.md

diff --git a/src/LocaleNames/LocaleNames.csproj b/src/LocaleNames/LocaleNames.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\Configuration.targets" />
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net60;net70</TargetFrameworks>
 		<Authors>Jiri Slachta</Authors>
 		<Copyright>Copyright © Jiri Slachta</Copyright>
 		<PackageTags>locale, translations</PackageTags>
 
+		<PackageId>LocaleNames</PackageId>
+
+		<PackageReleaseNotes>Check: https://github.com/jslachta/LocaleNames/releases </PackageReleaseNotes>
 		<PackageProjectUrl>https://github.com/jslachta/LocaleNames</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/jslachta/LocaleNames</RepositoryUrl>
 
@@ -14,7 +16,6 @@
 
 		<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
 		<Description>The LocaleNames library provides language and country names translation to almost any language.</Description>
-		<PackageReleaseNotes>Check: https://github.com/jslachta/LocaleNames/releases </PackageReleaseNotes>
 
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
@@ -27,6 +28,7 @@
 
 		<LangVersion>10.0</LangVersion>
 	</PropertyGroup>
+	<Import Project="..\Configuration.targets" />
 
 	<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))">
 		<PackageReference Include="System.Text.Json" Version="[4.6.0,)" />

diff --git a/src/PrepareLocaleData/PrepareLocaleData.csproj b/src/PrepareLocaleData/PrepareLocaleData.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<IsPackable>false</IsPackable>
 		<TargetFramework>net7.0</TargetFramework>
 		<StartupObject>PrepareLocaleData.Program</StartupObject>
 	</PropertyGroup>

diff --git a/src/Version.targets b/src/Version.targets
@@ -13,8 +13,8 @@
 
 	<PropertyGroup>
 		<GitTagRegex Condition="'$(GitTagRegex)' == ''">v*</GitTagRegex>
-		<GitInfoReportImportance>low</GitInfoReportImportance>
-		<PackageOutputPath>$(RepoRoot)\NuGet</PackageOutputPath>
+		<GitInfoReportImportance>high</GitInfoReportImportance>
+		<PackageOutputPath>$(RepoRoot)\out\NuGet</PackageOutputPath>
 	</PropertyGroup>
 
 	<PropertyGroup>