Skip to content

Commit 272a6fd

Browse files
committed
Rename VersionAsFloat to NormalizedVersion
1 parent 9c92fb3 commit 272a6fd

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
1414
public string Name { get; }
1515
public string Id { get; }
1616
public string VersionString { get; }
17-
public CoreTools.Version VersionAsFloat { get; }
18-
public CoreTools.Version NewVersionAsFloat { get; }
17+
public CoreTools.Version NormalizedVersion { get; }
18+
public CoreTools.Version NormalizedNewVersion { get; }
1919
public IManagerSource Source { get; }
2020
public IPackageManager Manager { get; }
2121
public string NewVersionString { get; }

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/PackageCacher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static bool NewerVersionIsInstalled(Package other)
102102
{
103103
foreach (Package found in __installed_pkgs.Values)
104104
{
105-
if (found.IsEquivalentTo(other) && found.VersionAsFloat == other.NewVersionAsFloat)
105+
if (found.IsEquivalentTo(other) && found.NormalizedVersion == other.NormalizedNewVersion)
106106
{
107107
return true;
108108
}

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/InvalidImportedPackage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public bool IsChecked
3535

3636
public string VersionString { get; }
3737

38-
public CoreTools.Version VersionAsFloat { get; }
38+
public CoreTools.Version NormalizedVersion { get; }
3939

40-
public CoreTools.Version NewVersionAsFloat { get => CoreTools.Version.Null; }
40+
public CoreTools.Version NormalizedNewVersion { get => CoreTools.Version.Null; }
4141

4242
public IManagerSource Source { get; }
4343

@@ -60,7 +60,7 @@ public InvalidImportedPackage(SerializableIncompatiblePackage_v1 data, IManagerS
6060
Name = data.Name;
6161
Id = data.Id.Split('\\')[^1];
6262
VersionString = data.Version;
63-
VersionAsFloat = CoreTools.VersionStringToStruct(data.Version);
63+
NormalizedVersion = CoreTools.VersionStringToStruct(data.Version);
6464
SourceAsString = data.Source;
6565
AutomationName = data.Name;
6666
Manager = source.Manager;

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public bool IsChecked
5252
public string AutomationName { get; }
5353
public string Id { get; }
5454
public virtual string VersionString { get; }
55-
public CoreTools.Version VersionAsFloat { get; }
56-
public CoreTools.Version NewVersionAsFloat { get; }
55+
public CoreTools.Version NormalizedVersion { get; }
56+
public CoreTools.Version NormalizedNewVersion { get; }
5757
public bool IsPopulated { get; set; }
5858
public IManagerSource Source { get; }
5959

@@ -78,7 +78,7 @@ public Package(
7878
Name = name;
7979
Id = id;
8080
VersionString = version;
81-
VersionAsFloat = CoreTools.VersionStringToStruct(version);
81+
NormalizedVersion = CoreTools.VersionStringToStruct(version);
8282
Source = source;
8383
Manager = manager;
8484

@@ -126,7 +126,7 @@ public Package(
126126
{
127127
IsUpgradable = true;
128128
NewVersionString = new_version;
129-
NewVersionAsFloat = CoreTools.VersionStringToStruct(new_version);
129+
NormalizedNewVersion = CoreTools.VersionStringToStruct(new_version);
130130
}
131131

132132
public long GetHash()

src/UniGetUI/Controls/ObservablePackageCollection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ public void SetSorter(Sorter field)
5252
break;
5353

5454
case Sorter.Version:
55-
SortingSelector = x => x.Package.VersionAsFloat;
55+
SortingSelector = x => x.Package.NormalizedVersion;
5656
break;
5757

5858
case Sorter.NewVersion:
59-
SortingSelector = x => x.Package.NewVersionAsFloat;
59+
SortingSelector = x => x.Package.NormalizedNewVersion;
6060
break;
6161

6262
case Sorter.Source:

src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ static int Comparison(IPackage x, IPackage y)
569569
{
570570
if (x.Id != y.Id) return String.Compare(x.Id, y.Id, StringComparison.Ordinal);
571571
if (x.Name != y.Name) return String.Compare(x.Name, y.Name, StringComparison.Ordinal);
572-
return (x.VersionAsFloat > y.VersionAsFloat) ? -1 : 1;
572+
return (x.NormalizedVersion > y.NormalizedVersion) ? -1 : 1;
573573
}
574574

575575
foreach (IPackage package in packages)

0 commit comments

Comments
 (0)