Skip to content

Commit 0aea586

Browse files
committed
Remove dep on generator for ref aseembly
1 parent 9926a77 commit 0aea586

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

ChartTools/ChartTools.Generator/MetadataMapGenerator.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ void RegisterMapper(FileType fileType)
110110
(ctx, mapper) =>
111111
{
112112
CodeBuilder builder = OpenPartialMapperClass(mapper)
113-
.AppendLine($"public static {mapper.Name} Shared {{ get; }} = new();")
114-
.AppendLine($"public override FileType FileType => FileType.{mapper.FileType};")
115-
.AppendLine($"private {mapper.Name}() {{ }}")
116113
.AppendInstruction(TryGetSignature)
117114
.AppendInstruction(TrySetSignature)
118115
.AppendInstruction(TryRemoveSignature)

ChartTools/ChartTools/ChartTools.csproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,24 @@
3333

3434
<ItemGroup>
3535
<ProjectReference Include="..\ChartTools.Common\ChartTools.Common.csproj" />
36-
<ProjectReference Include="..\ChartTools.Generator\ChartTools.Generator.csproj" OutputItemType="Analyzer" />
3736
</ItemGroup>
3837

38+
<ItemGroup Condition="'$(ProduceOnlyReferenceAssembly)' != 'true'">
39+
<ProjectReference Include="..\ChartTools.Generator\ChartTools.Generator.csproj" OutputItemType="Analyzer" />
40+
</ItemGroup>
41+
3942
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
43+
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
4044
<Reference Include="Bcl.CollectionsMarshal">
4145
<HintPath>..\Dependencies\bin\$(TargetFramework)\Bcl.CollectionsMarshal.dll</HintPath>
4246
</Reference>
4347
</ItemGroup>
4448

4549
<Target Name="CopyDataFiles" AfterTargets="PostBuildEvent">
4650
<ItemGroup>
47-
<Files Include="$(OutDir)ChartTools*.dll;$(OutDir)ChartTools*.xml"/>
51+
<Files Include="$(OutDir)ChartTools*.dll;$(OutDir)ChartTools*.xml" />
4852
</ItemGroup>
49-
<Copy
50-
SourceFiles="@(Files)"
51-
DestinationFolder="$(ProjectDir)artifacts"
52-
SkipUnchangedFiles="true" />
53+
<Copy SourceFiles="@(Files)" DestinationFolder="$(ProjectDir)artifacts" SkipUnchangedFiles="true" />
5354
</Target>
5455

5556
</Project>

ChartTools/ChartTools/Meta/Mapping/MetadataChartMapper.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ namespace ChartTools.Meta.Mapping;
66
[MetadataMapper(FileType.Chart)]
77
internal sealed partial class MetadataChartMapper : MetadataMapper
88
{
9+
private MetadataChartMapper() { }
10+
11+
public static MetadataChartMapper Shared { get; } = new();
12+
13+
public override FileType FileType => FileType.Chart;
14+
915
public override string? Get(Metadata metadata, in ReadOnlySpan<char> key)
1016
{
1117
ValidateKey(in key);

ChartTools/ChartTools/Meta/Mapping/MetadataIniMapper.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ namespace ChartTools.Meta.Mapping;
77
[MetadataMapper(FileType.Ini)]
88
internal partial class MetadataIniMapper : MetadataMapper
99
{
10+
private MetadataIniMapper() { }
11+
12+
public static MetadataIniMapper Shared { get; } = new();
13+
14+
public override FileType FileType => FileType.Ini;
15+
1016
public override string? Get(Metadata metadata, in ReadOnlySpan<char> key)
1117
{
1218
ValidateKey(in key);

0 commit comments

Comments
 (0)