Merge pull request #566 from sharwell/dependencies

Fix resolution of source generator dependencies
dotnet · Jul 16, 2020 · 02129f8 · 02129f8
2 parents 3106aeb + 02d3273
commit 02129f8
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/SourceGeneratorSamples.csproj b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/SourceGeneratorSamples.csproj
@@ -13,12 +13,19 @@
   <ItemGroup>
     <!-- Generator dependencies -->
     <PackageReference Include="CsvTextFieldParser" Version="1.2.2-preview" GeneratePathProperty="true" PrivateAssets="all" />
-    <None Include="$(PKGCsvTextFieldParser)\lib\netstandard2.0\*.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" />
-
     <PackageReference Include="Handlebars.Net" Version="1.10.1" GeneratePathProperty="true" PrivateAssets="all" />
-    <None Include="$(PKGHandlebars_Net)\lib\netstandard2.0\*.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" />
-
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" GeneratePathProperty="true" PrivateAssets="all" />
-    <None Include="$(PKGNewtonsoft_Json)\lib\netstandard2.0\*.dll"  CopyToOutputDirectory="PreserveNewest" Visible="false" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
+  </PropertyGroup>
+
+  <Target Name="GetDependencyTargetPaths">
+    <ItemGroup>
+      <TargetPathWithTargetPlatformMoniker Include="$(PKGCsvTextFieldParser)\lib\netstandard2.0\CsvTextFieldParser.dll" />
+      <TargetPathWithTargetPlatformMoniker Include="$(PKGHandlebars_Net)\lib\netstandard2.0\Handlebars.dll" />
+      <TargetPathWithTargetPlatformMoniker Include="$(PKGNewtonsoft_Json)\lib\netstandard2.0\Newtonsoft.Json.dll" />
+    </ItemGroup>
+  </Target>
 </Project>