Merge pull request #423 from Cysharp/feature/nuget

guitarrapc · web-flow · commit 8997e81c55d3 · 2025-09-25T00:36:29.000+09:00
chore: Specify IsPackable=false on Directory.Build.props, explicitly true for target packages.
diff --git a/.gitignore b/.gitignore
@@ -77,7 +77,19 @@ publish
 *.Publish.xml
 
 # NuGet Packages Directory
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
 # packages # upm pacakge will use Packages
+# **/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+# !**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
 
 # Windows Azure Build Output
 csx
@@ -107,9 +119,6 @@ UpgradeLog*.XML
 .vs/config/applicationhost.config
 .vs/restore.dg
 
-nuget/tools/*
-nuget/*.nupkg
-nuget/*.unitypackage
 .vs/
 
 # Jetbrains Rider
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,6 +8,7 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)opensource.snk</AssemblyOriginatorKeyFile>
 
     <!-- NuGet Packaging -->
+    <IsPackable>false</IsPackable>
     <PackageVersion>$(Version)</PackageVersion>
     <Company>Cysharp</Company>
     <Authors>Cysharp</Authors>
@@ -18,10 +19,11 @@
     <RepositoryType>git</RepositoryType>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>Icon.png</PackageIcon>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)opensource.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
     <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)LICENSE" />
   </ItemGroup>
 </Project>
diff --git a/LICENSE b/LICENSE
diff --git a/sandbox/Benchmark/Benchmark.csproj b/sandbox/Benchmark/Benchmark.csproj
@@ -7,7 +7,6 @@
         <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
         <Nullable>enable</Nullable>
         <TieredPGO>true</TieredPGO>
-        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/sandbox/ClassLibrary/ClassLibrary.csproj b/sandbox/ClassLibrary/ClassLibrary.csproj
@@ -5,7 +5,6 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
-        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/sandbox/NativeAot/NativeAot.csproj b/sandbox/NativeAot/NativeAot.csproj
@@ -5,7 +5,6 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <IsPackable>false</IsPackable>
 
         <!-- AOT Options -->
         <!-- https://learn.microsoft.com/ja-jp/dotnet/core/deploying/native-aot/ -->
diff --git a/sandbox/Net6VsNet7/Net6VsNet7.csproj b/sandbox/Net6VsNet7/Net6VsNet7.csproj
@@ -5,7 +5,6 @@
         <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/sandbox/SandboxConsoleApp/SandboxConsoleApp.csproj b/sandbox/SandboxConsoleApp/SandboxConsoleApp.csproj
@@ -5,7 +5,6 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <IsPackable>false</IsPackable>
         <!-- <PublishAot>true</PublishAot> -->
     </PropertyGroup>
 
diff --git a/sandbox/SandboxNet6/SandboxNet6.csproj b/sandbox/SandboxNet6/SandboxNet6.csproj
@@ -6,7 +6,6 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>10.0</LangVersion>
         <Nullable>enable</Nullable>
-        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/sandbox/SandboxWebApp/SandboxWebApp.csproj b/sandbox/SandboxWebApp/SandboxWebApp.csproj
@@ -4,7 +4,6 @@
         <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/MemoryPack.AspNetCoreMvcFormatter/MemoryPack.AspNetCoreMvcFormatter.csproj b/src/MemoryPack.AspNetCoreMvcFormatter/MemoryPack.AspNetCoreMvcFormatter.csproj
@@ -5,12 +5,13 @@
         <OutputType>Library</OutputType>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Description>ASP.NET Input/Output Formatter of MemoryPack.</Description>
+
+		    <!-- NuGet -->
         <IsPackable>true</IsPackable>
+        <Description>ASP.NET Input/Output Formatter of MemoryPack.</Description>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="../../Icon.png" Pack="true" PackagePath="/" />
         <ProjectReference Include="..\MemoryPack.Core\MemoryPack.Core.csproj" />
     </ItemGroup>
 
diff --git a/src/MemoryPack.Core/MemoryPack.Core.csproj b/src/MemoryPack.Core/MemoryPack.Core.csproj
@@ -7,12 +7,14 @@
         <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
         <RootNamespace>MemoryPack</RootNamespace>
         <NoWarn>$(NoWarn);CS1591;CA2255</NoWarn>
+
+		    <!-- NuGet -->
+        <IsPackable>true</IsPackable>
         <PackageTags>serializer</PackageTags>
         <Description>Core libraries(attribute, logics) of MemoryPack.</Description>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="../../Icon.png" Pack="true" PackagePath="/" />
         <InternalsVisibleTo Include="MemoryPack.Streaming, PublicKey=00240000048000009400000006020000002400005253413100040000010001000144ec28f1e9ef7b17dacc47425a7a153aea0a7baa590743a2d1a86f4b3e10a8a12712c6e647966bfd8bd6e830048b23bd42bbc56f179585c15b8c19cf86c0eed1b73c993dd7a93a30051dd50fdda0e4d6b65e6874e30f1c37cf8bcbc7fe02c7f2e6a0a3327c0ccc1631bf645f40732521fa0b41a30c178d08f7dd779d42a1ee" />
     </ItemGroup>
 
diff --git a/src/MemoryPack.Generator/MemoryPack.Generator.csproj b/src/MemoryPack.Generator/MemoryPack.Generator.csproj
@@ -12,13 +12,14 @@
         <IncludeSymbols>false</IncludeSymbols>
         <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
         <IsRoslynComponent>true</IsRoslynComponent>
+
+		    <!-- NuGet -->
+        <IsPackable>true</IsPackable>
         <PackageTags>serializer</PackageTags>
         <Description>Code generator for MemoryPack.</Description>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="../../Icon.png" Pack="true" PackagePath="/" />
-
         <!-- https://learn.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support?view=vs-2022 -->
         <!-- require to support SyntaxValueProvider.ForAttributeWithMetadataName(Roslyn 4.3.0, VS2022 17.3) -->
         <!-- Unity 2022.3.12f1 or newer supports 4.3.0 -->
diff --git a/src/MemoryPack.Streaming/MemoryPack.Streaming.csproj b/src/MemoryPack.Streaming/MemoryPack.Streaming.csproj
@@ -6,14 +6,13 @@
         <Nullable>enable</Nullable>
         <NoWarn>$(NoWarn);CS1591;CA2255</NoWarn>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+		    <!-- NuGet -->
+        <IsPackable>true</IsPackable>
         <PackageTags>serializer</PackageTags>
         <Description>Additional streaming support for MemoryPack.</Description>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="../../Icon.png" Pack="true" PackagePath="/" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
     </ItemGroup>
@@ -23,4 +22,3 @@
     </ItemGroup>
 
 </Project>
-
diff --git a/src/MemoryPack.UnityShims/MemoryPack.UnityShims.csproj b/src/MemoryPack.UnityShims/MemoryPack.UnityShims.csproj
@@ -7,14 +7,13 @@
         <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
         <RootNamespace>UnityEngine</RootNamespace>
         <NoWarn>$(NoWarn);CS1591;CA2255</NoWarn>
+
+		    <!-- NuGet -->
+        <IsPackable>true</IsPackable>
         <PackageTags>serializer</PackageTags>
         <Description>Unity shims(Vector3, Color, etc) of MemoryPack.</Description>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="../../Icon.png" Pack="true" PackagePath="/" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\MemoryPack.Core\MemoryPack.Core.csproj" />
         <ProjectReference Include="..\..\src\MemoryPack.Generator\MemoryPack.Generator.csproj">
diff --git a/src/MemoryPack/MemoryPack.csproj b/src/MemoryPack/MemoryPack.csproj
@@ -6,13 +6,14 @@
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <IncludeContentInPack>true</IncludeContentInPack>
         <NoWarn>$(NoWarn);NU5128</NoWarn>
+
+		    <!-- NuGet -->
+        <IsPackable>true</IsPackable>
         <PackageTags>serializer</PackageTags>
         <Description>Zero encoding extreme performance binary serializer for C#.</Description>
     </PropertyGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="..\..\LICENSE.md" />
-        <None Include="../../Icon.png" Pack="true" PackagePath="/" />
         <ProjectReference Include="..\MemoryPack.Core\MemoryPack.Core.csproj" />
         <ProjectReference Include="..\MemoryPack.Generator\MemoryPack.Generator.csproj" />
     </ItemGroup>
diff --git a/tests/MemoryPack.Tests/MemoryPack.Tests.csproj b/tests/MemoryPack.Tests/MemoryPack.Tests.csproj
@@ -3,7 +3,6 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <IsPackable>false</IsPackable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
