Add support for .NET 5.0 (#151)

Author: maca88

Common.props

@@ -11,10 +11,10 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
-    <LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;netcoreapp2.1</LibTargetFrameworks>
-    <AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;netcoreapp2.1;netcoreapp3.1</AppTargetFrameworks>
+    <LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;netcoreapp2.1;net5.0</LibTargetFrameworks>
+    <AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;netcoreapp2.1;netcoreapp3.1;net5.0</AppTargetFrameworks>
     <TestTargetFramework Condition ="$(TestTargetFramework) == ''">netcoreapp3.1</TestTargetFramework>
-    <ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">netcoreapp2.1;netcoreapp3.1</ToolTargetFrameworks>
+    <ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">netcoreapp2.1;netcoreapp3.1;net5.0</ToolTargetFrameworks>
     <MicrosoftCodeAnalysisVersion Condition ="$(TargetFramework) == 'netcoreapp2.1'">3.0.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisVersion Condition ="$(TargetFramework) != 'netcoreapp2.1'">3.7.0</MicrosoftCodeAnalysisVersion>
     <DefineConstants Condition ="$(MicrosoftCodeAnalysisVersion) == '3.0.0'">LEGACY</DefineConstants>

Source/AsyncGenerator.Tool/AsyncGenerator.Tool.csproj

@@ -32,6 +32,8 @@
     <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
   </ItemGroup>
 
   <ItemGroup>

Source/AsyncGenerator/Configuration/AsyncCodeConfiguration.cs

@@ -6,6 +6,7 @@
 using AsyncGenerator.Configuration.Internal;
 using AsyncGenerator.Core.Configuration;
 using AsyncGenerator.Core.Logging;
+using AsyncGenerator.Extensions.Internal;
 using AsyncGenerator.Internal;
 
 namespace AsyncGenerator.Configuration
@@ -144,11 +145,7 @@ internal AsyncCodeConfiguration ConfigureFromStream(Stream stream, IFileConfigur
 
 		private static string GetExecutingDirectory()
 		{
-			var codeBase = Assembly.GetExecutingAssembly().CodeBase;
-			var uri = new UriBuilder(codeBase);
-			var assemblyPath = Uri.UnescapeDataString(uri.Path);
-			var dir = Path.GetDirectoryName(assemblyPath);
-			return dir;
+			return Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetPath());
 		}
 	}
 }

Source/AsyncGenerator/Extensions/Internal/AssemblyExtensions.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AsyncGenerator.Extensions.Internal
+{
+	internal static class AssemblyExtensions
+	{
+		public static string GetPath(this Assembly assembly)
+		{
+#if LEGACY
+			var path = assembly.CodeBase;
+#else
+			var path = assembly.Location;
+#endif
+			if (!Uri.TryCreate(path, UriKind.Absolute, out var uri))
+			{
+				throw new InvalidOperationException($"Invalid assembly location: '{assembly.Location}'");
+			}
+
+			return Uri.UnescapeDataString(uri.AbsolutePath);
+		}
+	}
+}

Source/AsyncGenerator/Internal/SourceCodeCompiler.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using AsyncGenerator.Extensions.Internal;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Scripting;
 using Microsoft.CodeAnalysis.Scripting;
@@ -15,12 +16,10 @@ internal class SourceCodeCompiler
 	{
 		public static Assembly Compile(string sourceCode)
 		{
-			var codeBase = Assembly.GetExecutingAssembly().CodeBase;
-			var uri = new UriBuilder(codeBase);
-			var assemblyPath = Uri.UnescapeDataString(uri.Path);
+			var assembly = Assembly.GetExecutingAssembly();
+			var assemblyPath = assembly.GetPath();
 			var assemblyDir = Path.GetDirectoryName(assemblyPath);
-
-			var assemRefs = Assembly.GetExecutingAssembly().GetReferencedAssemblies();
+			var assemRefs = assembly.GetReferencedAssemblies();
 			var references = assemRefs.Select(assemblyName => assemblyName.Name + ".dll").ToList();
 			for (var i = 0; i < references.Count; i++)
 			{

build.cake

@@ -1,4 +1,4 @@
-#tool nuget:?package=NUnit.ConsoleRunner&version=3.10.0
+#tool nuget:?package=NUnit.ConsoleRunner&version=3.11.1
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
 //////////////////////////////////////////////////////////////////////
@@ -86,7 +86,8 @@ Task("SetupTestFrameworkCore")
 @"{{
   ""sdk"": {{
     ""version"": ""{0}"",
-    ""rollForward"": ""latestFeature""
+    ""rollForward"": ""latestFeature"",
+    ""allowPrerelease"": ""true""
   }}
 }}", netcoreVersion);
         System.IO.File.WriteAllText("global.json", content);
@@ -205,7 +206,7 @@ Task("CleanPackages")
 
 Task("Pack")
     .IsDependentOn("ClearTestFramework")
-    .IsDependentOn("Build") // We have to build in order to include dlls for the AsyncGenerator.CommandLine project
+    .IsDependentOn("BuildCore") // We have to build in order to include dlls for the AsyncGenerator.CommandLine project
     .IsDependentOn("CleanPackages")
     .Description("Creates NuGet packages")
     .Does(() =>