diff --git a/eng/tools/RepoTasks/CreateFrameworkListFile.cs b/eng/tools/RepoTasks/CreateFrameworkListFile.cs index b0ab8c690a..19fb2bb18e 100644 --- a/eng/tools/RepoTasks/CreateFrameworkListFile.cs +++ b/eng/tools/RepoTasks/CreateFrameworkListFile.cs @@ -23,6 +23,10 @@ namespace RepoTasks [Required] public string TargetFile { get; set; } + public string ManagedRoot { get; set; } = ""; + + public string NativeRoot { get; set; } = ""; + /// /// Extra attributes to place on the root node. /// @@ -46,7 +50,6 @@ namespace RepoTasks { Item = item, Filename = Path.GetFileName(item.ItemSpec), - TargetPath = item.GetMetadata("TargetPath"), AssemblyName = FileUtilities.GetAssemblyName(item.ItemSpec), FileVersion = FileUtilities.GetFileVersion(item.ItemSpec), IsNative = item.GetMetadata("IsNativeImage") == "true", @@ -55,15 +58,14 @@ namespace RepoTasks .Where(f => !f.IsSymbolFile && (f.Filename.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) || f.IsNative)) - .OrderBy(f => f.TargetPath, StringComparer.Ordinal) - .ThenBy(f => f.Filename, StringComparer.Ordinal)) + .OrderBy(f => f.Filename, StringComparer.Ordinal)) { var element = new XElement( "File", new XAttribute("Type", f.IsNative ? "Native" : "Managed"), new XAttribute( "Path", - Path.Combine(f.TargetPath, f.Filename).Replace('\\', '/'))); + Path.Combine(f.IsNative ? NativeRoot : ManagedRoot, f.Filename).Replace('\\', '/'))); if (f.AssemblyName != null) { diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 034b037393..7bc95d9fe5 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -25,6 +25,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant runtimes/$(RuntimeIdentifier)/lib/ + + $(BuildOutputTargetFolder)$(DefaultNetCoreTargetFramework) runtimes/$(RuntimeIdentifier)/native/ @@ -457,6 +459,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant