Changes

dgmjr-io · Apr 17, 2024 · 6adcc91 · 6adcc91
1 parent b8faf79
commit 6adcc91
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 183 deletions.
diff --git a/Test/Directory.Build.props b/Test/Directory.Build.props
@@ -11,5 +11,5 @@
 -->
 
 <Project>
-  <!-- <Import Project="Sdk.props" Sdk="DgmjrSdk" /> -->
+  <Import Project="Sdk.props" Sdk="DgmjrSdk" />
 </Project>
diff --git a/Test/Directory.Build.targets b/Test/Directory.Build.targets
@@ -11,5 +11,5 @@
 -->
 
 <Project>
-  <!-- <Import Project="Sdk.targets" Sdk="DgmjrSdk" /> -->
+  <Import Project="Sdk.targets" Sdk="DgmjrSdk" />
 </Project>
diff --git a/src/Build/ACustomItemTypes.props b/src/Build/ACustomItemTypes.props
@@ -36,4 +36,5 @@
       <PrivateAssets>None</PrivateAssets>
     </UsingsPackageReference>
   </ItemDefinitionGroup>
+
 </Project>
diff --git a/src/Build/ACustomItemTypes.targets b/src/Build/ACustomItemTypes.targets
diff --git a/src/Targets/ACustomItemTypes.targets b/src/Targets/ACustomItemTypes.targets
@@ -1,91 +1,12 @@
 <Project>
-<!-- <Project InitialTargets="RestoreSourceGeneratorPackageReferences;RestoreSourceGeneratorProjectReferences;RestoreSourceCodePackageReferences;RestoreUsingsPackageReferences"> -->
-  <!-- <Target Name="RestoreSourceGeneratorPackageReferences" BeforeTargets="Restore" Inputs="%(SourceGeneratorPackageReference.Identity)" Outputs="@(PackageReference)">
-    <ItemGroup>
-      <PackageReference Include="%(SourceGeneratorPackageReference.Identity)">
-        <CopyLocal>true</CopyLocal>
-        <ExcludeAssets>Native;BuildTransitive;BuildMultitargeting;ContentFiles;Compile;Runtime</ExcludeAssets>
-        <GeneratePathProperty>true</GeneratePathProperty>
-        <IncludeAssets>Analyzers;Build</IncludeAssets>
-        <Pack>true</Pack>
-        <PrivateAssets>All</PrivateAssets>
-      </PackageReference>
-    </ItemGroup>
-  </Target>
-  <Target Name="RestoreSourceGeneratorProjectReferences" BeforeTargets="Restore" Inputs="%(SourceGeneratorProjectReference.Identity)" Outputs="@(ProjectReference)">
-    <ItemGroup>
-      <ProjectReference Include="%(SourceGeneratorProjectReference.Identity)">
-        <CopyLocal>true</CopyLocal>
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-        <GeneratePathProperty>true</GeneratePathProperty>
-        <OutputItemType>Analyzer</OutputItemType>
-        <Pack>true</Pack>
-        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-        <SetConfiguration>Configuration=$(Configuration)</SetConfiguration>
-        <Targets>Restore;Build;Pack</Targets>
-      </ProjectReference>
-    </ItemGroup>
-  </Target>
-  <Target Name="RestoreSourceCodePackageReferences" BeforeTargets="Restore" Inputs="%(SourceCodePackageReference.Identity)" Outputs="@(PackageReference)">
-    <ItemGroup>
-      <PackageReference Include="%(SourceCodePackageReference.Identity)">
-        <CopyLocal>true</CopyLocal>
-        <ExcludeAssets>Analyzers;Runtime;Native</ExcludeAssets>
-        <GeneratePathProperty>true</GeneratePathProperty>
-        <IncludeAssets>ContentFiles;Build;BuildTransitive;BuildMultitargeting</IncludeAssets>
-        <Pack>true</Pack>
-        <PrivateAssets>All</PrivateAssets>
-      </PackageReference>
-    </ItemGroup>
-  </Target>
-  <Target Name="RestoreUsingsPackageReferences" BeforeTargets="Restore" Inputs="%(UsingsPackageReference.Identity)" Outputs="@(PackageReference)">
-    <ItemGroup>
-      <PackageReference Include="%(UsingsPackageReference.Identity)">
-        <CopyLocal>true</CopyLocal>
-        <ExcludeAssets>ContentFiles;Native;Analyzers</ExcludeAssets>
-        <GeneratePathProperty>true</GeneratePathProperty>
-        <IncludeAssets>Build;BuildTransitive;BuildMultitargeting;Runtime;Compile</IncludeAssets>
-        <Pack>true</Pack>
-        <PrivateAssets>None</PrivateAssets>
-      </PackageReference>
-    </ItemGroup>
-  </Target> -->
   <ItemGroup>
-    <PackageReference Include="@(SourceGeneratorPackageReference->'%(Identity)')">
-      <CopyLocal>true</CopyLocal>
-      <ExcludeAssets>Native;BuildTransitive;BuildMultitargeting;ContentFiles;Compile;Runtime</ExcludeAssets>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <IncludeAssets>Analyzers;Build</IncludeAssets>
-      <Pack>true</Pack>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <ProjectReference Include="@(SourceGeneratorProjectReference->'%(Identity)')">
-      <CopyLocal>true</CopyLocal>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <OutputItemType>Analyzer</OutputItemType>
-      <Pack>true</Pack>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <SetConfiguration>Configuration=$(Configuration)</SetConfiguration>
-      <Targets>Restore;Build;Pack</Targets>
-    </ProjectReference>
-    <PackageReference Include="@(SourceCodePackageReference->'%(Identity)')">
-      <CopyLocal>true</CopyLocal>
-      <ExcludeAssets>Analyzers;Runtime;Native</ExcludeAssets>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <IncludeAssets>ContentFiles;Build;BuildTransitive;BuildMultitargeting</IncludeAssets>
-      <Pack>true</Pack>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="@(UsingsPackageReference->'%(Identity)')">
-      <CopyLocal>true</CopyLocal>
-      <ExcludeAssets>ContentFiles;Native;Analyzers</ExcludeAssets>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <IncludeAssets>Build;BuildTransitive;BuildMultitargeting;Runtime;Compile</IncludeAssets>
-      <Pack>true</Pack>
-      <PrivateAssets>None</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="@(SourceGeneratorPackageReference)" CopyLocal="true" GeneratePathProperty="true" ExcludeAssets="Native;BuildTransitive;BuildMultitargeting;ContentFiles;Compile;Runtime" IncludeAssets="Analyzers;Build" Pack="true" PrivateAssets="All" />
+    <ProjectReference Include="@(SourceGeneratorProjectReference)" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" OutputItemType="Analyzer" ReferenceOutputAssembly="false" SetConfiguration="Configuration='$(Configuration)'" Targets="Restore;Build;Pack" CopyLocal="true" GeneratePathProperty="true" ExcludeAssets="Native;BuildTransitive;BuildMultitargeting;ContentFiles;Compile;Runtime" IncludeAssets="Analyzers;Build" Pack="true" PrivateAssets="All" />
+    <PackageReference Include="@(SourceCodePackageReference)" CopyLocal="true" GeneratePathProperty="true" ExcludeAssets="Analyzers;Runtime;Native" IncludeAssets="ContentFiles;Build;BuildTransitive;BuildMultitargeting" Pack="true" PrivateAssets="All" />
+    <PackageReference Include="@(UsingsPackageReference)"  CopyLocal="true" GeneratePathProperty="true" ExcludeAssets="ContentFiles;Native;Analyzers" IncludeAssets="Build;BuildTransitive;BuildMultitargeting;Runtime;Compile" Pack="true" PrivateAssets="All" />
+    <!-- <SourceGeneratorPackageReference Remove="@(SourceGeneratorPackageReference)" />
+    <SourceGeneratorProjectReference Remove="@(SourceGeneratorProjectReference)" />
+    <SourceCodePackageReference Remove="@(SourceCodePackageReference)" />
+    <UsingsPackageReference Remove="@(UsingsPackageReference)" /> -->
   </ItemGroup>
 </Project>
diff --git a/src/Targets/PackageTags.targets b/src/Targets/PackageTags.targets
@@ -15,10 +15,16 @@
   <PropertyGroup>
     <PackageTags_targets>Imported</PackageTags_targets>
   </PropertyGroup>
-  <!-- <Target Name="SetPackageTags" BeforeTargets="GetPackageMetadata;GenerateMSBuildEditorConfigFileShouldRun" Condition="'$(PackageTags_targets)' == ''"> -->
+  <ItemGroup>
+    <PackageTag Include="dgmjr" />
+    <PackageTag Include="dgmjrmoore" />
+    <PackageTag Include="dgmjr" />
+  </ItemGroup>
+  <ItemGroup>
+    <DistinctPackageTag Include="@(PackageTag->Distinct())" />
+  </ItemGroup>
   <PropertyGroup>
-    <PackageTags>@(PackageTag->Distinct(), ' ')</PackageTags>
+    <PackageTags>@(DistinctPackageTag, ' ')</PackageTags>
     <PackageTags>$(PackageTags.ToLower())</PackageTags>
   </PropertyGroup>
-  <!-- </Target> -->
 </Project>