From 4c7acf797e7f49eeeae6e3111d08216ad7c233db Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Sep 2025 22:16:13 +0900 Subject: [PATCH] chore: Specify IsPackable=false on Directory.Build.props, explicitly true for target packages. --- Directory.Build.props | 7 +- .../BenchmarkVsReleasedVersion.csproj | 33 +- sandbox/ConsoleApp/ConsoleApp.csproj | 25 +- sandbox/PerfBenchmark/PerfBenchmark.csproj | 25 +- src/ZString/ZString.csproj | 383 +++++++++--------- .../ZString.NetCore2Tests.csproj | 51 ++- tests/ZString.Tests/ZString.Tests.csproj | 47 +-- 7 files changed, 282 insertions(+), 289 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1abbbe1..f5c338d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,11 @@  + true + $(MSBuildThisFileDirectory)opensource.snk + + false $(Version) Cysharp Cysharp @@ -16,7 +20,8 @@ - + + diff --git a/sandbox/BenchmarkVsReleasedVersion/BenchmarkVsReleasedVersion.csproj b/sandbox/BenchmarkVsReleasedVersion/BenchmarkVsReleasedVersion.csproj index abe024d..610968e 100644 --- a/sandbox/BenchmarkVsReleasedVersion/BenchmarkVsReleasedVersion.csproj +++ b/sandbox/BenchmarkVsReleasedVersion/BenchmarkVsReleasedVersion.csproj @@ -1,23 +1,22 @@  - - Exe - netcoreapp3.1 - - 8.0 - false - + + Exe + netcoreapp3.1 + + 8.0 + - - - - - + + + + + - - - NewZString - - + + + NewZString + + diff --git a/sandbox/ConsoleApp/ConsoleApp.csproj b/sandbox/ConsoleApp/ConsoleApp.csproj index e225b75..2653e21 100644 --- a/sandbox/ConsoleApp/ConsoleApp.csproj +++ b/sandbox/ConsoleApp/ConsoleApp.csproj @@ -1,19 +1,16 @@ - - Exe - net7.0 - true - ../../opensource.snk - false - + + Exe + net7.0 + - - - - - TargetFramework=netstandard2.1 - - + + + + + TargetFramework=netstandard2.1 + + diff --git a/sandbox/PerfBenchmark/PerfBenchmark.csproj b/sandbox/PerfBenchmark/PerfBenchmark.csproj index 1c3b0ed..fe58b68 100644 --- a/sandbox/PerfBenchmark/PerfBenchmark.csproj +++ b/sandbox/PerfBenchmark/PerfBenchmark.csproj @@ -1,19 +1,18 @@  - - Exe - net6.0 - 8.0 - false - + + Exe + net6.0 + 8.0 + - - - - + + + + - - - + + + diff --git a/src/ZString/ZString.csproj b/src/ZString/ZString.csproj index b2de3d2..cb1cf88 100644 --- a/src/ZString/ZString.csproj +++ b/src/ZString/ZString.csproj @@ -1,205 +1,204 @@  - - netstandard2.1;netstandard2.0;net6.0;net7.0 - Cysharp.Text - true - true - 9.0 - enable - 1701;1702;1591 + + netstandard2.1;netstandard2.0;net6.0;net7.0 + Cysharp.Text + true + true + 9.0 + enable + 1701;1702;1591 - - Zero allocation StringBuilder for .NET Core and Unity. - true - ../../opensource.snk - + + true + Zero allocation StringBuilder for .NET Core and Unity. + - - - + + + - - - + + + - - - - - + + + + + - - - TextTemplatingFileGenerator - FormatHelper.cs - - - TextTemplatingFileGenerator - PreparedFormat.cs - - - TextTemplatingFileGenerator - StringBuilder.AppendJoin.cs - - - TextTemplatingFileGenerator - TextMeshProExtensions.cs - - - Utf16ValueStringBuilder.AppendMany.cs - TextTemplatingFileGenerator - - - Utf16ValueStringBuilder.CreateFormatter.cs - TextTemplatingFileGenerator - - - Utf16ValueStringBuilder.SpanFormattableAppend.cs - TextTemplatingFileGenerator - - - Utf8ValueStringBuilder.AppendFormat.cs - TextTemplatingFileGenerator - - - Utf8ValueStringBuilder.AppendMany.cs - TextTemplatingFileGenerator - - - Utf8ValueStringBuilder.CreateFormatter.cs - TextTemplatingFileGenerator - - - Utf8ValueStringBuilder.SpanFormattableAppend.cs - TextTemplatingFileGenerator - - - TextTemplatingFileGenerator - Utf16ValueStringBuilder.AppendFormat.cs - - - TextTemplatingFileGenerator - ZString.Concat.cs - - - TextTemplatingFileGenerator - ZString.Format.cs - - - TextTemplatingFileGenerator - ZString.Prepare.cs - - - TextTemplatingFileGenerator - ZString.Utf8Format.cs - - + + + TextTemplatingFileGenerator + FormatHelper.cs + + + TextTemplatingFileGenerator + PreparedFormat.cs + + + TextTemplatingFileGenerator + StringBuilder.AppendJoin.cs + + + TextTemplatingFileGenerator + TextMeshProExtensions.cs + + + Utf16ValueStringBuilder.AppendMany.cs + TextTemplatingFileGenerator + + + Utf16ValueStringBuilder.CreateFormatter.cs + TextTemplatingFileGenerator + + + Utf16ValueStringBuilder.SpanFormattableAppend.cs + TextTemplatingFileGenerator + + + Utf8ValueStringBuilder.AppendFormat.cs + TextTemplatingFileGenerator + + + Utf8ValueStringBuilder.AppendMany.cs + TextTemplatingFileGenerator + + + Utf8ValueStringBuilder.CreateFormatter.cs + TextTemplatingFileGenerator + + + Utf8ValueStringBuilder.SpanFormattableAppend.cs + TextTemplatingFileGenerator + + + TextTemplatingFileGenerator + Utf16ValueStringBuilder.AppendFormat.cs + + + TextTemplatingFileGenerator + ZString.Concat.cs + + + TextTemplatingFileGenerator + ZString.Format.cs + + + TextTemplatingFileGenerator + ZString.Prepare.cs + + + TextTemplatingFileGenerator + ZString.Utf8Format.cs + + - - - True - True - FormatHelper.tt - - - True - True - PreparedFormat.tt - - - True - True - StringBuilder.AppendJoin.tt - - - True - True - Utf16ValueStringBuilder.AppendFormat.tt - - - Utf16ValueStringBuilder.AppendMany.tt - True - True - - - Utf16ValueStringBuilder.CreateFormatter.tt - True - True - - - True - True - Utf16ValueStringBuilder.SpanFormattableAppend.tt - - - True - True - Utf8ValueStringBuilder.AppendFormat.tt - - - True - True - Utf8ValueStringBuilder.AppendMany.tt - - - True - True - Utf8ValueStringBuilder.CreateFormatter.tt - - - True - True - Utf8ValueStringBuilder.SpanFormattableAppend.tt - - - True - True - ZString.Concat.tt - - - True - True - ZString.Format.tt - - - True - True - ZString.Prepare.tt - - - True - True - ZString.Utf8Format.tt - + + + True + True + FormatHelper.tt + + + True + True + PreparedFormat.tt + + + True + True + StringBuilder.AppendJoin.tt + + + True + True + Utf16ValueStringBuilder.AppendFormat.tt + + + Utf16ValueStringBuilder.AppendMany.tt + True + True + + + Utf16ValueStringBuilder.CreateFormatter.tt + True + True + + + True + True + Utf16ValueStringBuilder.SpanFormattableAppend.tt + + + True + True + Utf8ValueStringBuilder.AppendFormat.tt + + + True + True + Utf8ValueStringBuilder.AppendMany.tt + + + True + True + Utf8ValueStringBuilder.CreateFormatter.tt + + + True + True + Utf8ValueStringBuilder.SpanFormattableAppend.tt + + + True + True + ZString.Concat.tt + + + True + True + ZString.Format.tt + + + True + True + ZString.Prepare.tt + + + True + True + ZString.Utf8Format.tt + - + - - - True - True - PreparedFormat.tt - - - True - True - ZString.Utf8Format.tt - - + + + True + True + PreparedFormat.tt + + + True + True + ZString.Utf8Format.tt + + - - - + + + - - - $(MSBuildProjectDirectory)\..\ZString.Unity\Assets\Scripts\ZString\ - - - - - - - + + + $(MSBuildProjectDirectory)\..\ZString.Unity\Assets\Scripts\ZString\ + + + + + + + diff --git a/tests/ZString.NetCore2Tests/ZString.NetCore2Tests.csproj b/tests/ZString.NetCore2Tests/ZString.NetCore2Tests.csproj index 2ed0668..7b46352 100644 --- a/tests/ZString.NetCore2Tests/ZString.NetCore2Tests.csproj +++ b/tests/ZString.NetCore2Tests/ZString.NetCore2Tests.csproj @@ -1,34 +1,31 @@  - - netcoreapp2.1 - false - ZStringTests - true - ../../opensource.snk - + + netcoreapp2.1 + ZStringTests + - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - + + + - - - + + + diff --git a/tests/ZString.Tests/ZString.Tests.csproj b/tests/ZString.Tests/ZString.Tests.csproj index c53bd2f..a16e8ee 100644 --- a/tests/ZString.Tests/ZString.Tests.csproj +++ b/tests/ZString.Tests/ZString.Tests.csproj @@ -1,31 +1,28 @@ - - net7.0 - false - ZStringTests - true - ../../opensource.snk - + + net7.0 + ZStringTests + - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - TargetFramework=netstandard2.1 - - + + + TargetFramework=netstandard2.1 + +