CustomBeforeCentralPackageVersions.ta

dgmjr-io · Oct 5, 2023 · 30c7541 · 30c7541
1 parent a82cd24
commit 30c7541
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/...ustomBeforeCentralpackageVersions.targets → ...ustomBeforeCentralpackageVersions.targets b/...ustomBeforeCentralpackageVersions.targets → ...ustomBeforeCentralpackageVersions.targets
@@ -11,23 +11,31 @@
 -->
 
 <Project>
-  <!-- Transforms <SourceGenerator /> items into <PackageReference /> items with appropriate includes/excludes -->
+  <!-- Transforms <SourceGeneratorPackageReference /> items into <PackageReference /> items with appropriate includes/excludes -->
   <ItemGroup>
-    <PackageReference Include="@(SourceGenerator)">
+    <PackageReference Include="@(SourceGeneratorPackageReference)">
       <IncludeAssets>Analyzers;Build</IncludeAssets>
       <ExcludeAssets>Native;BuildTransitive;BuildMultitargeting;ContentFiles;Compile;Runtime</ExcludeAssets>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <SourceGenerator Remove="@(SourceGenerator)" />
+    <SourceGeneratorPackageReference Remove="@(SourceGeneratorPackageReference)" />
   </ItemGroup>
-  <!-- Transforms <SourceCodeReference /> items into <PackageReference /> items with appropriate includes/excludes -->
+  <!-- Transforms <SourceGeneratorProjectReference /> items into <ProjectReference /> items with appropriate properties -->
   <ItemGroup>
-    <PackageReference Include="@(SourceCodeReference)">
+    <ProjectReference Include="@(SourceGeneratorProjectReference)">
+      <OutputItemType>Analyzer</OutputItemType>
+      <Targets>Restore;Build;Pack</Targets>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <!-- Transforms <SourceCodePackageReference /> items into <PackageReference /> items with appropriate includes/excludes -->
+  <ItemGroup>
+    <PackageReference Include="@(SourceCodePackageReference)">
       <IncludeAssets>ContentFiles;Build;BuildTransitive;BuildMultitargeting</IncludeAssets>
       <ExcludeAssets>Analyzers;Runtime;Native</ExcludeAssets>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <SourceCodeReference Remove="@(SourceCodeReference)" />
+    <SourceCodePackageReference Remove="@(SourceCodePackageReference)" />
   </ItemGroup>
   <!-- Transforms <UsingsPackageReference /> items into <PackageReference /> items with appropriate includes/excludes -->
   <ItemGroup>
@@ -36,5 +44,6 @@
       <ExcludeAssets>ContentFiles;Native;Compile</ExcludeAssets>
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>
+    <UsingsPackageReference Remove="@(UsingsPackageReference)" />
   </ItemGroup>
 </Project>
diff --git a/src/Build/CustomBeforeAndAfterCentralPackageVersions.props b/src/Build/CustomBeforeAndAfterCentralPackageVersions.props
@@ -1,11 +1,11 @@
 <!--
  CustomBeforeAndAfterCentralPackageVersions.props
- 
+
    Created: 2022-10-22-06:23:58
    Modified: 2022-10-29-02:47:31
- 
+
    Author: David G. Moore, Jr. <[email protected]>
-   
+
    Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
       License: MIT (https://opensource.org/licenses/MIT)
 -->
@@ -18,6 +18,7 @@
     </CustomBeforeCentralPackageVersionsProps>
     <CustomAfterCentralPackageVersionsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterCentralPackageVersions.props')))">
       $(CustomAfterCentralPackageVersionsProps);
+      $(MSBuildThisFilePath)/Custom/CustomBeforeCentralPackageVersions.targets;
       $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.props"))
     </CustomAfterCentralPackageVersionsProps>
   </PropertyGroup>