Skip to content

Commit 48d3a44

Browse files
TimmyMCTimmyMC
committed
fix packing after creating the common project
1 parent af9dd7f commit 48d3a44

File tree

7 files changed

+30
-16
lines changed

7 files changed

+30
-16
lines changed

‎Benchmarks/Schema.NET.Benchmarks/Schema.NET.Benchmarks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup Label="Project References">
10-
<ProjectReference Include="..\..\Source\Schema.NET\Schema.NET.csproj" />
10+
<ProjectReference Include="..\..\Source\Schema.NET.Common\Schema.NET.Common.csproj" />
1111
</ItemGroup>
1212

1313
<ItemGroup Label="Package References">

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[![Schema.NET NuGet Package](https://img.shields.io/nuget/v/Schema.NET.svg)](https://www.nuget.org/packages/Schema.NET)
2+
[![build](https://github.com/TimmyMC/Schema.NET/actions/workflows/build.yml/badge.svg)](https://github.com/TimmyMC/Schema.NET/actions/workflows/build.yml)
23

34
[//]: # ([![Schema.NET NuGet Package Downloads]&#40;https://img.shields.io/nuget/dt/Schema.NET&#41;]&#40;https://www.nuget.org/packages/Schema.NET&#41;)
45

‎Source/Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
44

55
<PropertyGroup Label="Build">
6+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
67
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<RootNamespace>Schema.NET</RootNamespace>
79
</PropertyGroup>
810

911
<ItemGroup Label="Source Generator Options">

‎Source/Schema.NET.Common/Schema.NET.Common.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
5-
<RootNamespace>Schema.NET</RootNamespace>
6-
<EmitCompilerGeneratedFiles>True</EmitCompilerGeneratedFiles>
7-
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
4+
<IsPackable>false</IsPackable>
85
</PropertyGroup>
96

107
<ItemGroup Label="Package References">

‎Source/Schema.NET.Pending/Schema.NET.Pending.csproj‎

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

33
<PropertyGroup Label="Build">
4-
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
4+
<EmitCompilerGeneratedFiles>True</EmitCompilerGeneratedFiles>
5+
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
56
<IncludePendingSchemaObjects>True</IncludePendingSchemaObjects>
67
</PropertyGroup>
78

@@ -17,8 +18,16 @@
1718
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
1819
</ItemGroup>
1920

20-
<ItemGroup Label="Project References">
21-
<ProjectReference Include="..\Schema.NET.Common\Schema.NET.Common.csproj" />
21+
<ItemGroup Label="Package References">
22+
<ProjectReference Include="../../Tools/Schema.NET.Tool/Schema.NET.Tool.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
23+
</ItemGroup>
24+
25+
<ItemGroup Label="Common Code">
26+
<Compile Include="../Schema.NET.Common/*.cs" />
27+
</ItemGroup>
28+
29+
<ItemGroup Label="Source Generation">
30+
<AdditionalFiles Include="../../Data/*.*" LinkBase="Data" />
2231
</ItemGroup>
2332

2433
</Project>

‎Source/Schema.NET/Schema.NET.csproj‎

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

33
<PropertyGroup Label="Build">
4-
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
4+
<EmitCompilerGeneratedFiles>True</EmitCompilerGeneratedFiles>
5+
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
56
<IncludePendingSchemaObjects>False</IncludePendingSchemaObjects>
67
</PropertyGroup>
78

@@ -16,8 +17,16 @@
1617
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
1718
</ItemGroup>
1819

19-
<ItemGroup Label="Project References">
20-
<ProjectReference Include="..\Schema.NET.Common\Schema.NET.Common.csproj" />
20+
<ItemGroup Label="Package References">
21+
<ProjectReference Include="../../Tools/Schema.NET.Tool/Schema.NET.Tool.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
22+
</ItemGroup>
23+
24+
<ItemGroup Label="Common Code">
25+
<Compile Include="../Schema.NET.Common/*.cs" />
26+
</ItemGroup>
27+
28+
<ItemGroup Label="Source Generation">
29+
<AdditionalFiles Include="../../Data/*.*" LinkBase="Data" />
2130
</ItemGroup>
2231

2332
</Project>

‎Tests/Schema.NET.Test/Schema.NET.Test.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup Label="Project References">
8-
<ProjectReference Include="..\..\Source\Schema.NET\Schema.NET.csproj" />
8+
<ProjectReference Include="..\..\Source\Schema.NET.Common\Schema.NET.Common.csproj" />
99
</ItemGroup>
1010

1111
<ItemGroup>
@@ -22,8 +22,4 @@
2222
</PackageReference>
2323
</ItemGroup>
2424

25-
<ItemGroup>
26-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
27-
</ItemGroup>
28-
2925
</Project>

0 commit comments

Comments
 (0)