Fixed the source generators not pulling in all scripts

ByronMayne · Jan 25, 2024 · 3ad6714 · 3ad6714
1 parent c9bce25
commit 3ad6714
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 9 deletions.
diff --git a/...ed/Configuration/ResourceConfiguration.cs → ...re/Configuration/ResourceConfiguration.cs b/...ed/Configuration/ResourceConfiguration.cs → ...re/Configuration/ResourceConfiguration.cs
diff --git a/...oundations.Shared/IncrementalGenerator.cs → ...tions.Shared/Core/IncrementalGenerator.cs b/...oundations.Shared/IncrementalGenerator.cs → ...tions.Shared/Core/IncrementalGenerator.cs
diff --git a/...Shared/Reflection/AssemblyNameComparer.cs → ...d/Core/Reflection/AssemblyNameComparer.cs b/...Shared/Reflection/AssemblyNameComparer.cs → ...d/Core/Reflection/AssemblyNameComparer.cs
diff --git a/...ons.Shared/Reflection/AssemblyResolver.cs → ...hared/Core/Reflection/AssemblyResolver.cs b/...ons.Shared/Reflection/AssemblyResolver.cs → ...hared/Core/Reflection/AssemblyResolver.cs
diff --git a/...ations.Shared/SgfInitializationContext.cs → ...s.Shared/Core/SgfInitializationContext.cs b/...ations.Shared/SgfInitializationContext.cs → ...s.Shared/Core/SgfInitializationContext.cs
diff --git a/...ions.Shared/SgfSourceProductionContext.cs → ...Shared/Core/SgfSourceProductionContext.cs b/...ions.Shared/SgfSourceProductionContext.cs → ...Shared/Core/SgfSourceProductionContext.cs
diff --git a/src/SourceGenerator.Foundations.Shared/SourceGenerator.Foundations.Shared.projitems b/src/SourceGenerator.Foundations.Shared/SourceGenerator.Foundations.Shared.projitems
@@ -9,12 +9,6 @@
     <Import_RootNamespace>SGF</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Configuration\ResourceConfiguration.cs" Pack="True" PackagePath="sgf/src/Configuration\ResourceConfiguration.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Reflection\AssemblyNameComparer.cs" Pack="True" PackagePath="sgf/src/Reflection\AssemblyNameComparer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Reflection\AssemblyResolver.cs" Pack="True" PackagePath="sgf/src/Reflection\AssemblyResolver.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IncrementalGenerator.cs" Pack="True" PackagePath="sgf/src/IncrementalGenerator.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SgfInitializationContext.cs" Pack="True" PackagePath="sgf/src/SgfInitializationContext.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SgfSourceProductionContext.cs" Pack="True" PackagePath="sgf/src/SgfSourceProductionContext.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Polyfills/**/*.cs" Pack="True" PackagePath="sgf/src/Polyfills/%(RecursiveDir)%(Filename)%(Extension)" />
+    <Compile Include="$(MSBuildThisFileDirectory)**\*.cs" Pack="True" PackagePath="sgf/src/%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 </Project>
diff --git a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.props b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.props
@@ -25,10 +25,9 @@
   </ItemGroup>
   <ItemGroup Condition="'$(IsNuGetPackage.ToLower())' == 'true'">
     <SGF_EmbeddedAssembly Include="$(MSBuildThisFileDirectory)..\sgf\embedded\assemblies\*.*"/>
-    <SGF_Polyfills Include="$(MSBuildThisFileDirectory)..\sgf\src\Polyfills\**.cs"/>
 
     <!-- Core -->
-    <Compile Include="$(MSBuildThisFileDirectory)..\sgf\src\**.cs" Exclude="$(SGF_Polyfills)" Visible="$(SgfShowImports)">
+    <Compile Include="$(MSBuildThisFileDirectory)..\sgf\src\Core\**\*.cs" Visible="$(SgfShowImports)">
       <Link>SGF/%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
     <!-- Polyfills: Nullable-->