Make the project function with .Net Framework classes again

Author: glennawatson

src/coverlet.console/Program.cs

@@ -56,8 +56,10 @@ static int Main(string[] args)
                 process.StartInfo.Arguments = targs.HasValue() ? targs.Value() : string.Empty;
                 process.StartInfo.CreateNoWindow = true;
                 process.StartInfo.RedirectStandardOutput = true;
+                process.StartInfo.RedirectStandardError = true;
                 process.Start();
                 logger.LogInformation(process.StandardOutput.ReadToEnd());
+                logger.LogError(process.StandardError.ReadToEnd());
                 process.WaitForExit();
 
                 var dOutput = output.HasValue() ? output.Value() : Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar.ToString();

src/coverlet.core/Coverage.cs

@@ -275,7 +275,7 @@ private string GetSourceLinkUrl(Dictionary<string, string> sourceLinkDocuments,
                 string key = sourceLinkDocument.Key;
                 if (Path.GetFileName(key) != "*") continue;
 
-                string relativePath = Path.GetRelativePath(Path.GetDirectoryName(key), Path.GetDirectoryName(document));
+                string relativePath = GetRelativePath(Path.GetDirectoryName(key), Path.GetDirectoryName(document));
 
                 if (relativePath.Contains("..")) continue;
 
@@ -300,5 +300,18 @@ private string GetSourceLinkUrl(Dictionary<string, string> sourceLinkDocuments,
             url = sourceLinkDocuments[keyWithBestMatch];
             return url.Replace("*", replacement);
         }
+
+        // This is coming to .NET Standard 2.1 as part of Path
+        private static string GetRelativePath(string relativeTo, string path)
+        {
+            var uri = new Uri(relativeTo);
+            var relativePath = Uri.UnescapeDataString(uri.MakeRelativeUri(new Uri(path)).ToString()).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+            if (relativePath.Contains(Path.DirectorySeparatorChar.ToString()) == false)
+            {
+                relativePath = $".{ Path.DirectorySeparatorChar }{ relativePath }";
+            }
+
+            return relativePath;
+        }
     }
 }

src/coverlet.core/coverlet.core.csproj

@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyVersion>4.1.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="2.0.1" />
+    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
   </ItemGroup>
-
 </Project>