Skip to content

Commit 5545763

Browse files
guitarrapcguitarrapc
authored
Merge pull request #67 from Cysharp/feature/nuget
chore: Specify IsPackable=false on Directory.Build.props, explicitly true for target packages.
2 parents cf5c336 + 3da3e95 commit 5545763

File tree

7 files changed

+91
-94
lines changed

7 files changed

+91
-94
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<LangVersion>13</LangVersion>
55

66
<!-- NuGet Package Information -->
7+
<IsPackable>false</IsPackable>
78
<PackageVersion>$(Version)</PackageVersion>
89
<Company>Cysharp</Company>
910
<Authors>Cysharp</Authors>
@@ -18,7 +19,8 @@
1819
</PropertyGroup>
1920

2021
<ItemGroup>
22+
<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
2123
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
22-
<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
24+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)LICENSE" />
2325
</ItemGroup>
2426
</Project>

‎sandbox/ConsoleApp/ConsoleApp.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<Nullable>enable</Nullable>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
98

10-
<ItemGroup>
11-
<PackageReference Include="Dapper" Version="2.0.78" />
12-
<PackageReference Include="MessagePack" Version="2.2.85" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
14-
<PackageReference Include="Ulid" Version="1.2.6" />
15-
<PackageReference Include="Ulid.MessagePack" Version="1.2.6" />
16-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Dapper" Version="2.0.78" />
11+
<PackageReference Include="MessagePack" Version="2.2.85" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
13+
<PackageReference Include="Ulid" Version="1.2.6" />
14+
<PackageReference Include="Ulid.MessagePack" Version="1.2.6" />
15+
</ItemGroup>
1716

18-
<ItemGroup>
19-
<ProjectReference Include="..\..\src\UnitGenerator\UnitGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
20-
</ItemGroup>
17+
<ItemGroup>
18+
<ProjectReference Include="..\..\src\UnitGenerator\UnitGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
19+
</ItemGroup>
2120

2221
</Project>

‎sandbox/FileGenerate/FileGenerate.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
6-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
7-
<CompilerGeneratedFilesOutputPath>$(ProjectDir)..\Generated</CompilerGeneratedFilesOutputPath>
8-
<IsPackable>false</IsPackable>
9-
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<ProjectReference Include="..\..\src\UnitGenerator\UnitGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
13-
</ItemGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
6+
<CompilerGeneratedFilesOutputPath>$(ProjectDir)..\Generated</CompilerGeneratedFilesOutputPath>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\..\src\UnitGenerator\UnitGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
11+
</ItemGroup>
1412

1513
</Project>

‎src/EntityFrameworkApp/EntityFrameworkApp.csproj‎

Lines changed: 13 additions & 14 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>net7.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
<IsPackable>false</IsPackable>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net7.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
109

11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10" />
14-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10" />
13+
</ItemGroup>
1514

16-
<ItemGroup>
17-
<ProjectReference Include="..\UnitGenerator\UnitGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
18-
</ItemGroup>
15+
<ItemGroup>
16+
<ProjectReference Include="..\UnitGenerator\UnitGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
17+
</ItemGroup>
1918
</Project>

‎src/UnitGenerator/UnitGenerator.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>13</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<NoWarn>$(NoWarn);CS1591</NoWarn>
8-
<IsRoslynComponent>true</IsRoslynComponent>
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<LangVersion>13</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<NoWarn>$(NoWarn);CS1591</NoWarn>
8+
<IsRoslynComponent>true</IsRoslynComponent>
99

10-
<!-- does not need runtime self -->
11-
<IncludeBuildOutput>false</IncludeBuildOutput>
12-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
13-
<IncludeSymbols>false</IncludeSymbols>
14-
<DevelopmentDependency>true</DevelopmentDependency>
10+
<!-- does not need runtime self -->
11+
<IncludeBuildOutput>false</IncludeBuildOutput>
12+
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
13+
<IncludeSymbols>false</IncludeSymbols>
14+
<DevelopmentDependency>true</DevelopmentDependency>
1515

16-
<!-- NuGet -->
17-
<PackageId>UnitGenerator</PackageId>
18-
<Description>C# Source Generator to create value-object, inspired by units of measure.</Description>
19-
<IsPackable>true</IsPackable>
20-
</PropertyGroup>
16+
<!-- NuGet -->
17+
<IsPackable>true</IsPackable>
18+
<PackageId>UnitGenerator</PackageId>
19+
<Description>C# Source Generator to create value-object, inspired by units of measure.</Description>
20+
<IsPackable>true</IsPackable>
21+
</PropertyGroup>
2122

22-
<ItemGroup>
23-
<!-- Create nuget package as analyzer -->
24-
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
25-
</ItemGroup>
23+
<ItemGroup>
24+
<!-- Create nuget package as analyzer -->
25+
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
26+
</ItemGroup>
2627

27-
<ItemGroup>
28-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" PrivateAssets="all" />
29-
</ItemGroup>
28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" PrivateAssets="all" />
30+
</ItemGroup>
3031

31-
<ItemGroup>
32-
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
33-
</ItemGroup>
32+
<ItemGroup>
33+
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
34+
</ItemGroup>
3435

3536
</Project>

‎tests/UnitGenerator.NET9.Tests/UnitGenerator.NET9.Tests.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
6-
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87

98
<ItemGroup>
@@ -18,7 +17,7 @@
1817
<ProjectReference Include="..\..\src\UnitGenerator\UnitGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
1918
</ItemGroup>
2019

21-
<ItemGroup>
20+
<ItemGroup>
2221
<Using Include="Xunit" />
2322
</ItemGroup>
2423

‎tests/UnitGenerator.Tests/UnitGenerator.Tests.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<LangVersion>latest</LangVersion>
6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
6+
</PropertyGroup>
87

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
11-
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
<PrivateAssets>all</PrivateAssets>
15-
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="1.3.0">
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
<PrivateAssets>all</PrivateAssets>
19-
</PackageReference>
20-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
10+
<PackageReference Include="xunit" Version="2.4.1" />
11+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
<PrivateAssets>all</PrivateAssets>
14+
</PackageReference>
15+
<PackageReference Include="coverlet.collector" Version="1.3.0">
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
<PrivateAssets>all</PrivateAssets>
18+
</PackageReference>
19+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
20+
<PackageReference Include="Dapper" Version="2.0.78" />
21+
<PackageReference Include="MessagePack" Version="2.2.85" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
23+
</ItemGroup>
2124

22-
<ItemGroup>
23-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
24-
<PackageReference Include="Dapper" Version="2.0.78" />
25-
<PackageReference Include="MessagePack" Version="2.2.85" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
27-
<ProjectReference Include="..\..\src\UnitGenerator\UnitGenerator.csproj" />
28-
</ItemGroup>
25+
<ItemGroup>
26+
<ProjectReference Include="..\..\src\UnitGenerator\UnitGenerator.csproj" />
27+
</ItemGroup>
2928

3029
</Project>

0 commit comments

Comments
 (0)