Update to .NET 10, upgrade dependencies and tests

tinohager · tinohager · commit 8fe32f769fde · 2026-01-10T16:33:31.000+01:00
Bump target frameworks to .NET 10 in all projects and workflows. Update GitHub Actions to latest versions and upgrade test/dependency packages. Refactor unit tests for improved assertion methods and exception handling.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Install project dependencies
       working-directory: ./src
       run: dotnet restore
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       working-directory: ./src
       run: dotnet restore
diff --git a/src/Nager.Country.Export/Nager.Country.Export.csproj b/src/Nager.Country.Export/Nager.Country.Export.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EnumExtensions.System.Text.Json" Version="1.2.0" />
+    <PackageReference Include="EnumExtensions.System.Text.Json" Version="1.3.0" />
     <PackageReference Include="Mapster" Version="7.4.0" />
   </ItemGroup>
 
diff --git a/src/Nager.Country.Translation/Nager.Country.Translation.csproj b/src/Nager.Country.Translation/Nager.Country.Translation.csproj
@@ -20,7 +20,7 @@
 
     <RepositoryUrl>https://github.com/nager/Nager.Country</RepositoryUrl>    
 
-    <TargetFrameworks>net48;netstandard2.0;netstandard2.1;net8;net9</TargetFrameworks>
+    <TargetFrameworks>net48;netstandard2.0;netstandard2.1;net9.0;net10.0</TargetFrameworks>
 	  
     <Version>4.3.3</Version>
   </PropertyGroup>
diff --git a/src/Nager.Country.UnitTest/Nager.Country.UnitTest.csproj b/src/Nager.Country.UnitTest/Nager.Country.UnitTest.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <Nullable>enable</Nullable>
 	  
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+    <PackageReference Include="FluentAssertions" Version="8.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Nager.Country.UnitTest/TranslationTest.cs b/src/Nager.Country.UnitTest/TranslationTest.cs
@@ -30,7 +30,7 @@ public void DuplicateTranslationTest()
         public void CheckTranslationsAvailableTest()
         {
             ITranslationProvider translationProvider = new TranslationProvider();
-            foreach (var countryCode in (Alpha2Code[])Enum.GetValues(typeof(Alpha2Code)))
+            foreach (var countryCode in Enum.GetValues<Alpha2Code>())
             {
                 var countryTranslation = translationProvider.GetCountryTranslation(countryCode);
                 if (countryTranslation is null)
@@ -39,7 +39,7 @@ public void CheckTranslationsAvailableTest()
                 }
 
                 var translationCount = countryTranslation.Translations.Length;
-                Assert.IsTrue(translationCount > 5, $"Missing translations for countryCode: {countryCode}");
+                Assert.IsGreaterThan(5, translationCount, $"Missing translations for countryCode: {countryCode}");
             }
         }
 
@@ -53,11 +53,14 @@ public void GetCountryTranslatedName_GermanyInEnglish_Successful()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(UnknownCountryException), "Cannot found a country for code XX")]
         public void GetCountryTranslatedName_InvalidAlphaCode_ThrowException()
         {
             ITranslationProvider translationProvider = new TranslationProvider();
-            translationProvider.GetCountryTranslatedName("XX", LanguageCode.EN);
+
+            var exception = Assert.ThrowsExactly<UnknownCountryException>(() =>
+                translationProvider.GetCountryTranslatedName("XX", LanguageCode.EN));
+
+            Assert.AreEqual("Cannot found a country for code XX", exception.Message);
         }
 
         [TestMethod]
@@ -66,7 +69,7 @@ public void CheckAllCulture()
             ITranslationProvider translationProvider = new TranslationProvider();
             CultureInfo[] cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
 
-            foreach (var countryCode in (Alpha2Code[])Enum.GetValues(typeof(Alpha2Code)))
+            foreach (var countryCode in Enum.GetValues<Alpha2Code>())
             {
                 var countryTranslation = translationProvider.GetCountryTranslation(countryCode);
                 if (countryTranslation is null)
@@ -100,11 +103,13 @@ public void CheckAllCultureWithDefault(LanguageCode defaultLanguageCode)
             ITranslationProvider translationProvider = new TranslationProvider();
             CultureInfo[] cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
 
-            foreach (var countryCode in (Alpha2Code[])Enum.GetValues(typeof(Alpha2Code)))
+            foreach (var countryCode in Enum.GetValues<Alpha2Code>())
             {
                 var countryTranslation = translationProvider.GetCountryTranslation(countryCode);
                 if (countryTranslation is null)
+                {
                     continue;
+                }
 
                 var expectedLanguages = countryTranslation.Translations.Select(x => x.LanguageCode).ToList();
                 foreach (var culture in cultures)
diff --git a/src/Nager.Country/Nager.Country.csproj b/src/Nager.Country/Nager.Country.csproj
@@ -21,9 +21,9 @@
 
     <RepositoryUrl>https://github.com/nager/Nager.Country</RepositoryUrl>
 
-    <TargetFrameworks>net48;netstandard2.0;netstandard2.1;net8;net9</TargetFrameworks>
+    <TargetFrameworks>net48;netstandard2.0;netstandard2.1;net9.0;net10.0</TargetFrameworks>
 
-    <Version>4.3.4</Version>
+    <Version>4.3.5</Version>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public void DuplicateTranslationTest()`
`30`	`30`	`public void CheckTranslationsAvailableTest()`
`31`	`31`	`{`
`32`	`32`	`ITranslationProvider translationProvider = new TranslationProvider();`
`33`		`- foreach (var countryCode in (Alpha2Code[])Enum.GetValues(typeof(Alpha2Code)))`
	`33`	`+ foreach (var countryCode in Enum.GetValues<Alpha2Code>())`
`34`	`34`	`{`
`35`	`35`	`var countryTranslation = translationProvider.GetCountryTranslation(countryCode);`
`36`	`36`	`if (countryTranslation is null)`
`@@ -39,7 +39,7 @@ public void CheckTranslationsAvailableTest()`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`var translationCount = countryTranslation.Translations.Length;`
`42`		`- Assert.IsTrue(translationCount > 5, $"Missing translations for countryCode: {countryCode}");`
	`42`	`+ Assert.IsGreaterThan(5, translationCount, $"Missing translations for countryCode: {countryCode}");`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`@@ -53,11 +53,14 @@ public void GetCountryTranslatedName_GermanyInEnglish_Successful()`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`[TestMethod]`
`56`		`- [ExpectedException(typeof(UnknownCountryException), "Cannot found a country for code XX")]`
`57`	`56`	`public void GetCountryTranslatedName_InvalidAlphaCode_ThrowException()`
`58`	`57`	`{`
`59`	`58`	`ITranslationProvider translationProvider = new TranslationProvider();`
`60`		`- translationProvider.GetCountryTranslatedName("XX", LanguageCode.EN);`
	`59`	`+`
	`60`	`+ var exception = Assert.ThrowsExactly<UnknownCountryException>(() =>`
	`61`	`+ translationProvider.GetCountryTranslatedName("XX", LanguageCode.EN));`
	`62`	`+`
	`63`	`+ Assert.AreEqual("Cannot found a country for code XX", exception.Message);`
`61`	`64`	`}`
`62`	`65`
`63`	`66`	`[TestMethod]`
`@@ -66,7 +69,7 @@ public void CheckAllCulture()`
`66`	`69`	`ITranslationProvider translationProvider = new TranslationProvider();`
`67`	`70`	`CultureInfo[] cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);`
`68`	`71`
`69`		`- foreach (var countryCode in (Alpha2Code[])Enum.GetValues(typeof(Alpha2Code)))`
	`72`	`+ foreach (var countryCode in Enum.GetValues<Alpha2Code>())`
`70`	`73`	`{`
`71`	`74`	`var countryTranslation = translationProvider.GetCountryTranslation(countryCode);`
`72`	`75`	`if (countryTranslation is null)`
`@@ -100,11 +103,13 @@ public void CheckAllCultureWithDefault(LanguageCode defaultLanguageCode)`
`100`	`103`	`ITranslationProvider translationProvider = new TranslationProvider();`
`101`	`104`	`CultureInfo[] cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);`
`102`	`105`
`103`		`- foreach (var countryCode in (Alpha2Code[])Enum.GetValues(typeof(Alpha2Code)))`
	`106`	`+ foreach (var countryCode in Enum.GetValues<Alpha2Code>())`
`104`	`107`	`{`
`105`	`108`	`var countryTranslation = translationProvider.GetCountryTranslation(countryCode);`
`106`	`109`	`if (countryTranslation is null)`
	`110`	`+ {`
`107`	`111`	`continue;`
	`112`	`+ }`
`108`	`113`
`109`	`114`	`var expectedLanguages = countryTranslation.Translations.Select(x => x.LanguageCode).ToList();`
`110`	`115`	`foreach (var culture in cultures)`