Skip to content

Commit 8ed5048

Browse files
guitarrapcguitarrapc
committed
chore: Specify IsPackable=false on Directory.Build.props, explicitly true for target packages.
1 parent 2e8bc65 commit 8ed5048

File tree

11 files changed

+295
-300
lines changed

11 files changed

+295
-300
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<!-- NuGet Packaging -->
5+
<IsPackable>false</IsPackable>
56
<PackageVersion>$(Version)</PackageVersion>
67
<Company>Cysharp</Company>
78
<Authors>Cysharp</Authors>
@@ -19,7 +20,9 @@
1920
</PropertyGroup>
2021

2122
<ItemGroup>
23+
<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
2224
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
25+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)LICENSE" />
2326
</ItemGroup>
2427

2528
</Project>

‎sandbox/Benchmark/Benchmark.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
10-
<PackageReference Include="log4net" Version="2.0.15" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
12-
<PackageReference Include="NLog" Version="5.2.5" />
13-
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.5" />
14-
<PackageReference Include="Serilog" Version="3.1.1" />
15-
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
16-
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
17-
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
18-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
19-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
20-
<PackageReference Include="Serilog.Sinks.TextWriter" Version="2.1.0" />
21-
<PackageReference Include="System.IO.Hashing" Version="8.0.0" />
22-
<PackageReference Include="ZeroLog" Version="2.2.0" />
23-
</ItemGroup>
24-
<ItemGroup>
25-
<ProjectReference Include="..\..\src\ZLogger\ZLogger.csproj" />
26-
<ProjectReference Include="..\..\src\ZLogger.Generator\ZLogger.Generator.csproj">
27-
<OutputItemType>Analyzer</OutputItemType>
28-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
29-
</ProjectReference>
30-
</ItemGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
9+
<PackageReference Include="log4net" Version="2.0.15" />
10+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
11+
<PackageReference Include="NLog" Version="5.2.5" />
12+
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.5" />
13+
<PackageReference Include="Serilog" Version="3.1.1" />
14+
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
15+
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
16+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
17+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
18+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
19+
<PackageReference Include="Serilog.Sinks.TextWriter" Version="2.1.0" />
20+
<PackageReference Include="System.IO.Hashing" Version="8.0.0" />
21+
<PackageReference Include="ZeroLog" Version="2.2.0" />
22+
</ItemGroup>
23+
<ItemGroup>
24+
<ProjectReference Include="..\..\src\ZLogger\ZLogger.csproj" />
25+
<ProjectReference Include="..\..\src\ZLogger.Generator\ZLogger.Generator.csproj">
26+
<OutputItemType>Analyzer</OutputItemType>
27+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
28+
</ProjectReference>
29+
</ItemGroup>
3130
</Project>

‎sandbox/ConsoleApp/ConsoleApp.csproj‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
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-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
8+
</PropertyGroup>
109

11-
<ItemGroup>
12-
<PackageReference Include="ConsoleAppFramework" Version="5.2.1">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="JetBrains.Profiler.Api" Version="1.4.0" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.8">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
</PackageReference>
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
22-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="ConsoleAppFramework" Version="5.2.1">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageReference>
15+
<PackageReference Include="JetBrains.Profiler.Api" Version="1.4.0" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.8">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
21+
</ItemGroup>
2322

24-
<ItemGroup>
25-
<AdditionalFiles Include="BannedSymbols.txt" />
26-
</ItemGroup>
23+
<ItemGroup>
24+
<AdditionalFiles Include="BannedSymbols.txt" />
25+
</ItemGroup>
2726

28-
<ItemGroup>
29-
<ProjectReference Include="..\..\src\ZLogger.MessagePack\ZLogger.MessagePack.csproj" />
30-
<ProjectReference Include="..\..\src\ZLogger\ZLogger.csproj" />
31-
<ProjectReference Include="..\..\src\ZLogger.Generator\ZLogger.Generator.csproj">
32-
<OutputItemType>Analyzer</OutputItemType>
33-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
34-
</ProjectReference>
35-
</ItemGroup>
27+
<ItemGroup>
28+
<ProjectReference Include="..\..\src\ZLogger.MessagePack\ZLogger.MessagePack.csproj" />
29+
<ProjectReference Include="..\..\src\ZLogger\ZLogger.csproj" />
30+
<ProjectReference Include="..\..\src\ZLogger.Generator\ZLogger.Generator.csproj">
31+
<OutputItemType>Analyzer</OutputItemType>
32+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
33+
</ProjectReference>
34+
</ItemGroup>
3635

3736
</Project>

‎sandbox/GeneratorSandbox/GeneratorSandbox.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<LangVersion>12</LangVersion>
8-
<Nullable>enable</Nullable>
9-
<IsPackable>false</IsPackable>
10-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<LangVersion>12</LangVersion>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
1110

12-
<ItemGroup>
13-
<PackageReference Include="MessagePack" Version="2.5.187" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
15-
</ItemGroup>
11+
<ItemGroup>
12+
<PackageReference Include="MessagePack" Version="2.5.187" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
14+
</ItemGroup>
1615

17-
<ItemGroup>
18-
<ProjectReference Include="..\..\src\ZLogger\ZLogger.csproj" />
19-
<ProjectReference Include="..\..\src\ZLogger.Generator\ZLogger.Generator.csproj">
20-
<OutputItemType>Analyzer</OutputItemType>
21-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
22-
</ProjectReference>
23-
</ItemGroup>
16+
<ItemGroup>
17+
<ProjectReference Include="..\..\src\ZLogger\ZLogger.csproj" />
18+
<ProjectReference Include="..\..\src\ZLogger.Generator\ZLogger.Generator.csproj">
19+
<OutputItemType>Analyzer</OutputItemType>
20+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
21+
</ProjectReference>
22+
</ItemGroup>
2423

2524
</Project>

‎src/ZLogger.Generator/ZLogger.Generator.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>12</LangVersion>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<AnalyzerLanguage>cs</AnalyzerLanguage>
8-
<DefineConstants>ZLOGGER_GENERATOR</DefineConstants>
9-
<Nullable>enable</Nullable>
10-
<IsPackable>false</IsPackable>
11-
<PackageId>ZLogger.Generator</PackageId>
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<LangVersion>12</LangVersion>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<AnalyzerLanguage>cs</AnalyzerLanguage>
8+
<DefineConstants>ZLOGGER_GENERATOR</DefineConstants>
9+
<Nullable>enable</Nullable>
1210

13-
<IsRoslynComponent>true</IsRoslynComponent>
14-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
15-
<!-- We don't need to publish the package to NuGet. bundled with ZLogger -->
16-
<IsPackable>false</IsPackable>
17-
</PropertyGroup>
11+
<IsRoslynComponent>true</IsRoslynComponent>
12+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1813

19-
<ItemGroup>
20-
<Compile Include="..\ZLogger\ZLoggerMessageAttribtue.cs" Link="ZLoggerMessageAttribtue.cs" />
21-
</ItemGroup>
22-
<ItemGroup>
23-
<None Include="../../Icon.png" Pack="true" PackagePath="/" />
24-
<None Include="ZLoggerGenerator.Emitter.cs" />
25-
<None Include="ZLoggerGenerator.Parser.cs" />
14+
<!-- We don't need to publish the package to NuGet. bundled with ZLogger -->
15+
<IsPackable>false</IsPackable>
16+
<PackageId>ZLogger.Generator</PackageId>
17+
</PropertyGroup>
2618

27-
<!-- https://learn.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support?view=vs-2022 -->
28-
<!-- require to support SyntaxValueProvider.ForAttributeWithMetadataName(Roslyn 4.3.1, VS2022 17.3 -->
29-
<!-- Unity 2022.2 or newer is 4.1.0. -->
30-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" PrivateAssets="all" />
31-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
32-
<PrivateAssets>all</PrivateAssets>
33-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34-
</PackageReference>
35-
</ItemGroup>
19+
<ItemGroup>
20+
<Compile Include="..\ZLogger\ZLoggerMessageAttribtue.cs" Link="ZLoggerMessageAttribtue.cs" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<None Include="../../Icon.png" Pack="true" PackagePath="/" />
24+
<None Include="ZLoggerGenerator.Emitter.cs" />
25+
<None Include="ZLoggerGenerator.Parser.cs" />
26+
27+
<!-- https://learn.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support?view=vs-2022 -->
28+
<!-- require to support SyntaxValueProvider.ForAttributeWithMetadataName(Roslyn 4.3.1, VS2022 17.3 -->
29+
<!-- Unity 2022.2 or newer is 4.1.0. -->
30+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" PrivateAssets="all" />
31+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
35+
</ItemGroup>
3636
</Project>

‎src/ZLogger.MessagePack/ZLogger.MessagePack.csproj‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
4-
<Nullable>enable</Nullable>
5-
<LangVersion>12</LangVersion>
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
4+
<Nullable>enable</Nullable>
5+
<LangVersion>12</LangVersion>
66

7-
<!-- NuGet Packaging -->
8-
<PackageTags>logging;messagepack;</PackageTags>
9-
<Description>ZLogger plugin to format log results as messagepack.</Description>
10-
</PropertyGroup>
7+
<!-- NuGet Packaging -->
8+
<IsPackable>true</IsPackable>
9+
<PackageTags>logging;messagepack;</PackageTags>
10+
<Description>ZLogger plugin to format log results as messagepack.</Description>
11+
</PropertyGroup>
1112

12-
<ItemGroup>
13-
<None Include="../../Icon.png" Pack="true" PackagePath="/" />
14-
<InternalsVisibleTo Include="ZLogger.MessagePack.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000144ec28f1e9ef7b17dacc47425a7a153aea0a7baa590743a2d1a86f4b3e10a8a12712c6e647966bfd8bd6e830048b23bd42bbc56f179585c15b8c19cf86c0eed1b73c993dd7a93a30051dd50fdda0e4d6b65e6874e30f1c37cf8bcbc7fe02c7f2e6a0a3327c0ccc1631bf645f40732521fa0b41a30c178d08f7dd779d42a1ee" />
15-
</ItemGroup>
16-
17-
<ItemGroup>
18-
<ProjectReference Include="..\ZLogger\ZLogger.csproj" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<PackageReference Include="MessagePack" Version="2.5.187" />
22-
<PackageReference Include="PolySharp" Version="1.13.2">
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
26-
</ItemGroup>
13+
<ItemGroup>
14+
<InternalsVisibleTo Include="ZLogger.MessagePack.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000144ec28f1e9ef7b17dacc47425a7a153aea0a7baa590743a2d1a86f4b3e10a8a12712c6e647966bfd8bd6e830048b23bd42bbc56f179585c15b8c19cf86c0eed1b73c993dd7a93a30051dd50fdda0e4d6b65e6874e30f1c37cf8bcbc7fe02c7f2e6a0a3327c0ccc1631bf645f40732521fa0b41a30c178d08f7dd779d42a1ee" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<ProjectReference Include="..\ZLogger\ZLogger.csproj" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<PackageReference Include="MessagePack" Version="2.5.187" />
22+
<PackageReference Include="PolySharp" Version="1.13.2">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
26+
</ItemGroup>
2727
</Project>

0 commit comments

Comments
 (0)