Skip to content

fix: don't break on csproj without a version set #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2024
Merged

fix: don't break on csproj without a version set #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4c97e5
fix: don't break on csproj without a version set
nover Dec 20, 2024
9ff686f
Merge branch 'master' into fix/116-support-no-version-field
nover Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Vcs/Git/GitVcs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private static bool LaunchGitWithArgs(string args, int waitForExitTimeMs = 1000,
var startInfo = CreateGitShellStartInfo(args);
var proc = Process.Start(startInfo);
proc.WaitForExit(waitForExitTimeMs);

return proc.ExitCode == exitCode;
}
catch (Exception ex)
Expand Down
15 changes: 5 additions & 10 deletions src/VersionCli.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,12 @@ public VersionInfo Execute(VersionCliArgs args)

private SemVer GetCurrentSemVerFromSource()
{
if (_fileParser.VersionSource == ProjectFileProperty.Version)
return _fileParser.VersionSource switch
{
return SemVer.FromString(_fileParser.Version);
}

if (_fileParser.VersionSource == ProjectFileProperty.PackageVersion)
{
return SemVer.FromString(_fileParser.PackageVersion);
}

return SemVer.FromString(_fileParser.VersionPrefix);
ProjectFileProperty.Version => SemVer.FromString(string.IsNullOrWhiteSpace(_fileParser.Version) ? "0.0.0" : _fileParser.Version),
ProjectFileProperty.PackageVersion => SemVer.FromString(string.IsNullOrWhiteSpace(_fileParser.PackageVersion) ? "0.0.0" : _fileParser.PackageVersion),
_ => SemVer.FromString(string.IsNullOrWhiteSpace(_fileParser.VersionPrefix) ? "0.0.0" : _fileParser.VersionPrefix)
};
}

public void DumpVersion(VersionCliArgs args)
Expand Down
1 change: 1 addition & 0 deletions test/Versioning/SemVerBumperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public SemVerBumperTests()
[InlineData("2.1.0", VersionBump.PrePatch, 2, 1, 1, "next.0", "")]
[InlineData("3.2.1", VersionBump.Specific, 3, 2, 1, "", "")]
[InlineData("3.2.1-0+master", VersionBump.Specific, 3, 2, 1, "0", "master")]
[InlineData("6.0.2-1-g609a472", VersionBump.Specific, 6, 0, 2, "1-g609a472", "")]
public void CanBumpVersions(
string version,
VersionBump bump,
Expand Down