starred/dotnet-packaging
1
0
Fork 0
mirror of https://github.com/quamotion/dotnet-packaging.git synced 2026-07-08 18:06:08 +00:00
Code Issues 207 Packages Projects Releases Wiki Activity

Work around a bug in .NET SDK 3.1

Browse Source
This commit is contained in:
Frederik Carlier
2020-06-11 23:03:13 +02:00
parent 9e4041d64a
commit 361bcdb1c2
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dotnet-rpm/PackagingRunner.cs
View File

@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.Loader;
using System.Text;
using ConsoleLogger = Microsoft.Build.Logging.ConsoleLogger;
using IMSBuildLogger = Microsoft.Build.Framework.ILogger;
@@ -22,7 +23,19 @@ namespace Dotnet.Packaging
public PackagingRunner(string outputName, string msbuildTarget, string commandName)
{
MSBuildLocator.RegisterDefaults();
var instance = MSBuildLocator.RegisterDefaults();
// Workaround for https://github.com/microsoft/MSBuildLocator/issues/86
AssemblyLoadContext.Default.Resolving += (assemblyLoadContext, assemblyName) =>
{
var path = Path.Combine(instance.MSBuildPath, assemblyName.Name + ".dll");
if (File.Exists(path))
{
return assemblyLoadContext.LoadFromAssemblyPath(path);
}
return null;
};
this.outputName = outputName;
this.msbuildTarget = msbuildTarget;