Skip to content

Commit c44d71c

Browse files
guitarrapcguitarrapc
authored
Merge pull request #132 from Cysharp/feature/nuget
chore: Specify IsPackable=false on Directory.Build.props, explicitly true for target packages.
2 parents 6c62443 + 4c7acf7 commit c44d71c

File tree

7 files changed

+282
-289
lines changed

7 files changed

+282
-289
lines changed

‎Directory.Build.props‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4+
<SignAssembly>true</SignAssembly>
5+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)opensource.snk</AssemblyOriginatorKeyFile>
6+
47
<!-- NuGet Package Information -->
8+
<IsPackable>false</IsPackable>
59
<PackageVersion>$(Version)</PackageVersion>
610
<Company>Cysharp</Company>
711
<Authors>Cysharp</Authors>
@@ -16,7 +20,8 @@
1620
</PropertyGroup>
1721

1822
<ItemGroup>
19-
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
2023
<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
24+
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
25+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)LICENSE" />
2126
</ItemGroup>
2227
</Project>

‎sandbox/BenchmarkVsReleasedVersion/BenchmarkVsReleasedVersion.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
<!-- <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks> -->
7-
<LangVersion>8.0</LangVersion>
8-
<IsPackable>false</IsPackable>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<!-- <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks> -->
7+
<LangVersion>8.0</LangVersion>
8+
</PropertyGroup>
109

11-
<ItemGroup>
12-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" Condition="$(TargetFramework) != 'netstandard3.1'" />
13-
<PackageReference Include="ZString" Version="2.2.0" />
14-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
15-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" Condition="$(TargetFramework) != 'netstandard3.1'" />
12+
<PackageReference Include="ZString" Version="2.2.0" />
13+
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
14+
</ItemGroup>
1615

17-
<ItemGroup>
18-
<ProjectReference Include="..\..\src\ZString\ZString.csproj">
19-
<Aliases>NewZString</Aliases>
20-
</ProjectReference>
21-
</ItemGroup>
16+
<ItemGroup>
17+
<ProjectReference Include="..\..\src\ZString\ZString.csproj">
18+
<Aliases>NewZString</Aliases>
19+
</ProjectReference>
20+
</ItemGroup>
2221

2322
</Project>

‎sandbox/ConsoleApp/ConsoleApp.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
6-
<SignAssembly>true</SignAssembly>
7-
<AssemblyOriginatorKeyFile>../../opensource.snk</AssemblyOriginatorKeyFile>
8-
<IsPackable>false</IsPackable>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net7.0</TargetFramework>
6+
</PropertyGroup>
107

11-
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
13-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
14-
<ProjectReference Include="..\..\src\ZString\ZString.csproj">
15-
<SetTargetFramework>TargetFramework=netstandard2.1</SetTargetFramework>
16-
</ProjectReference>
17-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
10+
<PackageReference Include="System.Text.Json" Version="8.0.4" />
11+
<ProjectReference Include="..\..\src\ZString\ZString.csproj">
12+
<SetTargetFramework>TargetFramework=netstandard2.1</SetTargetFramework>
13+
</ProjectReference>
14+
</ItemGroup>
1815

1916
</Project>

‎sandbox/PerfBenchmark/PerfBenchmark.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<LangVersion>8.0</LangVersion>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0</TargetFramework>
6+
<LangVersion>8.0</LangVersion>
7+
</PropertyGroup>
98

10-
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
12-
<PackageReference Include="StringFormatter" Version="1.0.0.13" />
13-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
11+
<PackageReference Include="StringFormatter" Version="1.0.0.13" />
12+
</ItemGroup>
1413

15-
<ItemGroup>
16-
<ProjectReference Include="..\..\src\ZString\ZString.csproj" />
17-
</ItemGroup>
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\src\ZString\ZString.csproj" />
16+
</ItemGroup>
1817

1918
</Project>

0 commit comments

Comments
 (0)