diff --git a/WorkspaceServer.Tests/PackageRestoreContextTests.cs b/WorkspaceServer.Tests/PackageRestoreContextTests.cs
index c3b5f55e0..372d1863f 100644
--- a/WorkspaceServer.Tests/PackageRestoreContextTests.cs
+++ b/WorkspaceServer.Tests/PackageRestoreContextTests.cs
@@ -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();
+        }
     }
 }
\ No newline at end of file
diff --git a/WorkspaceServer/Packaging/PackageRestoreContext.cs b/WorkspaceServer/Packaging/PackageRestoreContext.cs
index 5f656b37d..e4716cfcb 100644
--- a/WorkspaceServer/Packaging/PackageRestoreContext.cs
+++ b/WorkspaceServer/Packaging/PackageRestoreContext.cs
@@ -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' />