diff --git a/.gitignore b/.gitignore index abdd08fca..11ddd6d32 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ -[Bb]uild/ msbuild.binlog # Visual Studio 2015 cache/options directory @@ -297,4 +296,4 @@ __pycache__/ .vscode # OSX -.DS_Store \ No newline at end of file +.DS_Store diff --git a/Directory.Build.props b/Directory.Build.props index 7a0f467c8..84cb4ce8d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ + $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\$(Configuration)\ diff --git a/build.proj b/build.proj index e7263cb1d..0f53a70f1 100644 --- a/build.proj +++ b/build.proj @@ -13,19 +13,7 @@ - - - - - - - - - - - - - + diff --git a/eng/nightly.ps1 b/eng/nightly.ps1 index 4fb55680f..6b225bc6d 100644 --- a/eng/nightly.ps1 +++ b/eng/nightly.ps1 @@ -13,7 +13,7 @@ Write-Host -ForegroundColor Blue Publish with .NET CLI & dotnet --info Write-Host -ForegroundColor Green Create Packages -& dotnet msbuild "$PSScriptRoot\..\build.proj" /t:CreateNuGetPackage /p:Configuration=Release /p:PublicRelease=false # amend build.proj path if changes +& dotnet msbuild "$PSScriptRoot\..\build.proj" /t:BuildAllProjects /p:Configuration=Release /p:PublicRelease=false # amend build.proj path if changes Write-Host -ForegroundColor Green Upload Packages & dotnet nuget push "$PSScriptRoot\..\build\Release\*.nupkg" -k $apiKey -s $source \ No newline at end of file diff --git a/src/coverlet.collector/coverlet.collector.targets b/src/coverlet.collector/build/netstandard1.0/coverlet.collector.targets similarity index 100% rename from src/coverlet.collector/coverlet.collector.targets rename to src/coverlet.collector/build/netstandard1.0/coverlet.collector.targets diff --git a/src/coverlet.collector/coverlet.collector.csproj b/src/coverlet.collector/coverlet.collector.csproj index 10d0af852..56ce00661 100644 --- a/src/coverlet.collector/coverlet.collector.csproj +++ b/src/coverlet.collector/coverlet.collector.csproj @@ -15,7 +15,9 @@ git https://github.com/tonerdo/coverlet true - coverlet.collector.nuspec + false + true + $(TargetsForTfmSpecificContentInPackage);PackBuildOutputs @@ -23,7 +25,7 @@ - + @@ -61,12 +63,11 @@ - - - - $(NuspecProperties);version=$(NuGetPackageVersion);configuration=$(Configuration) - - - + + + + + + diff --git a/src/coverlet.collector/coverlet.collector.nuspec b/src/coverlet.collector/coverlet.collector.nuspec deleted file mode 100644 index d8eb853c7..000000000 --- a/src/coverlet.collector/coverlet.collector.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - coverlet.collector - $version$ - coverlet.collector - tonerdo - tonerdo - false - MIT - https://raw.githubusercontent.com/tonerdo/coverlet/master/_assets/coverlet-icon.svg?sanitize=true - Coverlet is a cross platform code coverage library for .NET, with support for line, branch and method coverage. - http://github.com/tonerdo/coverlet - coverage testing unit-test lcov opencover quality - - - - - - - \ No newline at end of file diff --git a/src/coverlet.collector/version.json b/src/coverlet.collector/version.json index ef37068b0..82be6c7a9 100644 --- a/src/coverlet.collector/version.json +++ b/src/coverlet.collector/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0.0", + "version": "1.0.0-preview.{height}", "publicReleaseRefSpec": [ "^refs/heads/master$" ] diff --git a/src/coverlet.console/version.json b/src/coverlet.console/version.json index 1f5147a14..c73d8639a 100644 --- a/src/coverlet.console/version.json +++ b/src/coverlet.console/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.5.1", + "version": "1.5.1-preview.{height}", "publicReleaseRefSpec": [ "^refs/heads/master$" ] diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs index 663550e18..562cbb882 100644 --- a/src/coverlet.core/Coverage.cs +++ b/src/coverlet.core/Coverage.cs @@ -339,10 +339,18 @@ private string GetSourceLinkUrl(Dictionary sourceLinkDocuments, string key = sourceLinkDocument.Key; if (Path.GetFileName(key) != "*") continue; - if (!Path.GetDirectoryName(document).StartsWith(Path.GetDirectoryName(key) + Path.DirectorySeparatorChar)) - continue; + string directoryDocument = Path.GetDirectoryName(document); + string sourceLinkRoot = Path.GetDirectoryName(key); + string relativePath = ""; + + // if document is on repo root we skip relative path calculation + if (directoryDocument != sourceLinkRoot) + { + if (!directoryDocument.StartsWith(sourceLinkRoot + Path.DirectorySeparatorChar)) + continue; - var relativePath = Path.GetDirectoryName(document).Substring(Path.GetDirectoryName(key).Length + 1); + relativePath = directoryDocument.Substring(sourceLinkRoot.Length + 1); + } if (relativePathOfBestMatch.Length == 0) { diff --git a/src/coverlet.msbuild.tasks/coverlet.msbuild.props b/src/coverlet.msbuild.tasks/coverlet.msbuild.props index c9d21109b..e6906ccc3 100644 --- a/src/coverlet.msbuild.tasks/coverlet.msbuild.props +++ b/src/coverlet.msbuild.tasks/coverlet.msbuild.props @@ -16,4 +16,7 @@ line,branch,method minimum + + $(MSBuildThisFileDirectory) + diff --git a/src/coverlet.msbuild.tasks/coverlet.msbuild.targets b/src/coverlet.msbuild.tasks/coverlet.msbuild.targets index effbc421c..c6cbb404d 100644 --- a/src/coverlet.msbuild.tasks/coverlet.msbuild.targets +++ b/src/coverlet.msbuild.tasks/coverlet.msbuild.targets @@ -1,7 +1,7 @@ - - + + + + + + + + + false + + + + + $(RepoRoot)src\coverlet.msbuild.tasks\bin\$(Configuration)\netstandard2.0\ + + + + \ No newline at end of file diff --git a/test/coverlet.collector.tests/coverlet.collector.tests.csproj b/test/coverlet.collector.tests/coverlet.collector.tests.csproj index dce1752be..9831caf3c 100644 --- a/test/coverlet.collector.tests/coverlet.collector.tests.csproj +++ b/test/coverlet.collector.tests/coverlet.collector.tests.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj b/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj index 9e471b9bf..dd65bf3a7 100644 --- a/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj +++ b/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj @@ -1,5 +1,5 @@  - + netcoreapp2.0 @@ -15,5 +15,5 @@ - + diff --git a/test/coverlet.core.tests/coverlet.core.tests.csproj b/test/coverlet.core.tests/coverlet.core.tests.csproj index a44b0e7b9..56cf06cae 100644 --- a/test/coverlet.core.tests/coverlet.core.tests.csproj +++ b/test/coverlet.core.tests/coverlet.core.tests.csproj @@ -1,5 +1,5 @@  - + netcoreapp2.0 @@ -16,8 +16,8 @@ - + - +