Skip to content

Commit 4ebe9c2

Browse files
guitarrapcguitarrapc
committed
chore: Specify IsPackable=false on Directory.Build.props, explicitly true for target packages.
1 parent d95799f commit 4ebe9c2

File tree

7 files changed

+109
-97
lines changed

7 files changed

+109
-97
lines changed

‎.gitignore‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ _ReSharper*
5757
*.ncrunch*
5858
.*crunch*.local.xml
5959

60-
# Installshield output folder
60+
# Installshield output folder
6161
[Ee]xpress
6262

6363
# DocProject is a documentation generator add-in
@@ -77,7 +77,19 @@ publish
7777
*.Publish.xml
7878

7979
# NuGet Packages Directory
80+
*.nupkg
81+
# NuGet Symbol Packages
82+
*.snupkg
83+
# The packages folder can be ignored because of Package Restore
8084
# packages # upm pacakge will use Packages
85+
# **/[Pp]ackages/*
86+
# except build/, which is used as an MSBuild target.
87+
# !**/[Pp]ackages/build/
88+
# Uncomment if necessary however generally it will be regenerated when needed
89+
#!**/[Pp]ackages/repositories.config
90+
# NuGet v3's project.json files produces more ignorable files
91+
*.nuget.props
92+
*.nuget.targets
8193

8294
# Windows Azure Build Output
8395
csx

‎Directory.Build.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
<Nullable>enable</Nullable>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
7+
78
<SignAssembly>true</SignAssembly>
89
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)opensource.snk</AssemblyOriginatorKeyFile>
910

1011
<!-- NuGet Packaging -->
12+
<IsPackable>false</IsPackable>
1113
<PackageVersion>$(Version)</PackageVersion>
1214
<Company>Cysharp</Company>
1315
<Authors>Cysharp</Authors>
@@ -19,11 +21,11 @@
1921
<RepositoryType>git</RepositoryType>
2022
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2123
<PackageIcon>Icon.png</PackageIcon>
22-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)opensource.snk</AssemblyOriginatorKeyFile>
2324
</PropertyGroup>
2425

2526
<ItemGroup>
26-
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
2727
<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
28+
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
29+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)LICENSE" />
2830
</ItemGroup>
2931
</Project>

LICENSE.md renamed to LICENSE

File renamed without changes.

‎sandbox/ConsoleApp/ConsoleApp.csproj‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<NoWarn>$(NoWarn);CS0169;CS0649</NoWarn>
9+
</PropertyGroup>
810

9-
<IsPackable>false</IsPackable>
10-
<NoWarn>$(NoWarn);CS0169;CS0649</NoWarn>
11-
</PropertyGroup>
11+
<ItemGroup>
12+
<PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
13+
<PackageReference Include="ZString" Version="2.5.1" />
14+
</ItemGroup>
1215

13-
<ItemGroup>
14-
<PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
15-
<PackageReference Include="ZString" Version="2.5.1" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<ProjectReference Include="..\..\src\Utf8StringInterpolation\Utf8StringInterpolation.csproj" />
20-
</ItemGroup>
16+
<ItemGroup>
17+
<ProjectReference Include="..\..\src\Utf8StringInterpolation\Utf8StringInterpolation.csproj" />
18+
</ItemGroup>
2119

2220
</Project>

‎sandbox/Net6ConsoleApp/Net6ConsoleApp.csproj‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
9-
<IsPackable>false</IsPackable>
10-
</PropertyGroup>
11-
12-
<ItemGroup>
13-
<ProjectReference Include="..\..\src\Utf8StringInterpolation\Utf8StringInterpolation.csproj" />
14-
</ItemGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<ProjectReference Include="..\..\src\Utf8StringInterpolation\Utf8StringInterpolation.csproj" />
12+
</ItemGroup>
1513

1614
</Project>

‎src/Utf8StringInterpolation/Utf8StringInterpolation.csproj‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,44 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<LangVersion>11</LangVersion>
7-
<Nullable>enable</Nullable>
8-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9-
<NoWarn>$(NoWarn);CS1591;CA2255</NoWarn>
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<LangVersion>11</LangVersion>
7+
<Nullable>enable</Nullable>
8+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9+
<NoWarn>$(NoWarn);CS1591;CA2255</NoWarn>
1010

1111
<!-- NuGet -->
12-
<Description>Successor of ZString; UTF8 based zero allocation high-peformance String Interpolation and StringBuilder.</Description>
13-
</PropertyGroup>
12+
<IsPackable>true</IsPackable>
13+
<PackageId>Utf8StringInterpolation</PackageId>
14+
<Description>Successor of ZString; UTF8 based zero allocation high-peformance String Interpolation and StringBuilder.</Description>
15+
</PropertyGroup>
1416

15-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
16-
<PackageReference Include="System.Memory" Version="4.5.5" />
17-
</ItemGroup>
17+
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
18+
<PackageReference Include="System.Memory" Version="4.5.5" />
19+
</ItemGroup>
1820

19-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
20-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
21-
</ItemGroup>
21+
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
22+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
23+
</ItemGroup>
2224

23-
<ItemGroup>
24-
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
25-
<None Update="Utf8StringWriter.AppendFormatted.tt">
26-
<Generator>TextTemplatingFileGenerator</Generator>
27-
<LastGenOutput>Utf8StringWriter.AppendFormatted.cs</LastGenOutput>
28-
</None>
29-
<Compile Update="Utf8StringWriter.AppendFormatted.cs">
30-
<DesignTime>True</DesignTime>
31-
<AutoGen>True</AutoGen>
32-
<DependentUpon>Utf8StringWriter.AppendFormatted.tt</DependentUpon>
33-
</Compile>
34-
</ItemGroup>
25+
<ItemGroup>
26+
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
27+
<None Update="Utf8StringWriter.AppendFormatted.tt">
28+
<Generator>TextTemplatingFileGenerator</Generator>
29+
<LastGenOutput>Utf8StringWriter.AppendFormatted.cs</LastGenOutput>
30+
</None>
31+
<Compile Update="Utf8StringWriter.AppendFormatted.cs">
32+
<DesignTime>True</DesignTime>
33+
<AutoGen>True</AutoGen>
34+
<DependentUpon>Utf8StringWriter.AppendFormatted.tt</DependentUpon>
35+
</Compile>
36+
</ItemGroup>
3537

36-
<ItemGroup>
37-
<PackageReference Include="PolySharp" Version="1.14.0">
38-
<PrivateAssets>all</PrivateAssets>
39-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
40-
</PackageReference>
41-
</ItemGroup>
38+
<ItemGroup>
39+
<PackageReference Include="PolySharp" Version="1.14.0">
40+
<PrivateAssets>all</PrivateAssets>
41+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42+
</PackageReference>
43+
</ItemGroup>
4244
</Project>

‎tests/Utf8StringInterpolation.Tests/Utf8StringInterpolation.Tests.csproj‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net48</TargetFrameworks>
5-
<TargetFrameworks>$(TargetFrameworks);net6.0;net8.0</TargetFrameworks>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
<LangVersion>12.0</LangVersion>
9-
<IsPackable>false</IsPackable>
10-
<IsTestProject>true</IsTestProject>
11-
</PropertyGroup>
12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13-
<NoWarn>$(NoWarn);CS1591;CS8604;CS8321;CS0414;CS0169;CS0649</NoWarn>
14-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net48</TargetFrameworks>
5+
<TargetFrameworks>$(TargetFrameworks);net6.0;net8.0</TargetFrameworks>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<LangVersion>12.0</LangVersion>
9+
<IsTestProject>true</IsTestProject>
10+
</PropertyGroup>
1511

16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17-
<NoWarn>$(NoWarn);CS1591;CS8604;CS8321;CS0414;CS0169;CS0649</NoWarn>
18-
</PropertyGroup>
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13+
<NoWarn>$(NoWarn);CS1591;CS8604;CS8321;CS0414;CS0169;CS0649</NoWarn>
14+
</PropertyGroup>
1915

20-
<ItemGroup>
21-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
24-
<PackageReference Include="xunit" Version="2.4.2" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
<PrivateAssets>all</PrivateAssets>
28-
</PackageReference>
29-
</ItemGroup>
16+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17+
<NoWarn>$(NoWarn);CS1591;CS8604;CS8321;CS0414;CS0169;CS0649</NoWarn>
18+
</PropertyGroup>
3019

31-
<ItemGroup>
32-
<ProjectReference Include="..\..\src\Utf8StringInterpolation\Utf8StringInterpolation.csproj" />
33-
</ItemGroup>
20+
<ItemGroup>
21+
<PackageReference Include="FluentAssertions" Version="6.7.0" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
24+
<PackageReference Include="xunit" Version="2.4.2" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
<PrivateAssets>all</PrivateAssets>
28+
</PackageReference>
29+
</ItemGroup>
3430

35-
<ItemGroup>
36-
<Using Include="Xunit" />
37-
<Using Include="Xunit.Abstractions" />
38-
<Using Include="Utf8StringInterpolation" />
39-
</ItemGroup>
31+
<ItemGroup>
32+
<ProjectReference Include="..\..\src\Utf8StringInterpolation\Utf8StringInterpolation.csproj" />
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<Using Include="Xunit" />
37+
<Using Include="Xunit.Abstractions" />
38+
<Using Include="Utf8StringInterpolation" />
39+
</ItemGroup>
4040

4141
</Project>

0 commit comments

Comments
 (0)