Merge pull request #306 from nuskey8/fix/source-generator-csproj

fix: Lua.SourceGenerator.csproj settings

Author: nuskey8

src/Lua.SourceGenerator/Lua.SourceGenerator.csproj

@@ -3,14 +3,15 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>13</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsRoslynComponent>true</IsRoslynComponent>
-    <AnalyzerLanguage>cs</AnalyzerLanguage>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <AnalyzerLanguage>cs</AnalyzerLanguage>
+    <Nullable>enable</Nullable>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <DevelopmentDependency>true</DevelopmentDependency>
     <IncludeSymbols>false</IncludeSymbols>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <IsRoslynComponent>true</IsRoslynComponent>
 
     <!-- NuGet -->
     <PackageId>LuaCSharp.SourceGenerator</PackageId>
@@ -19,18 +20,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
-    <None
-      Include="$(OutputPath)\$(AssemblyName).dll"
-      Pack="true"
-      PackagePath="analyzers/dotnet/cs"
-      Visible="false"
-    />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="../../Icon.png" Pack="true" PackagePath="/" />
     <None Include="..\..\README.md" Pack="true" PackagePath="README.md" />
     <EmbeddedResource Include="..\..\LICENSE" />
   </ItemGroup>
+
+  <!-- for NuGet publish -->
+  <Target
+    Name="PackBuildOutputs"
+    DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup"
+  >
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="$(TargetDir)\*.dll" PackagePath="analyzers\dotnet\cs" />
+      <TfmSpecificPackageFile
+        Include="@(SatelliteDllsProjectOutputGroupOutput->'%(FinalOutputPath)')"
+        PackagePath="analyzers\dotnet\cs\%(SatelliteDllsProjectOutputGroupOutput.Culture)\"
+      />
+    </ItemGroup>
+  </Target>
 </Project>

src/Lua/Lua.csproj

@@ -32,11 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\Lua.SourceGenerator\Lua.SourceGenerator.csproj"
-      OutputItemType="Analyzer"
-      ReferenceOutputAssembly="false"
-    />
+    <ProjectReference Include="..\Lua.SourceGenerator\Lua.SourceGenerator.csproj" />
     <ProjectReference Include="..\Lua.Annotations\Lua.Annotations.csproj" />
   </ItemGroup>
 </Project>