Skip to content

Commit 744989b

Browse files
committed
fixes
1 parent 1c9509f commit 744989b

File tree

3 files changed

+26
-9
lines changed

3 files changed

+26
-9
lines changed

CHANGELOG.md

+20
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,26 @@
3737
[2.5.1]: https://github.com/eaba/AvroSchemaGenerator/tree/2.5.1
3838

3939

40+
[vNext]: https://github.com/eaba/AvroSchemaGenerator/compare/2.10.0...HEAD
41+
[2.10.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.9.1...2.10.0
42+
[2.9.1]: https://github.com/eaba/AvroSchemaGenerator/compare/2.9.0...2.9.1
43+
[2.9.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.8.0...2.9.0
44+
[2.8.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.7.0...2.8.0
45+
[2.7.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.6.0...2.7.0
46+
[2.6.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.5.2-Alpha.1...2.6.0
47+
[2.5.2-Alpha.1]: https://github.com/eaba/AvroSchemaGenerator/compare/2.5.1...2.5.2-Alpha.1
48+
[2.5.1]: https://github.com/eaba/AvroSchemaGenerator/tree/2.5.1
49+
50+
[vNext]: https://github.com/eaba/AvroSchemaGenerator/compare/2.10.0...HEAD
51+
[2.10.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.9.1...2.10.0
52+
[2.9.1]: https://github.com/eaba/AvroSchemaGenerator/compare/2.9.0...2.9.1
53+
[2.9.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.8.0...2.9.0
54+
[2.8.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.7.0...2.8.0
55+
[2.7.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.6.0...2.7.0
56+
[2.6.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.5.2-Alpha.1...2.6.0
57+
[2.5.2-Alpha.1]: https://github.com/eaba/AvroSchemaGenerator/compare/2.5.1...2.5.2-Alpha.1
58+
[2.5.1]: https://github.com/eaba/AvroSchemaGenerator/tree/2.5.1
59+
4060
[vNext]: https://github.com/eaba/AvroSchemaGenerator/compare/2.10.0...HEAD
4161
[2.10.0]: https://github.com/eaba/AvroSchemaGenerator/compare/2.9.1...2.10.0
4262
[2.9.1]: https://github.com/eaba/AvroSchemaGenerator/compare/2.9.0...2.9.1

SchemaGenerator/AvroSchemaGenerator.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<PackageIcon>avro-schema.png</PackageIcon>
1212
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1313
<PackageIconUrl />
14-
<Version>1.0.0</Version>
1514
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1615
</PropertyGroup>
1716

build/Build.cs

+6-8
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
using Nuke.Common.Tools.GitVersion;
1212
using Nuke.Common.Utilities;
1313
using Nuke.Common.Utilities.Collections;
14-
using static Nuke.Common.IO.PathConstruction;
1514
using static Nuke.Common.Tools.DotNet.DotNetTasks;
16-
using static Nuke.Common.IO.FileSystemTasks;
1715
using static Nuke.Common.ChangeLog.ChangelogTasks;
1816
using static Nuke.Common.Tools.Git.GitTasks;
1917
using Nuke.Common.ChangeLog;
@@ -62,7 +60,7 @@ partial class Build : NukeBuild
6260

6361
public ReleaseNotes LatestVersion => Changelog.ReleaseNotes.OrderByDescending(s => s.Version).FirstOrDefault() ?? throw new ArgumentException("Bad Changelog File. Version Should Exist");
6462
public string ReleaseVersion => LatestVersion.Version?.ToString() ?? throw new ArgumentException("Bad Changelog File. Define at least one version");
65-
string TagVersion => GitRepository.Tags.SingleOrDefault()?[1..];
63+
string TagVersion => GitVersion.MajorMinorPatch;
6664

6765
bool IsTaggedBuild => !string.IsNullOrWhiteSpace(TagVersion);
6866

@@ -100,7 +98,7 @@ protected override void OnBuildInitialized()
10098
//.OnlyWhenStatic(() => InvokedTargets.Contains(nameof(RunChangelog)))
10199
.Executes(() =>
102100
{
103-
FinalizeChangelog(ChangelogFile, GitVersion.MajorMinorPatch, GitRepository);
101+
FinalizeChangelog(ChangelogFile, TagVersion, GitRepository);
104102
Git($"add {ChangelogFile}");
105103
//Git($"commit -m \"Finalize {Path.GetFileName(ChangelogFile)} for {GitVersion.SemVer}.\"");
106104
//Git($"tag -f {GitVersion.SemVer}");
@@ -153,7 +151,7 @@ protected override void OnBuildInitialized()
153151
});
154152

155153
Target Pack => _ => _
156-
.DependsOn(Test)
154+
.DependsOn(Compile)
157155
//.DependsOn(RunChangelog)// requires authrntication in github action
158156
.Executes(() =>
159157
{
@@ -164,13 +162,13 @@ protected override void OnBuildInitialized()
164162
DotNetPack(s => s
165163
.SetProject(project)
166164
.SetConfiguration(Configuration)
167-
.EnableNoBuild()
168-
165+
//.EnableNoBuild()
166+
.SetVersion(TagVersion)
169167
.EnableNoRestore()
170168
.SetAssemblyVersion(TagVersion)
171169
.SetFileVersion(TagVersion)
172170
.SetInformationalVersion(TagVersion)
173-
.SetVersionSuffix(VersionSuffix)
171+
//.SetVersionSuffix(VersionSuffix)
174172
.SetPackageReleaseNotes(releaseNotes)
175173
.SetDescription("Generate Avro Schema with support for RECURSIVE SCHEMA")
176174
.SetPackageTags("Avro", "Schema Generator")

0 commit comments

Comments
 (0)