Merge pull request #69 from jeromelaban/dev/jela/source-include

feat: Restore source inclusion as an option

Author: dansiegel

ReadMe.md

@@ -6,7 +6,7 @@ The CodeGenHelpers is built to help people to write C# Code generators. If you l
 |----|:---:|
 | [AvantiPoint.CodeGenHelpers](https://www.nuget.org/packages/AvantiPoint.CodeGenHelpers/) | ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/AvantiPoint.CodeGenHelpers?style=plastic) |
 
-> Note: Version 2.0 will no longer ship as source code linked into your project and will now ship as a pre-compiled library.
+> Note: Version 2.0 will no longer ship as source code linked into your project by default and will now ship as a pre-compiled library. To include the helpers as source, set `<CodeGenHelpersMode>source</CodeGenHelpersMode>` in your project.
 
 ## Why Use the Helpers?
 

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.400"
+    "version": "6.0.400","rollForward": "latestMajor"
   }
 }

src/CodeGenHelpers/AvantiPoint.CodeGenHelpers.csproj

@@ -9,7 +9,7 @@
     <PackageTags>source generators;codegen;avantipoint;roslyn</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <LangVersion>latest</LangVersion>
-
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddGeneratorsToOutput</TargetsForTfmSpecificContentInPackage>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn);NU5128;</NoWarn>
   </PropertyGroup>
@@ -18,5 +18,15 @@
     <InternalsVisibleTo Include="CodeGenHelpers.Tests" />
     <None Update="ReadMe.txt" Pack="true" PackagePath="" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
+    <None Include="AvantiPoint.CodeGenHelpers.props" Pack="true" PackagePath="build" />
+    <None Include="AvantiPoint.CodeGenHelpers.targets" Pack="true" PackagePath="build" />
   </ItemGroup>
+
+  <Target Name="_AddGeneratorsToOutput">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="*.cs" PackagePath="build/content" />
+      <TfmSpecificPackageFile Include="Internals\*.cs" PackagePath="build/content/Internals" />
+      <TfmSpecificPackageFile Include="Extensions\*.cs" PackagePath="build/content/Extensions" />
+    </ItemGroup>
+  </Target>
 </Project>

src/CodeGenHelpers/AvantiPoint.CodeGenHelpers.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project>
+
+  <PropertyGroup>
+    <CodeGenHelpersMode Condition=" '$(CodeGenHelpersMode)' == '' ">Assembly</CodeGenHelpersMode>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(CodeGenHelpersMode)' == 'Source' ">
+    <Compile Include="$(MSBuildThisFileDirectory)content\**\*.cs" LinkBase="CodeGenHelpers" />
+  </ItemGroup>
+
+</Project>

src/CodeGenHelpers/AvantiPoint.CodeGenHelpers.targets

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project>
+
+  <Target Name="RemoveAssemblyReferenceOnSourceMode"
+          BeforeTargets="FindReferenceAssembliesForReferences"
+          Condition=" '$(CodeGenHelpersMode)' == 'Source' ">
+
+    <ItemGroup>
+      <_CodeGenHelpersReferenceToRemove
+				  Include="@(ReferencePath)"
+				  Condition=" '%(ReferencePath.NuGetPackageId)' == 'AvantiPoint.CodeGenHelpers' " />
+
+      <!-- Remove all references -->
+      <ReferencePath Remove="@(_CodeGenHelpersReferenceToRemove)" />
+      <ReferenceCopyLocalPaths Remove="@(_CodeGenHelpersReferenceToRemove)" />
+
+      <!-- Clear items -->
+      <_CodeGenHelpersReferenceToRemove Remove="@(_CodeGenHelpersReferenceToRemove)" />
+    </ItemGroup>
+
+  </Target>
+
+</Project>

src/CodeGenHelpers/ReadMe.txt

@@ -1,3 +1,7 @@
 Thanks for downloading the AvantiPoint CodeGenHelpers. This helper library will help you more easily write Source Generators with a pattern that allows you to pass in strings, some System Type's or Roslyn Type Symbols. The generated code can be added to the builder in any order and will output a nicely formatted source file.
 
+The CodeGenHelpers come in two flavors, set using `CodeGenHelpersMode`:
+- `Assembly`, in order to be used as a normal assembly
+- `Source`, where the helpers are linked as source files to eliminate issues with assembly references.
+
 Please consider becomming a sponsor at https://github.com/sponsors/dansiegel