Merge pull request #281 from joaomatossilva/v6

New Breacking release V6

Author: joaomatossilva

.github/workflows/dotnet.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
       - name: Determine Version
         id:   gitversion # id to later be referenced
         uses: gittools/actions/gitversion/execute@v0

DateTimeExtensions.sln

@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE.md = LICENSE.md
 		README.md = README.md
+		v6.md = v6.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".buildScripts", ".buildScripts", "{468005F2-9F77-4A34-A737-FF6B9C0444D4}"

src/DateTimeExtensions/DateTimeExtensions.csproj

@@ -3,7 +3,7 @@
     <Description>This project is a merge of several common DateTime operations on the form of extensions to System.DateTime, including natural date difference text (precise and human rounded), holidays and working days calculations on several culture locales. Feedback will be much appreciated.</Description>
     <AssemblyTitle>DateTime Extensions</AssemblyTitle>
     <Authors>Joao Matos Silva</Authors>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
     <AssemblyName>DateTimeExtensions</AssemblyName>
     <PackageId>DateTimeExtensions</PackageId>
     <PackageTags>Natural;Date;Time;Relative;Calendar;Holiday;Workingday;DateTime</PackageTags>
@@ -18,16 +18,17 @@
     <PackageIconUrl>https://github.com/joaomatossilva/DateTimeExtensions/raw/master/assets/datetimeextensions-60-logo.png</PackageIconUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Update="WorkingDays\HolidayNames.Designer.cs">
+    <Compile Update="WorkingDays\DayNames.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>HolidayNames.resx</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Update="WorkingDays\HolidayNames.resx">
+    <EmbeddedResource Update="WorkingDays\DayNames.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>HolidayNames.Designer.cs</LastGenOutput>
     </EmbeddedResource>

src/DateTimeExtensions/Export/OfficeHolidaysExportHolidaysFormat.cs

@@ -34,16 +34,16 @@ public class OfficeHolidaysExportHolidaysFormat : IExportHolidaysFormat
 
         public void Export(WorkingDayCultureInfo dateTimeCultureInfo, int year, TextWriter writer)
         {
-            var holidays = dateTimeCultureInfo.GetHolidaysOfYear(year);
+            var holidays = dateTimeCultureInfo.GetObservancesOfYear(year);
             writer.WriteLine(HeaderLineFomat, dateTimeCultureInfo.Name, holidays.Count());
             foreach (var holiday in holidays)
             {
-                var instance = holiday.GetInstance(year);
+                var instance = holiday.CalendarDay.GetInstance(year);
                 if (instance.HasValue)
                 {
-                    writer.WriteLine(HolidayLineFormat, holiday.Name, instance);
+                    writer.WriteLine(HolidayLineFormat, holiday.CalendarDay.Name, instance);
                 }
             }
         }
     }
-}
+}

src/DateTimeExtensions/GlobalUsings.cs

@@ -0,0 +1,2 @@
+global using DateTimeExtensions.WorkingDays.DayInYearResolvers;
+global using DateTimeExtensions.WorkingDays;