Merge pull request #78 from hadashiA/ku/pack-generators

Pack multiple versions of source generators into the nuget package
hadashiA · Jan 23, 2024 · 3ccafef · 3ccafef
2 parents 860f425 + 61b6124
commit 3ccafef
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 14 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -24,9 +24,6 @@ jobs:
       - run: dotnet build -c Release
       - run: dotnet test -c Release --no-build
       - run: dotnet pack -c Release --no-build -o ./publish
-      - run: |
-          rm ./publish/VYaml.Benchmark.*
-          rm ./publish/VYaml.SourceGenerator.Roslyn3.*
       - uses: actions/upload-artifact@v3
         with:
           name: nuget

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <!-- NuGet Packaging -->
-        <PackageVersion>0.20.0</PackageVersion>
+        <PackageVersion>0.21.0</PackageVersion>
         <Authors>hadashiA</Authors>
         <PackageProjectUrl>https://github.com/hadashiA/VYaml</PackageProjectUrl>
         <RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>

diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ Require Unity 2021.3 or later.
 If you are using a version of Unity newer than 2022.2, you can install as the Unity package manager at the following git URL;
 
 ```
-https://github.com/hadashiA/VYaml.git?path=VYaml.Unity/Assets/VYaml#0.20.0
+https://github.com/hadashiA/VYaml.git?path=VYaml.Unity/Assets/VYaml#0.21.0
 ```
 
 If you are using Unity 2022.1 or older, the git url cannot be used as is because the source generator versions are different.

diff --git a/VYaml.Annotations/VYaml.Annotations.csproj b/VYaml.Annotations/VYaml.Annotations.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>9</LangVersion>

diff --git a/VYaml.Benchmark/VYaml.Benchmark.csproj b/VYaml.Benchmark/VYaml.Benchmark.csproj
@@ -5,6 +5,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/VYaml.Core/VYaml.Core.csproj b/VYaml.Core/VYaml.Core.csproj
@@ -5,7 +5,7 @@
         <LangVersion>9</LangVersion>
         <ImplicitUsings>disable</ImplicitUsings>
         <RootNamespace>VYaml</RootNamespace>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
         <Description>VYaml core apis</Description>
     </PropertyGroup>
 

diff --git a/VYaml.SourceGenerator.Roslyn3/VYaml.SourceGenerator.Roslyn3.csproj b/VYaml.SourceGenerator.Roslyn3/VYaml.SourceGenerator.Roslyn3.csproj
@@ -13,8 +13,7 @@
         <IsRoslynComponent>true</IsRoslynComponent>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 
-        <PackageTags>yaml</PackageTags>
-        <Description>Code generator for VYaml</Description>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/VYaml.SourceGenerator/VYaml.SourceGenerator.csproj b/VYaml.SourceGenerator/VYaml.SourceGenerator.csproj
@@ -12,8 +12,7 @@
         <IsRoslynComponent>true</IsRoslynComponent>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 
-        <PackageTags>yaml</PackageTags>
-        <Description>Code generator for VYaml</Description>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/VYaml.Unity/Assets/VYaml/package.json b/VYaml.Unity/Assets/VYaml/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jp.hadashikick.vyaml",
   "displayName": "VYaml",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "unity": "2021.3",
   "description": "The extra fast YAML library",
   "keywords": ["yaml", "serialization", "parser"],

diff --git a/VYaml/VYaml.csproj b/VYaml/VYaml.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -12,12 +12,26 @@
         <Description>The extra fast YAML library for C#</Description>
     </PropertyGroup>
 
+    <!-- Bundle SourceGenerator -->
+    <ItemGroup>
+        <None Include="..\VYaml.SourceGenerator\bin\$(Configuration)\netstandard2.0\VYaml.SourceGenerator.dll"
+              PackagePath="analyzers\dotnet\roslyn4.1\cs"
+              Pack="true"
+              Visible="false" />
+
+        <None Include="..\VYaml.SourceGenerator.Roslyn3\bin\$(Configuration)\netstandard2.0\VYaml.SourceGenerator.Roslyn3.dll"
+              PackagePath="analyzers\dotnet\roslyn3.8\cs"
+              Pack="true"
+              Visible="false" />
+    </ItemGroup>
+
     <ItemGroup>
         <InternalsVisibleTo Include="VYaml.Tests" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\VYaml.Core\VYaml.Core.csproj" />
-        <ProjectReference Include="..\VYaml.SourceGenerator\VYaml.SourceGenerator.csproj" />
+        <ProjectReference Include="..\VYaml.SourceGenerator\VYaml.SourceGenerator.csproj"
+                          ReferenceOutputAssembly="false" />
     </ItemGroup>
 </Project>