Skip to content

Commit

Permalink
Remove workaround for dotnet/core-setup#4978
Browse files Browse the repository at this point in the history
  • Loading branch information
dsplaisted committed Feb 8, 2019
1 parent 78b2448 commit 04c155f
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -362,18 +362,17 @@ private IEnumerable<RuntimeLibrary> GetRuntimePackLibraries(IEnumerable<RuntimeP
return runtimePackAssets.GroupBy(asset => asset.PackageName + "/" + asset.PackageVersion).Select(
runtimePackAssetGroup =>
{
// Prefix paths with "./" to workaround https://github.com/dotnet/core-setup/issues/4978
List<RuntimeAssetGroup> runtimeAssemblyGroups = new List<RuntimeAssetGroup>()
{
new RuntimeAssetGroup(string.Empty,
runtimePackAssetGroup.Where(asset => asset.AssetType == AssetType.Runtime)
.Select(asset => CreateRuntimeFile("./" + asset.DestinationSubPath, asset.SourcePath)))
.Select(asset => CreateRuntimeFile(asset.DestinationSubPath, asset.SourcePath)))
};
List<RuntimeAssetGroup> nativeLibraryGroups = new List<RuntimeAssetGroup>()
{
new RuntimeAssetGroup(string.Empty,
runtimePackAssetGroup.Where(asset => asset.AssetType == AssetType.Native)
.Select(asset => CreateRuntimeFile($"./" + asset.DestinationSubPath, asset.SourcePath)))
.Select(asset => CreateRuntimeFile(asset.DestinationSubPath, asset.SourcePath)))
};

return new RuntimeLibrary("runtimepack",
Expand Down

0 comments on commit 04c155f

Please sign in to comment.