#335: Workaround for MSBuild task in .NET Core SDK 3.1.20x

danielpalme · Mar 29, 2020 · b39b75d · b39b75d
1 parent 98539ac
commit b39b75d
Show file tree

Hide file tree

Showing 21 changed files with 125 additions and 38 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,7 +11,7 @@ variables:
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
   disable.coverage.autogenerate: 'true'
-  version: '4.5.2'
+  version: '4.5.3'
 
 # Prepare
 steps:

diff --git a/docs/resources/SampleReports.zip b/docs/resources/SampleReports.zip
diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 4,
         "Minor": 5,
-        "Patch": 2
+        "Patch": 3
     },
     "instanceNameFormat": "ReportGenerator",
     "groups": [

diff --git a/src/AzureDevopsTask/vss-extension.json b/src/AzureDevopsTask/vss-extension.json
@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "reportgenerator",
     "name": "ReportGenerator",
-    "version": "4.5.2",
+    "version": "4.5.3",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [

diff --git a/src/Readme.txt b/src/Readme.txt
@@ -63,6 +63,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.5.3.0
+
+    * Fix: Issue #335: Workaround for MSBuild task in .NET Core SDK 3.1.20x
+
 4.5.2.0
 
     * Fix: Issue #331: Fixed string encoding in JsonSummary

diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.5.3.0</AssemblyVersion>
+    <FileVersion>4.5.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.5.2.0")]
-[assembly: AssemblyFileVersion("4.5.2.0")]
+[assembly: AssemblyVersion("4.5.3.0")]
+[assembly: AssemblyFileVersion("4.5.3.0")]
diff --git a/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj b/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj
@@ -91,7 +91,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Utilities.Core">
-      <Version>16.0.461</Version>
+      <Version>16.5.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ReportGenerator.Core.Test/MsBuildTest.cs b/src/ReportGenerator.Core.Test/MsBuildTest.cs
@@ -0,0 +1,15 @@
+using Xunit;
+
+namespace Palmmedia.ReportGenerator.Core.Test
+{
+    public class MsBuildTest
+    {
+
+        [Fact]
+        public void ExecuteMSBuildScript()
+        {
+
+
+        }
+    }
+}
diff --git a/src/ReportGenerator.Core.Test/MsBuildTestScript.proj b/src/ReportGenerator.Core.Test/MsBuildTestScript.proj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ReportGenerator">
+  <!-- Imported MSBuild tasks -->
+  <UsingTask TaskName="ReportGenerator" AssemblyFile="..\ReportGenerator.MSBuild\bin\$(Configuration)\ReportGenerator.MSBuild.dll" />
+
+  <Target Name="ReportGenerator">
+    <ItemGroup>
+      <CoverageFiles Include="..\Testprojects\CSharp\Reports\Opencover.xml" />
+    </ItemGroup>
+
+    <ReportGenerator ReportFiles="@(CoverageFiles)" ReportTypes="Html" TargetDirectory="bin\$(Configuration)\report" AssemblyFilters="-Moq;-xunit*" HistoryDirectory="bin\$(Comnfiguration)\history" />
+  </Target>
+</Project>
diff --git a/src/ReportGenerator.Core.Test/MsBuildTestScript_Core.proj b/src/ReportGenerator.Core.Test/MsBuildTestScript_Core.proj
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="ReportGenerator">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Imported MSBuild tasks -->
+  <ItemGroup>
+    <PackageReference Include="ReportGenerator" Version="4.5.2" />
+  </ItemGroup>
+
+  <Target Name="ReportGenerator">
+    <ItemGroup>
+      <CoverageFiles Include="..\Testprojects\CSharp\Reports\Opencover.xml" />
+    </ItemGroup>
+
+    <ReportGenerator ReportFiles="@(CoverageFiles)" ReportTypes="Html" TargetDirectory="bin\$(Configuration)\report" AssemblyFilters="-Moq;-xunit*" HistoryDirectory="bin\$(Comnfiguration)\history" />
+  </Target>
+</Project>
diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.5.3.0</AssemblyVersion>
+    <FileVersion>4.5.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,6 +26,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" />
     <ProjectReference Include="..\ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj" />
+    <ProjectReference Include="..\ReportGenerator.MSBuild\ReportGenerator.MSBuild.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs b/src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs
@@ -116,9 +116,9 @@ private IAssemblyLoader CreateAssemblyLoader()
 
                 var dotnetCorePluginLoaderAssembly = Assembly.LoadFrom(path);
                 var assemblyLoaderType = dotnetCorePluginLoaderAssembly.GetExportedTypes()
-                        .Where(t => typeof(IAssemblyLoader).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract)
+                        .Where(t => t.FullName == "ReportGenerator.DotnetCorePluginLoader.DotNetCoreAssemblyLoader" && t.IsClass && !t.IsAbstract)
                         .Single();
-                return (IAssemblyLoader)Activator.CreateInstance(assemblyLoaderType);
+                return new ReflectionWrapperAssemblyLoader(Activator.CreateInstance(assemblyLoaderType));
             }
 
             return new DefaultAssemblyLoader();

diff --git a/src/ReportGenerator.Core/Plugin/ReflectionWrapperAssemblyLoader.cs b/src/ReportGenerator.Core/Plugin/ReflectionWrapperAssemblyLoader.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Reflection;
+
+namespace Palmmedia.ReportGenerator.Core.Plugin
+{
+    /// <summary>
+    /// This wrapper was introduced as a workaround in .NET Core SDK 3.1.20x.
+    /// Casting types from external DLLs fails within MSBuild.
+    /// See:
+    /// https://github.com/danielpalme/ReportGenerator/issues/335.
+    /// https://github.com/dotnet/sdk/issues/11043.
+    /// </summary>
+    public class ReflectionWrapperAssemblyLoader : IAssemblyLoader
+    {
+        /// <summary>
+        /// The <see cref="IAssemblyLoader"/> to wrap.
+        /// </summary>
+        private readonly object assemblyLoader;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReflectionWrapperAssemblyLoader" /> class.
+        /// </summary>
+        /// <param name="assemblyLoader">The <see cref="IAssemblyLoader"/> to wrap.</param>
+        public ReflectionWrapperAssemblyLoader(object assemblyLoader)
+        {
+            if (assemblyLoader == null)
+            {
+                throw new ArgumentNullException(nameof(assemblyLoader));
+            }
+
+            this.assemblyLoader = assemblyLoader;
+        }
+
+        /// <summary>
+        /// Loads the assembly with the given name.
+        /// </summary>
+        /// <param name="name">The name of the assembly.</param>
+        /// <returns>The assembly.</returns>
+        public Assembly Load(string name)
+        {
+            var assembly = this.assemblyLoader.GetType()
+                .GetMethod(nameof(this.Load))
+                .Invoke(this.assemblyLoader, new[] { name });
+
+            return (Assembly)assembly;
+        }
+    }
+}
diff --git a/src/ReportGenerator.Core/ReportGenerator.Core.csproj b/src/ReportGenerator.Core/ReportGenerator.Core.csproj
@@ -7,8 +7,8 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AssemblyName>ReportGenerator.Core</AssemblyName>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.5.3.0</AssemblyVersion>
+    <FileVersion>4.5.3.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>dotnet-reportgenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.DotnetCliTool.Program</StartupObject>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.5.3.0</AssemblyVersion>
+    <FileVersion>4.5.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.5.3.0</AssemblyVersion>
+    <FileVersion>4.5.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.5.3.0</AssemblyVersion>
+    <FileVersion>4.5.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
@@ -5,12 +5,12 @@
     <RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.5.3.0</AssemblyVersion>
+    <FileVersion>4.5.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.sln b/src/ReportGenerator.sln
@@ -45,10 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8775
 		Testprojects\FSharp\Reports\VisualStudio2013.coveragexml = Testprojects\FSharp\Reports\VisualStudio2013.coveragexml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_CSharp", "Testprojects\CSharp\Project\Test_CSharp.csproj", "{E035281E-8AB7-4A3E-98D2-C14DF6E9B741}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Test_FSharp", "Testprojects\FSharp\Project\Test_FSharp.fsproj", "{953D4A9C-5271-4A6D-876A-7E41B93BEE77}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java", "Java", "{89813866-CE17-47E5-BCA3-4740F8624BA5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA}"
@@ -149,14 +145,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Release|Any CPU.Build.0 = Release|Any CPU
-		{953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -196,8 +184,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{792589C7-7E2C-4C31-9FB3-A64F85BDF826} = {B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6}
 		{8775E975-19C9-4F40-869B-04A8488AECC3} = {9223804A-D678-4EE8-BD89-19A6114DB86F}
-		{E035281E-8AB7-4A3E-98D2-C14DF6E9B741} = {B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6}
-		{953D4A9C-5271-4A6D-876A-7E41B93BEE77} = {9223804A-D678-4EE8-BD89-19A6114DB86F}
 		{F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA} = {89813866-CE17-47E5-BCA3-4740F8624BA5}
 		{654FDEDF-31DE-47E4-A02E-F42DB1ACC722} = {89813866-CE17-47E5-BCA3-4740F8624BA5}
 		{1749EF69-D43F-4874-8290-8134B80D65E5} = {F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA}

diff --git a/src/build.proj b/src/build.proj
@@ -22,7 +22,7 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>4.5.2</Version>
+    <Version>4.5.3</Version>
   </PropertyGroup>
 
   <!-- Tools -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,10 @@ For further details take a look at LICENSE.txt. @@
     CHANGELOG
+.5.3.0
+        * Fix: Issue #335: Workaround for MSBuild task in .NET Core SDK 3.1.20x
 .5.2.0
         * Fix: Issue #331: Fixed string encoding in JsonSummary
@@ Expand Down @@