Bundle generator dll within common. No need to install two nuget pack…

…ages now.
PereViader · May 18, 2024 · 2c6398b · 2c6398b
1 parent 4a52c61
commit 2c6398b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/.github/workflows/PublishNugetPackage.yml b/.github/workflows/PublishNugetPackage.yml
@@ -22,11 +22,4 @@ jobs:
         with:
           NUGET_KEY: ${{secrets.NUGET_API_KEY}}
           PROJECT_FILE_PATH: PereViader.Utils.Common/PereViader.Utils.Common/PereViader.Utils.Common.csproj
-          REBUILD_PROJECT: false
-
-      - name: Publish Generators
-        uses: tedd/publish-nuget-neo@v1
-        with:
-          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
-          PROJECT_FILE_PATH: PereViader.Utils.Common/PereViader.Utils.Common.Generators/PereViader.Utils.Common.Generators.csproj
           REBUILD_PROJECT: false
diff --git a/...Utils.Common/PereViader.Utils.Common.Generators/PereViader.Utils.Common.Generators.csproj b/...Utils.Common/PereViader.Utils.Common.Generators/PereViader.Utils.Common.Generators.csproj
@@ -8,25 +8,10 @@
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>Nullable</WarningsAsErrors>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <RepositoryUrl>https://github.com/PereViader/PereViader.Utils</RepositoryUrl>
-
-        <Version>1.0.1</Version>
-        <developmentDependency>true</developmentDependency>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <NoPackageAnalysis>true</NoPackageAnalysis>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="Microsoft.CodeAnalysis" Version="3.8.0" />
     </ItemGroup>
-
-    <!-- This is necessary to make the analyzer work when consumed as a Nuget package -->
-    <ItemGroup>
-        <None Include="$(OutputPath)\$(AssemblyName).dll"
-              Pack="true"
-              PackagePath="analyzers/dotnet/cs"
-              Visible="false" />
-    </ItemGroup>
 </Project>
diff --git a/PereViader.Utils.Common/PereViader.Utils.Common/PereViader.Utils.Common.csproj b/PereViader.Utils.Common/PereViader.Utils.Common/PereViader.Utils.Common.csproj
@@ -6,12 +6,19 @@
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>Nullable</WarningsAsErrors>
-        <Version>1.0.1</Version>
+        <Version>1.0.2</Version>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/PereViader/PereViader.Utils</RepositoryUrl>
     </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\PereViader.Utils.Common.Generators\PereViader.Utils.Common.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
+
+    <ItemGroup>
+        <None Include="..\PereViader.Utils.Common.Generators\bin\$(Configuration)\netstandard2.0\PereViader.Utils.Common.Generators.dll"
+            Pack="true"
+            PackagePath="analyzers/dotnet/cs"
+            Visible="false" />
+    </ItemGroup>
 </Project>