Merge pull request #11 from sharwell/package-folders

Use all NuGet package folders to support fallback locations
tunnelvisionlabs · Sep 4, 2019 · c6ca2b0 · c6ca2b0
2 parents 7993c44 + a1ad983
commit c6ca2b0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...VisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.targets b/...VisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.targets
@@ -76,8 +76,13 @@
   <Target Name="RestoreTargetFrameworkDirectory"
           Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"
           BeforeTargets="ResolveAvailableReferenceAssemblies">
+    <ItemGroup>
+      <_NuGetPackageFoldersItems Include="$(NuGetPackageFolders)" />
+      <_NetStandardNuGetPackageFolders Include="$([MSBuild]::NormalizeDirectory('%(_NuGetPackageFoldersItems.Identity)', 'netstandard.library', '$(NETStandardLibraryPackageVersion)', 'build', 'netstandard2.0', 'ref'))" />
+    </ItemGroup>
+
     <PropertyGroup>
-      <TargetFrameworkDirectory>$(NuGetPackageRoot)netstandard.library\$(NETStandardLibraryPackageVersion)\build\netstandard2.0\ref\</TargetFrameworkDirectory>
+      <TargetFrameworkDirectory>@(_NetStandardNuGetPackageFolders)</TargetFrameworkDirectory>
     </PropertyGroup>
   </Target>
 
@@ -118,10 +123,6 @@
       <Reference Include="@(UnannotatedReferenceAssembly->'%(OutputAssembly)')"
                  Condition="'%(UnannotatedReferenceAssembly.IsNetStandard)' == 'True' AND Exists('%(UnannotatedReferenceAssembly.OutputAssembly)')" />
     </ItemGroup>
-
-    <PropertyGroup>
-      <TargetFrameworkDirectory>$(NuGetPackageRoot)netstandard.library\$(NETStandardLibraryPackageVersion)\build\netstandard2.0\ref\</TargetFrameworkDirectory>
-    </PropertyGroup>
   </Target>
 
 </Project>