Skip to content

Commit 34ef6db

Browse files
committed
Updated package.
1 parent a14c0d6 commit 34ef6db

File tree

6 files changed

+93
-5
lines changed

6 files changed

+93
-5
lines changed

RelaxVersioner.Core.Tests/RelaxVersioner.Core.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<PackageReference Include="NUnit" Version="4.2.2" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1313
<PackageReference Include="Verify.NUnit" Version="26.3.1" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1415
</ItemGroup>
1516

1617
<ItemGroup>

RelaxVersioner.Core/RelaxVersioner.Core.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
<ItemGroup>
1515
<PackageReference Include="GitReader" Version="1.8.0" />
1616
<PackageReference Include="NamingFormatter" Version="2.4.0" />
17+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1718
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
1819
<PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
19-
Include="RelaxVersioner" Version="3.6.0" PrivateAssets="all" />
20+
Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
2021
</ItemGroup>
2122

2223
<ItemGroup>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
////////////////////////////////////////////////////////////////////////////////////////
2+
//
3+
// RelaxVersioner - Git tag/branch based, full-automatic version generator.
4+
// Copyright (c) Kouji Matsui (@kozy_kekyo, @[email protected])
5+
//
6+
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
7+
//
8+
////////////////////////////////////////////////////////////////////////////////////////
9+
10+
#nullable enable
11+
12+
using System;
13+
using System.Collections.Generic;
14+
using System.Diagnostics;
15+
using System.Globalization;
16+
using System.IO;
17+
using System.Text;
18+
using NamingFormatter;
19+
using Newtonsoft.Json;
20+
21+
namespace RelaxVersioner.Writers;
22+
23+
internal sealed class NpmReplaceProvider : WriteProviderBase
24+
{
25+
public override string Language => "NPM";
26+
27+
public override void Write(
28+
ProcessorContext context,
29+
Dictionary<string, object?> keyValues,
30+
DateTimeOffset generated)
31+
{
32+
void Replace(TextReader tr, TextWriter tw)
33+
{
34+
var jr = new JsonTextReader(tr);
35+
36+
37+
38+
while (true)
39+
{
40+
var line = tr.ReadLine();
41+
if (line == null)
42+
{
43+
break;
44+
}
45+
46+
var formattedLine = Named.Format(
47+
CultureInfo.InvariantCulture,
48+
line,
49+
keyValues,
50+
key => string.Empty,
51+
new(context.BracketStart, context.BracketEnd));
52+
53+
tw.WriteLine(formattedLine);
54+
}
55+
56+
tw.Flush();
57+
}
58+
59+
if (!string.IsNullOrWhiteSpace(context.OutputPath))
60+
{
61+
if (context.IsDryRun)
62+
{
63+
return;
64+
}
65+
66+
Processor.WriteSafeTransacted(
67+
context.OutputPath,
68+
stream =>
69+
{
70+
using var tr = context.ReplaceInputPath is { } rip ?
71+
new StreamReader(rip, Encoding.UTF8, true) :
72+
Console.In;
73+
var tw = new StreamWriter(stream, Encoding.UTF8);
74+
75+
Replace(tr, tw);
76+
});
77+
}
78+
else
79+
{
80+
using var tr = context.ReplaceInputPath is { } rip ?
81+
new StreamReader(rip, Encoding.UTF8, true) :
82+
Console.In;
83+
Replace(tr, Console.Out);
84+
}
85+
}
86+
}

RelaxVersioner.Tasks/RelaxVersioner.Tasks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ItemGroup>
3030
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
3131
<PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
32-
Include="RelaxVersioner" Version="3.6.0" PrivateAssets="all" />
32+
Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
3333
</ItemGroup>
3434

3535
</Project>

RelaxVersioner/RelaxVersioner.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
3838
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
3939
<PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
40-
Include="RelaxVersioner" Version="3.6.0" PrivateAssets="all" />
40+
Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

rv-cli/rv-cli.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
<ItemGroup>
2828
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
2929
<PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
30-
Include="RelaxVersioner" Version="3.6.0" PrivateAssets="all" />
30+
Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
3131
</ItemGroup>
3232

3333
<ItemGroup>
3434
<ProjectReference Include="..\RelaxVersioner.Core\RelaxVersioner.Core.csproj" />
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<None Include="..\Images\RelaxVersioner.100.png" Link="Images\RelaxVersioner.100.png" Pack="true" PackagePath="\" />
38+
<None Include="..\Images\RelaxVersioner.100.png" Pack="true" PackagePath="" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

0 commit comments

Comments
 (0)