Fix missing annotations when using Microsoft.NETCore.App.Ref 3.1.0

tunnelvisionlabs · Dec 31, 2019 · a4730b0 · a4730b0
1 parent 0292191
commit a4730b0
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...VisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.targets b/...VisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.targets
@@ -23,9 +23,17 @@
     </ResolveAssemblyReferencesDependsOn>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <AnnotatedReferenceAssemblyDirectory Condition="'$(AnnotatedReferenceAssemblyDirectory)' == ''">$(NuGetPackageRoot)\microsoft.netcore.app.ref\$(AnnotatedReferenceAssemblyVersion)\ref\netcoreapp3.0\</AnnotatedReferenceAssemblyDirectory>
-  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(AnnotatedReferenceAssemblyDirectory)' == ''">
+      <ItemGroup>
+        <_AnnotatedReferenceAssemblyDirectoryItem Include="$(NuGetPackageRoot)\microsoft.netcore.app.ref\$(AnnotatedReferenceAssemblyVersion)\ref\*\"</AnnotatedReferenceAssemblyDirectory>
+      </ItemGroup>
+      <PropertyGroup>
+        <!-- Get only the last item -->
+        <AnnotatedReferenceAssemblyDirectory>%(_AnnotatedReferenceAssemblyDirectoryItem.Identity)</AnnotatedReferenceAssemblyDirectory>
+      </PropertyGroup>
+    </When>
+  </Choose>
 
   <ItemGroup>
     <AnnotatedReferenceAssembly Include="$(AnnotatedReferenceAssemblyDirectory)*.dll" />