Remove .NET 4.6.1 from supported versions

dimesoftware · Jan 30, 2023 · b55b938 · b55b938
1 parent 546aebc
commit b55b938
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 56 deletions.
diff --git a/src/Dime.i18n.sln b/src/Dime.i18n.sln
@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30011.22
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dime.i18n.Date", "core\Dime.i18n.Date\Dime.i18n.Date.csproj", "{5E03484C-AA89-4AD0-8CCF-C22812853D0F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E7B21F8D-FA27-4C97-8135-3B76E2BD7CA8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dime.i18n.Date.Tests", "test\Dime.i18n.Date.Tests\Dime.i18n.Date.Tests.csproj", "{2E0943BD-395F-4A48-A487-BC0FA903D286}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dime.i18n.Countries", "core\Dime.i18n.Countries\Dime.i18n.Countries.csproj", "{33EB80EA-4D49-4D59-B19C-088441F859B9}"
@@ -39,10 +37,6 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2E0943BD-395F-4A48-A487-BC0FA903D286} = {E7B21F8D-FA27-4C97-8135-3B76E2BD7CA8}
-		{488E34B1-3498-472C-BC3E-80004488CC15} = {E7B21F8D-FA27-4C97-8135-3B76E2BD7CA8}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DEFE6915-1B43-400B-A4EC-675E7A1ADE9D}
 	EndGlobalSection

diff --git a/src/core/Dime.i18n.Countries/Dime.i18n.Countries.csproj b/src/core/Dime.i18n.Countries/Dime.i18n.Countries.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net461;net7.0</TargetFrameworks>
+    <TargetFrameworks>net461;net7.0</TargetFrameworks>
     <Authors>Dime Software</Authors>
     <Product>Dime Software</Product>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -15,8 +15,8 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <RepositoryUrl>https://github.com/dime-software/dime-i18n</RepositoryUrl>
     <PackageProjectUrl>https://github.com/dime-software/dime-i18n</PackageProjectUrl>
-    <Version>1.0.0.0</Version>
-    <LangVersion></LangVersion>
+    <Version>1.0.1.0</Version>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/core/Dime.i18n.Date/Dime.i18n.Date.csproj b/src/core/Dime.i18n.Date/Dime.i18n.Date.csproj
@@ -3,16 +3,15 @@
 	<PropertyGroup>
 		<Description>Date-related utilities.</Description>
 		<AssemblyTitle>Dime.Utilities</AssemblyTitle>
-		<VersionPrefix>1.0.0</VersionPrefix>
 		<Authors>Dime Software</Authors>
-		<TargetFrameworks>net6.0;net461;net7.0</TargetFrameworks>
+		<TargetFrameworks>net461;net7.0</TargetFrameworks>
 		<AssemblyName>Dime.i18n.Date</AssemblyName>
 		<PackageId>Dime.i18n.Date</PackageId>
 		<PackageIconUrl>https://cdn.dime-software.com/dime-software/logo-shape.png</PackageIconUrl>
 		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-		<Version>1.0.0.0</Version>
+		<Version>1.0.1.0</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<IncludeSource>True</IncludeSource>
 		<IncludeSymbols>True</IncludeSymbols>
@@ -22,11 +21,12 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryType>git</RepositoryType>
 		<NeutralLanguage>en</NeutralLanguage>
+		<LangVersion>latest</LangVersion>
 		<RepositoryUrl>https://github.com/dime-software/dime-i18n</RepositoryUrl>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="NodaTime" Version="3.1.2" />
+		<PackageReference Include="NodaTime" Version="3.1.6" />
 		<PackageReference Include="System.Globalization" Version="4.3.0" />
 		<PackageReference Include="System.Reflection" Version="4.3.0" />
 		<PackageReference Include="System.Threading.Thread" Version="4.3.0" />

diff --git a/src/core/Dime.i18n.Date/LocalDateTimeConverter.cs b/src/core/Dime.i18n.Date/LocalDateTimeConverter.cs
@@ -34,7 +34,7 @@ public DateTime Convert(DateTime dt)
             if (UseCurrentCulture)
             {
                 CultureInfo currentCulture = CultureInfo.CurrentUICulture;
-                RegionInfo regionInfo = new RegionInfo(currentCulture.Name);
+                RegionInfo regionInfo = new(currentCulture.Name);
 
                 IEnumerable<string> zoneIds = NodaTime.TimeZones.TzdbDateTimeZoneSource.Default.ZoneLocations
                     .Where(x => string.Compare(x.CountryCode, regionInfo.TwoLetterISORegionName, true) == 0)

diff --git a/src/core/Dime.i18n.Date/UtcDateTimeConverter.cs b/src/core/Dime.i18n.Date/UtcDateTimeConverter.cs
@@ -35,7 +35,7 @@ public DateTime Convert(DateTime dt)
             if (UseCurrentCulture)
             {
                 CultureInfo currentCulture = CultureInfo.CurrentUICulture;
-                RegionInfo regionInfo = new RegionInfo(currentCulture.Name);
+                RegionInfo regionInfo = new(currentCulture.Name);
 
                 IEnumerable<string> zoneIds = NodaTime.TimeZones.TzdbDateTimeZoneSource.Default.ZoneLocations
                     .Where(x => string.Compare(x.CountryCode, regionInfo.TwoLetterISORegionName, StringComparison.OrdinalIgnoreCase) == 0)
@@ -56,7 +56,7 @@ public DateTime Convert(DateTime dt)
             else
             {
                 // Get local DateTime instance into a LocalDateTime object
-                LocalDateTime localDateTime = new LocalDateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute);
+                LocalDateTime localDateTime = new(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute);
 
                 // Get the users' time zone
                 IDateTimeZoneProvider timeZoneProvider = DateTimeZoneProviders.Tzdb;

diff --git a/src/test/Dime.i18n.Countries.Tests/CountryListTests.cs b/src/test/Dime.i18n.Countries.Tests/CountryListTests.cs
@@ -9,21 +9,21 @@ public class CountryListTests
         [Fact]
         public void CountryList_Count_ShouldReturn239()
         {
-            CountryList countries = new CountryList();
+            CountryList countries = new();
             Assert.True(countries.Count() == 239);
         }
 
         [Fact]
         public void CountryList_Distinct_Count_ShouldReturn239()
         {
-            CountryList countries = new CountryList();
+            CountryList countries = new();
             Assert.True(countries.Distinct().Count() == 239);
         }
 
         [Fact]
         public void CountryList_GetEnumerator_ShouldEnumerate()
         {
-            CountryList countries = new CountryList();
+            CountryList countries = new();
 
             IEnumerator enumerator = (countries as IEnumerable).GetEnumerator();
             while (enumerator.MoveNext())

diff --git a/src/test/Dime.i18n.Countries.Tests/Dime.i18n.Countries.Tests.csproj b/src/test/Dime.i18n.Countries.Tests/Dime.i18n.Countries.Tests.csproj
@@ -1,23 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
-
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/test/Dime.i18n.Date.Tests/DateTimeExtensionsTests.cs b/src/test/Dime.i18n.Date.Tests/DateTimeExtensionsTests.cs
@@ -7,7 +7,7 @@ public class DateTimeExtensionsTests
         [Fact]
         public void DateTimeExtensions_ToUtc_ShouldConvert()
         {
-            DateTime dt = new DateTime(2020, 10, 7, 15, 0, 0);
+            DateTime dt = new(2020, 10, 7, 15, 0, 0);
             DateTime utcDt = dt.ToUtc("Europe/Brussels");
             Assert.True(utcDt == new DateTime(2020, 10, 7, 13, 0, 0));
         }
@@ -31,7 +31,7 @@ public void DateTimeExtensions_NullableDateTime_IsNull_ToUtc_ShouldReturnNull()
         [Fact]
         public void DateTimeExtensions_ToLocal_ShouldConvert()
         {
-            DateTime dt = new DateTime(2020, 10, 7, 13, 0, 0);
+            DateTime dt = new(2020, 10, 7, 13, 0, 0);
             DateTime utcDt = dt.ToLocal("Europe/Brussels");
             Assert.True(utcDt == new DateTime(2020, 10, 7, 15, 0, 0));
         }

diff --git a/src/test/Dime.i18n.Date.Tests/DateTimeKindAttributeTests.cs b/src/test/Dime.i18n.Date.Tests/DateTimeKindAttributeTests.cs
@@ -7,29 +7,29 @@ public class DateTimeKindAttributeTests
         [Fact]
         public void DateTimeKindAttribute_Constructor_Default()
         {
-            DateTimeKindAttribute converter = new DateTimeKindAttribute(DateTimeKind.Utc);
+            DateTimeKindAttribute converter = new(DateTimeKind.Utc);
             Assert.True(converter.Kind == DateTimeKind.Utc);
         }
 
         [Fact]
         public void DateTimeKindAttribute_Apply_ParameterIsNull_DoesNothing()
         {
-            DateTimeKindAttribute converter = new DateTimeKindAttribute(DateTimeKind.Utc);
+            DateTimeKindAttribute converter = new(DateTimeKind.Utc);
             Assert.True(converter.Kind == DateTimeKind.Utc);
 
-            DateTime dt = new DateTime(2018, 1, 1, 12, 30, 00, DateTimeKind.Local);
+            DateTime dt = new(2018, 1, 1, 12, 30, 00, DateTimeKind.Local);
             DateTimeTestClass dateTimeTestClass = null;
             DateTimeKindAttribute.Apply(dateTimeTestClass);
         }
 
         [Fact]
         public void DateTimeKindAttribute_Apply_ParameterIsNotNull_DateTimeIsConverted()
         {
-            DateTimeKindAttribute converter = new DateTimeKindAttribute(DateTimeKind.Utc);
+            DateTimeKindAttribute converter = new(DateTimeKind.Utc);
             Assert.True(converter.Kind == DateTimeKind.Utc);
 
-            DateTime dt = new DateTime(2018, 1, 1, 12, 30, 00, DateTimeKind.Local);
-            DateTimeTestClass dateTimeTestClass = new DateTimeTestClass(dt);
+            DateTime dt = new(2018, 1, 1, 12, 30, 00, DateTimeKind.Local);
+            DateTimeTestClass dateTimeTestClass = new(dt);
 
             DateTimeKindAttribute.Apply(dateTimeTestClass);
             Assert.True(dateTimeTestClass.MyDateTime.Kind == DateTimeKind.Utc);
@@ -38,11 +38,11 @@ public void DateTimeKindAttribute_Apply_ParameterIsNotNull_DateTimeIsConverted()
         [Fact]
         public void DateTimeKindAttribute_Apply_ParameterIsNotNull_DateTimeIsNull_DoesNothing()
         {
-            DateTimeKindAttribute converter = new DateTimeKindAttribute(DateTimeKind.Utc);
+            DateTimeKindAttribute converter = new(DateTimeKind.Utc);
             Assert.True(converter.Kind == DateTimeKind.Utc);
 
-            DateTime dt = new DateTime(2018, 1, 1, 12, 30, 00, DateTimeKind.Local);
-            DateTimeTestClass dateTimeTestClass = new DateTimeTestClass(dt);
+            DateTime dt = new(2018, 1, 1, 12, 30, 00, DateTimeKind.Local);
+            DateTimeTestClass dateTimeTestClass = new(dt);
 
             DateTimeKindAttribute.Apply(dateTimeTestClass);
         }

diff --git a/src/test/Dime.i18n.Date.Tests/Dime.i18n.Date.Tests.csproj b/src/test/Dime.i18n.Date.Tests/Dime.i18n.Date.Tests.csproj
@@ -1,17 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup Label="Globals">
-    <SccProjectName>SAK</SccProjectName>
-    <SccProvider>SAK</SccProvider>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-  </PropertyGroup>
-
   <PropertyGroup>
     <Description>Dime.Utilities.Date Tests</Description>
     <AssemblyTitle>Dime.Utilities.Date Tests</AssemblyTitle>
     <Authors>Dime Software</Authors>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>Dime.Utilities.Date.Tests</AssemblyName>
     <PackageId>Dime.Utilities.Date.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>    
@@ -25,20 +17,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/src/test/Dime.i18n.Date.Tests/LocalDateTimeConverterTests.cs b/src/test/Dime.i18n.Date.Tests/LocalDateTimeConverterTests.cs
@@ -29,7 +29,7 @@ public void LocalDateTimeConverter_ConvertToLocalTime_DateTime_UseCustomTimezone
             const string timeZone = "Europe/Brussels";
 
             IDateTimeConverter converter = new LocalDateTimeConverter(timeZone);
-
+            
             const string exactFormat = "yyyy-MM-dd HH:mm";
             if (DateTime.TryParseExact(inputValue, exactFormat, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateTime output))
             {

diff --git a/src/test/Dime.i18n.Date.Tests/UtcDateTimeConverterTests.cs b/src/test/Dime.i18n.Date.Tests/UtcDateTimeConverterTests.cs
@@ -28,7 +28,7 @@ public void UtcDateTimeConverter_ConvertToUtc_DateTime_UseCustomTimezone_Success
             string outputValue = "";
             const string timeZone = "Europe/Brussels";
 
-            UtcDateTimeConverter converter = new UtcDateTimeConverter(timeZone);
+            UtcDateTimeConverter converter = new(timeZone);
 
             const string exactFormat = "yyyy-MM-dd HH:mm";
             if (DateTime.TryParseExact(inputValue, exactFormat, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateTime output))
@@ -49,7 +49,7 @@ public void UtcDateTimeConverter_ConvertToUtc_DateTime_UseCurrentTimezone_Succes
             const string inputValue = "2016-12-31 15:00";
             string outputValue = "";
 
-            UtcDateTimeConverter converter = new UtcDateTimeConverter();
+            UtcDateTimeConverter converter = new();
             const string exactFormat = "yyyy-MM-dd HH:mm";
             if (DateTime.TryParseExact(inputValue, exactFormat, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateTime output))
             {