这是indexloc提供的服务，不要输入任何密码
Skip to content

Improve path discovery for Kernel extensions #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2019
Merged

Improve path discovery for Kernel extensions #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e541f4b
Use package references instead of resolved compile file defintions
akshita31 Sep 16, 2019
33244af
Add a test
akshita31 Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions WorkspaceServer.Tests/PackageRestoreContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,15 @@ public async Task Can_get_path_to_nuget_package_when_multiple_packages_are_added
path.FullName.Should().EndWith("htmlagilitypack" + Path.DirectorySeparatorChar + "1.11.12");
path.Exists.Should().BeTrue();
}

[Fact]
public async Task Can_get_path_to_nuget_package_which_doesnt_have_lib_folder()
{
var packageRestoreContext = new PackageRestoreContext();
await packageRestoreContext.AddPackage("roslyn.analyzers", "1.0.3.4");
var path = await packageRestoreContext.GetDirectoryForPackage("roslyn.analyzers");
path.FullName.Should().EndWith("roslyn.analyzers" + Path.DirectorySeparatorChar + "1.0.3.4");
path.Exists.Should().BeTrue();
}
}
}
8 changes: 4 additions & 4 deletions WorkspaceServer/Packaging/PackageRestoreContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,20 @@ private void AddDirectoryProps(Package package)
@" <Target Name='ComputePackageRoots' BeforeTargets='CoreCompile;PrintNuGetPackagesPaths' DependsOnTargets='CollectPackageReferences'>
<ItemGroup>
<!-- Read the package path from the Pkg{PackageName} properties that are present in the nuget.g.props file -->
<AddedNuGetPackage Include='@(ResolvedCompileFileDefinitions)'>
<PackageRootProperty>Pkg$([System.String]::Copy('%(ResolvedCompileFileDefinitions.NugetPackageId)').Replace('.','_'))</PackageRootProperty>
<AddedNuGetPackage Include='@(PackageReference)'>
<PackageRootProperty>Pkg$([System.String]::Copy('%(PackageReference.Identity)').Replace('.','_'))</PackageRootProperty>
<PackageRoot>$(%(AddedNuGetPackage.PackageRootProperty))</PackageRoot>
</AddedNuGetPackage>
</ItemGroup>

<Message Text=""Done: Read package root : %(AddedNuGetPackage.PackageRoot) for %(AddedNuGetPackage.NuGetPackageId)"" Condition=""%(AddedNuGetPackage.PackageRoot) != ''"" Importance=""high""/>
<Message Text=""Done: Read package root : %(AddedNuGetPackage.PackageRoot) for %(AddedNuGetPackage.Identity)"" Condition=""%(AddedNuGetPackage.PackageRoot) != ''"" Importance=""high""/>
</Target>";

const string writePackageRootsToDiskTarget =
@" <Target Name='PrintNuGetPackagesPaths' DependsOnTargets='ResolvePackageAssets;ComputePackageRoots' AfterTargets='PrepareForBuild'>
<ItemGroup>
<ReferenceLines Remove='@(ReferenceLines)' />
<ReferenceLines Include='%(AddedNuGetPackage.NuGetPackageId),%(AddedNuGetPackage.PackageRoot)' Condition=""%(AddedNuGetPackage.PackageRoot) != ''""/>
<ReferenceLines Include='%(AddedNuGetPackage.Identity),%(AddedNuGetPackage.PackageRoot)' Condition=""%(AddedNuGetPackage.PackageRoot) != ''""/>
</ItemGroup>

<WriteLinesToFile Lines='@(ReferenceLines)' File='$(MSBuildProjectFullPath).nuget.paths' Overwrite='True' WriteOnlyWhenDifferent='True' />
Expand Down