Merge pull request #104 from Cysharp/feature/nuget

guitarrapc · web-flow · commit 6c6444bb644b · 2025-09-25T00:43:55.000+09:00
chore: Specify IsPackable=false on Directory.Build.props, explicitly true for target packages.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,8 +3,11 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <LangVersion>7.3</LangVersion>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)release.snk</AssemblyOriginatorKeyFile>
 
     <!-- NuGet Packaging -->
+    <IsPackable>false</IsPackable>
     <PackageVersion>$(Version)</PackageVersion>
     <Company>Cysharp</Company>
     <Authors>Cysharp</Authors>
@@ -19,6 +22,8 @@
   </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/Icon.png b/Icon.png
diff --git a/benchmark/PerfBenchmark/PerfBenchmark.csproj b/benchmark/PerfBenchmark/PerfBenchmark.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/release.snk b/release.snk
diff --git a/sandbox/BlazorWasm/BlazorWasm.csproj b/sandbox/BlazorWasm/BlazorWasm.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sandbox/TryUlid/TryUlid.csproj b/sandbox/TryUlid/TryUlid.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Ulid.Cli/Ulid.Cli.csproj b/src/Ulid.Cli/Ulid.Cli.csproj
@@ -1,46 +1,31 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\Ulid\Ulid.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <LangVersion>7.3</LangVersion>
 
-    <ItemGroup>
-        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>Ulid.Cli.Tests</_Parameter1>
-        </AssemblyAttribute>
-    </ItemGroup>
+    <!-- Allow running on whatever latest version users have. See https://docs.microsoft.com/en-us/dotnet/core/versions/selection#framework-dependent-apps-roll-forward -->
+    <RollForward>LatestMajor</RollForward>
 
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-        <ToolCommandName>dotnet-ulid</ToolCommandName>
-        <PackAsTool>true</PackAsTool>
-        <LangVersion>7.3</LangVersion>
-        <IsPackable>true</IsPackable>
-        <!-- Allow running on whatever latest version users have. See https://docs.microsoft.com/en-us/dotnet/core/versions/selection#framework-dependent-apps-roll-forward -->
-        <RollForward>LatestMajor</RollForward>
-    </PropertyGroup>
+    <!-- NuGet -->
+    <IsPackable>true</IsPackable>
+    <PackageId>Ulid-Cli</PackageId>
+    <Description>ULID commandline utility</Description>
+    <PackAsTool>true</PackAsTool>
+    <ToolCommandName>dotnet-ulid</ToolCommandName>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="..\Ulid\Icon.png" Pack="true" PackagePath="/" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ConsoleAppFramework" Version="2.1.0" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="ConsoleAppFramework" Version="2.1.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Ulid.Cli.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c55536314d92aaeae8e98e95e4d77c1423811f31971931916031ae58d274b60e580b48b8d093b70afae5d4efedbdcdef6d77a44ccc32df02a0f59bbf99cb8c9241edbacbee6ccf1a8fe53feafc4308923ed56b11dc84860f72e30bbd319cd534ca0aa39af623a4eeedda4a0e4b79d04fd5ede02d248d023dabb6ab0c23d4cdb2" />
+  </ItemGroup>
 
-    <!-- NuGet informations -->
-    <PropertyGroup>
-        <PackageId>Ulid-Cli</PackageId>
-        <PackageVersion>$(Version)</PackageVersion>
-        <Authors>Cysharp</Authors>
-        <Copyright>Cysharp</Copyright>
-        <Description>ULID commandline utility</Description>
-        <PackageProjectUrl>https://github.com/Cysharp/Ulid</PackageProjectUrl>
-        <RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <PackageTags>guid</PackageTags>
-        <PackageIcon>Icon.png</PackageIcon>
-    </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Ulid\Ulid.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Ulid.MessagePack/Ulid.MessagePack.csproj b/src/Ulid.MessagePack/Ulid.MessagePack.csproj
@@ -1,27 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>release.snk</AssemblyOriginatorKeyFile>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-        <!-- NuGet -->
-        <PackageId>Ulid.MessagePack</PackageId>
-        <Description>Ulid MessagePack Formatter.</Description>
-        <IsPackable>true</IsPackable>
-    </PropertyGroup>
+    <!-- NuGet -->
+    <IsPackable>true</IsPackable>
+    <PackageId>Ulid.MessagePack</PackageId>
+    <Description>Ulid MessagePack Formatter.</Description>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="MessagePack" Version="2.1.90" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MessagePack" Version="2.1.90" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Ulid\Ulid.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Include="..\Ulid\Icon.png" Pack="true" PackagePath="/" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Ulid\Ulid.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Ulid.SystemTextJson/Ulid.SystemTextJson.csproj b/src/Ulid.SystemTextJson/Ulid.SystemTextJson.csproj
@@ -1,32 +1,26 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-        <DefineConstants>SYSTEM_TEXT_JSON</DefineConstants>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>release.snk</AssemblyOriginatorKeyFile>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <DefineConstants>SYSTEM_TEXT_JSON</DefineConstants>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-        <!-- NuGet -->
-        <PackageId>Ulid.SystemTextJson</PackageId>
-        <Description>Ulid System.Text.Json Converter.</Description>
-        <IsPackable>true</IsPackable>
-    </PropertyGroup>
+    <!-- NuGet -->
+    <IsPackable>true</IsPackable>
+    <PackageId>Ulid.SystemTextJson</PackageId>
+    <Description>Ulid System.Text.Json Converter.</Description>
+  </PropertyGroup>
 
-    <ItemGroup>
-                <Compile Include="..\Ulid\UlidJsonConverter.cs" Link="UlidJsonConverter.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Ulid\UlidJsonConverter.cs" Link="UlidJsonConverter.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" Version="8.0.4" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Ulid\Ulid.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Include="..\Ulid\Icon.png" Pack="true" PackagePath="/" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Ulid\Ulid.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Ulid.SystemTextJson/release.snk b/src/Ulid.SystemTextJson/release.snk
diff --git a/src/Ulid/Ulid.csproj b/src/Ulid/Ulid.csproj
@@ -1,41 +1,35 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <RootNamespace>System</RootNamespace>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>release.snk</AssemblyOriginatorKeyFile>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<LangVersion>Latest</LangVersion>
-		
-        <!-- NuGet -->
-        <PackageId>Ulid</PackageId>
-        <Description>Fast .NET Standard(C#) Implementation of ULID.</Description>
-        <IsPackable>true</IsPackable>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RootNamespace>System</RootNamespace>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <LangVersion>Latest</LangVersion>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-        <PackageReference Include="System.Memory" Version="4.5.2" />
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
-    </ItemGroup>
+    <!-- NuGet -->
+    <IsPackable>true</IsPackable>
+    <PackageId>Ulid</PackageId>
+    <Description>Fast .NET Standard(C#) Implementation of ULID.</Description>
+  </PropertyGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
-    </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.Memory" Version="4.5.2" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <None Include="Icon.png" Pack="true" PackagePath="/" />
-    </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
+  </ItemGroup>
 
-    <!-- Copy files for Unity -->
-    <PropertyGroup>
-        <DestinationRoot>$(MSBuildProjectDirectory)\..\Ulid.Unity\Assets\Scripts\Ulid\</DestinationRoot>
-    </PropertyGroup>
-    <ItemGroup>
-        <TargetFiles1 Include="$(MSBuildProjectDirectory)\**\*.cs" Exclude="**\bin\**\*.*;**\obj\**\*.*;UlidJsonConverter.cs" />
-    </ItemGroup>
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Copy SourceFiles="@(TargetFiles1)" DestinationFiles="$(DestinationRoot)\%(RecursiveDir)%(Filename)%(Extension)" SkipUnchangedFiles="true" />
-    </Target>
+  <!-- Copy files for Unity -->
+  <PropertyGroup>
+    <DestinationRoot>$(MSBuildProjectDirectory)\..\Ulid.Unity\Assets\Scripts\Ulid\</DestinationRoot>
+  </PropertyGroup>
+  <ItemGroup>
+    <TargetFiles1 Include="$(MSBuildProjectDirectory)\**\*.cs" Exclude="**\bin\**\*.*;**\obj\**\*.*;UlidJsonConverter.cs" />
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="@(TargetFiles1)" DestinationFiles="$(DestinationRoot)\%(RecursiveDir)%(Filename)%(Extension)" SkipUnchangedFiles="true" />
+  </Target>
 </Project>
diff --git a/src/Ulid/release.snk b/src/Ulid/release.snk
diff --git a/tests/Ulid.Cli.Tests/Ulid.Cli.Tests.csproj b/tests/Ulid.Cli.Tests/Ulid.Cli.Tests.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +10,9 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="XunitXml.TestLogger" Version="2.1.26" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="../../src/Ulid.Cli/Ulid.Cli.csproj" />
   </ItemGroup>
 
diff --git a/tests/Ulid.MessagePack.Tests/Ulid.MessagePack.Tests.csproj b/tests/Ulid.MessagePack.Tests/Ulid.MessagePack.Tests.csproj
@@ -2,9 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
-
-        <IsPackable>false</IsPackable>
-
         <RootNamespace>UlidTests</RootNamespace>
     </PropertyGroup>
 
diff --git a/tests/Ulid.SystemTextJson.Tests/Ulid.SystemTextJson.Tests.csproj b/tests/Ulid.SystemTextJson.Tests/Ulid.SystemTextJson.Tests.csproj
@@ -2,9 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
-
-        <IsPackable>false</IsPackable>
-
         <RootNamespace>UlidTests</RootNamespace>
     </PropertyGroup>
 
diff --git a/tests/Ulid.Tests/Ulid.Tests.csproj b/tests/Ulid.Tests/Ulid.Tests.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-      <TargetFramework>net7.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>UlidTests</RootNamespace>
   </PropertyGroup>
 
diff --git a/tests/Ulid.Tests/UlidTest.cs b/tests/Ulid.Tests/UlidTest.cs
@@ -149,7 +149,7 @@ public void UlidTryFormatReturnsStringAndLength()
             largeDestination.AsSpan().Slice(0,26).ToArray().Should().BeEquivalentTo(asString);
             largeLength.Should().Be(26);
         }
-        
+
         [Fact]
         public void UlidTryFormatReturnsFalseWhenInvalidDestination()
         {
@@ -190,7 +190,7 @@ public void ISpanParsable()
             }
         }
 #endif
-        
+
         [Fact]
         public void TryFormatUtf8Bytes()
         {
@@ -204,4 +204,3 @@ public void TryFormatUtf8Bytes()
         }
     }
 }
-
diff --git a/tests/Ulid.Tests/UlidTypeConverterTests.cs b/tests/Ulid.Tests/UlidTypeConverterTests.cs
@@ -8,7 +8,7 @@ public class UlidTypeConverterTests
     {
         private readonly TypeConverter _ulidConverter = TypeDescriptor.GetConverter(typeof(Ulid));
         private readonly Ulid _testUlid = Ulid.NewUlid();
-        
+
         [Fact]
         public void UlidCanConvertFromString()
         {
@@ -42,4 +42,4 @@ public void UlidCanConvertToGuid()
             Assert.Equal(_testUlid.ToGuid(), converted);
         }
     }
-}
+}
