Skip to content

Commit 7869a22

Browse files
Merge pull request #89 from atc-net/bug/fix-nuget-version-updater
Bug fix for nuget version updates - do not upgrade on major version change
2 parents de517ca + 298e7f6 commit 7869a22

File tree

8 files changed

+32
-33
lines changed

8 files changed

+32
-33
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<ItemGroup Label="Code Analyzers">
4444
<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
4545
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
46-
<PackageReference Include="Meziantou.Analyzer" Version="1.0.697" PrivateAssets="All" />
46+
<PackageReference Include="Meziantou.Analyzer" Version="1.0.698" PrivateAssets="All" />
4747
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.2" PrivateAssets="All" />
4848
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
49-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.36.1.44192" PrivateAssets="All" />
49+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.37.0.45539" PrivateAssets="All" />
5050
</ItemGroup>
5151

5252
</Project>

src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Atc" Version="2.0.95" />
12+
<PackageReference Include="Atc" Version="2.0.115" />
1313
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
1414
</ItemGroup>
1515

src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Atc" Version="2.0.95" />
17-
<PackageReference Include="Atc.Console.Spectre" Version="2.0.95" />
18-
<PackageReference Include="EPPlus" Version="5.8.6" />
16+
<PackageReference Include="Atc" Version="2.0.115" />
17+
<PackageReference Include="Atc.Console.Spectre" Version="2.0.115" />
18+
<PackageReference Include="EPPlus" Version="5.8.8" />
1919
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
2020
</ItemGroup>
2121

src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Atc" Version="2.0.95" />
9-
<PackageReference Include="Atc.DotNet" Version="2.0.95" />
10-
<PackageReference Include="Atc.Console.Spectre" Version="2.0.95" />
8+
<PackageReference Include="Atc" Version="2.0.115" />
9+
<PackageReference Include="Atc.DotNet" Version="2.0.115" />
10+
<PackageReference Include="Atc.Console.Spectre" Version="2.0.115" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

src/Atc.CodingRules.Updater/DirectoryBuildPropsHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private static List<DotnetNugetPackage> GetPackageReferencesThatNeedsToBeUpdated
198198
var latestVersion = AtcApiNugetClientHelper.GetLatestVersionForPackageId(logger, item.PackageId, CancellationToken.None);
199199

200200
if (latestVersion is not null &&
201-
latestVersion.GreaterThan(version, significantParts: 4, startingPart: 2))
201+
latestVersion.IsNewerThan(version, withinMinorReleaseOnly: true))
202202
{
203203
result.Add(
204204
new DotnetNugetPackage(
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
1-
namespace Atc.CodingRules.Updater.Models
1+
namespace Atc.CodingRules.Updater.Models;
2+
3+
public class DotnetNugetPackage
24
{
3-
public class DotnetNugetPackage
5+
public DotnetNugetPackage(string packageId, Version currentVersion)
46
{
5-
public DotnetNugetPackage(string packageId, Version currentVersion)
6-
{
7-
this.PackageId = packageId;
8-
this.Version = currentVersion;
9-
this.NewestVersion = currentVersion;
10-
}
7+
this.PackageId = packageId;
8+
this.Version = currentVersion;
9+
this.NewestVersion = currentVersion;
10+
}
1111

12-
public DotnetNugetPackage(string packageId, Version currentVersion, Version newestVersion)
13-
{
14-
this.PackageId = packageId;
15-
this.Version = currentVersion;
16-
this.NewestVersion = newestVersion;
17-
}
12+
public DotnetNugetPackage(string packageId, Version currentVersion, Version newestVersion)
13+
{
14+
this.PackageId = packageId;
15+
this.Version = currentVersion;
16+
this.NewestVersion = newestVersion;
17+
}
1818

19-
public string PackageId { get; }
19+
public string PackageId { get; }
2020

21-
public Version Version { get; }
21+
public Version Version { get; }
2222

23-
public Version NewestVersion { get; set; }
23+
public Version NewestVersion { get; set; }
2424

25-
public bool IsNewest => Version >= NewestVersion;
25+
public bool IsNewest => Version >= NewestVersion;
2626

27-
public override string ToString()
28-
=> $"{nameof(PackageId)}: {PackageId}, {nameof(Version)}: {Version}, {nameof(NewestVersion)}: {NewestVersion}, {nameof(IsNewest)}: {IsNewest}";
29-
}
27+
public override string ToString()
28+
=> $"{nameof(PackageId)}: {PackageId}, {nameof(Version)}: {Version}, {nameof(NewestVersion)}: {NewestVersion}, {nameof(IsNewest)}: {IsNewest}";
3029
}

src/Atc.CodingRules/Atc.CodingRules.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Atc" Version="2.0.95" />
10+
<PackageReference Include="Atc" Version="2.0.115" />
1111
</ItemGroup>
1212

1313
</Project>

test/Atc.CodingRules.AnalyzerProviders.Tests/Atc.CodingRules.AnalyzerProviders.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Atc.XUnit" Version="2.0.93" />
9+
<PackageReference Include="Atc.XUnit" Version="2.0.115" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

0 commit comments

Comments
 (0)