Merge pull request #62 from jnm2/fix_ref_package_path

Fix missing annotations when using Microsoft.NETCore.App.Ref 3.1.0
tunnelvisionlabs · Dec 31, 2019 · 496869e · 496869e
2 parents 819b787 + 11eddda
commit 496869e
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 6 deletions.
diff --git a/...elVisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.props b/...elVisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.props
@@ -9,6 +9,7 @@
 
   <PropertyGroup>
     <AnnotateReferenceAssembliesDependsOn>
+      ResolveAnnotatedReferenceAssemblies;
       ResolveAvailableReferenceAssemblies;
       ResolveOutputReferenceAssemblies
     </AnnotateReferenceAssembliesDependsOn>

diff --git a/...VisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.targets b/...VisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.targets
@@ -42,13 +42,21 @@
     <AddStandardAssembliesForAnnotationDependsOn>ResolveTargetingPackAssets</AddStandardAssembliesForAnnotationDependsOn>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <AnnotatedReferenceAssemblyDirectory Condition="'$(AnnotatedReferenceAssemblyDirectory)' == ''">$(NuGetPackageRoot)\microsoft.netcore.app.ref\$(AnnotatedReferenceAssemblyVersion)\ref\netcoreapp3.0\</AnnotatedReferenceAssemblyDirectory>
-  </PropertyGroup>
+  <Target Name="ResolveAnnotatedReferenceAssemblies">
+    <ItemGroup Condition="'$(AnnotatedReferenceAssemblyDirectory)' == ''">
+      <_AnnotatedReferenceAssemblyDirectoryContents Include="$(NuGetPackageRoot)\microsoft.netcore.app.ref\$(AnnotatedReferenceAssemblyVersion)\ref\*\*.dll" />
+      <_AnnotatedReferenceAssemblyDirectoryItem Include="@(_AnnotatedReferenceAssemblyDirectoryContents->'%(RelativeDir)')" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <AnnotatedReferenceAssembly Include="$(AnnotatedReferenceAssemblyDirectory)*.dll" />
-  </ItemGroup>
+    <PropertyGroup Condition="'$(AnnotatedReferenceAssemblyDirectory)' == ''">
+      <!-- Take last item -->
+      <AnnotatedReferenceAssemblyDirectory>%(_AnnotatedReferenceAssemblyDirectoryItem.Identity)</AnnotatedReferenceAssemblyDirectory>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <AnnotatedReferenceAssembly Include="$(AnnotatedReferenceAssemblyDirectory)*.dll" />
+    </ItemGroup>
+  </Target>
 
   <Target Name="ResolveAvailableReferenceAssemblies"
           DependsOnTargets="GetReferenceAssemblyPaths">

diff --git a/appveyor.yml b/appveyor.yml
@@ -15,6 +15,8 @@ test_script:
 - git clean -dxf tests
 - msbuild /restore tests/MultiTFM /warnaserror /v:m
 - git clean -dxf tests
+- msbuild /restore tests/RefVersion3.1.0 /warnaserror /v:m
+- git clean -dxf tests
 - msbuild /restore tests/SingleTFM /p:TestFramework=net35 /warnaserror /v:m
 - git clean -dxf tests
 - msbuild /restore tests/SingleTFM /p:TestFramework=net48 /warnaserror /v:m
@@ -41,6 +43,9 @@ test_script:
 - dotnet msbuild -restore tests/MultiTFM -warnaserror -v:m
 - taskkill /im dotnet.exe /f
 - git clean -dxf tests
+- dotnet msbuild -restore tests/RefVersion3.1.0 -warnaserror -v:m
+- taskkill /im dotnet.exe /f
+- git clean -dxf tests
 - dotnet msbuild -restore tests/SingleTFM -p:TestFramework=net35 -warnaserror -v:m
 - taskkill /im dotnet.exe /f
 - git clean -dxf tests

diff --git a/tests/RefVersion3.1.0/Class1.cs b/tests/RefVersion3.1.0/Class1.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Sample1
+{
+    public class Class1
+    {
+        public static void M(SqlConnection connection, [AllowNull] string? x)
+        {
+            if (!string.IsNullOrEmpty(x))
+            {
+                x.ToString();
+            }
+
+            _ = EqualityComparer<string?>.Default.GetHashCode(x);
+        }
+    }
+}
diff --git a/tests/RefVersion3.1.0/RefVersion3.1.0.csproj b/tests/RefVersion3.1.0/RefVersion3.1.0.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net35;net48;netstandard1.6;netstandard2.0;netstandard2.1;netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <LangVersion>8</LangVersion>
+    <Nullable>enable</Nullable>
+    <AnnotatedReferenceAssemblyVersion>3.1.0</AnnotatedReferenceAssemblyVersion>
+    <NoWarn>RA1000</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- NuGet cannot restore packages for netcoreapp1.0: https://github.com/NuGet/Home/issues/7414 -->
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0' OR '$(TargetFramework)' == 'netcoreapp1.1'">
+    <!-- CS1701: Assuming assembly reference "Assembly Name #1" matches "Assembly Name #2", you may need to supply runtime policy -->
+    <NoWarn>$(NoWarn),CS1701</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- https://github.com/dotnet/core-sdk/issues/2022 -->
+    <PackageReference Condition="'$(TargetFramework)' == 'net35'" Include="jnm2.ReferenceAssemblies.net35" Version="1.0.0" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Condition="'$(TargetFramework)' != 'net35'" Include="System.Data.SqlClient" Version="4.8.0" />
+    <PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.*" PrivateAssets="all" />
+    <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(AnnotatedReferenceAssemblyVersion)]" />
+  </ItemGroup>
+
+</Project>