Skip to content

Commit aefa24a

Browse files
EWSoftwareEWSoftware
committed
Updates and fixes
- Added `MinimumYear` and `MaximumYear` properties to the `Holiday` base class. This allows defining the year range for which a holiday is valid. The defaults are a minimum year of 1 and a maximum year of 9999. - The `AddFixed` and `AddFloating` methods of the `HolidayCollection` class now return the added instance. - The `HolidayCollection` class will now only return a holiday date if the instance falls within the valid year range for the holiday definition. - The `AddStandardHolidays` method of the `HolidayCollection` class was updated to allow passing in a set of one or more additional holiday instances to add to the standard set. If none are specified, only the standard set is used.
1 parent df7d80f commit aefa24a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1068
-574
lines changed

‎Doc/Content/VersionHistory/VersionHistory.aml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ Data Interchange (PDI) Library </legacyBold> over the life of the project.</para
1515
<para>Select a version below to see a description of its changes.</para>
1616

1717
<list class="bullet">
18+
<listItem>
19+
<para>
20+
<link xlink:href="3ebeed58-ecb5-475f-93c1-c9e0098ac5a0" />
21+
</para>
22+
</listItem>
1823
<listItem>
1924
<para>
2025
<link xlink:href="d3124c41-0d7f-435c-ab09-4deda9e40173" />

‎Doc/Content/VersionHistory/v2015.1.19.0.aml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ sort the results in a different way without incurring any overhead from the meth
5959
</listItem>
6060

6161
<listItem>
62-
<para><codeEntityReference qualifyHint="true" autoUpgrade="true">M:EWSoftware.PDI.HolidayCollection.AddStandardHolidays</codeEntityReference>
62+
<para><codeEntityReference qualifyHint="false" autoUpgrade="true">M:EWSoftware.PDI.HolidayCollection.AddStandardHolidays(EWSoftware.PDI.Holiday[])</codeEntityReference>
6363
has been changed to return a reference to the collection rather than void.</para>
6464
</listItem>
6565

‎Doc/Content/VersionHistory/v2021.11.23.0.aml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<topic id="3ebeed58-ecb5-475f-93c1-c9e0098ac5a0" revisionNumber="1">
3+
<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
4+
<introduction>
5+
<para>Release notes for version 2021.11.23.0.</para>
6+
</introduction>
7+
8+
<!-- Ignore Spelling: Giménez -->
9+
<section>
10+
<content>
11+
<list class="bullet">
12+
<listItem>
13+
<para>Added <codeInline>MinimumYear</codeInline> and <codeInline>MaximumYear</codeInline> properties
14+
to the <codeInline>Holiday</codeInline> base class. This allows defining the year range for which a holiday is
15+
valid. The defaults are a minimum year of 1 and a maximum year of 9999.</para>
16+
</listItem>
17+
18+
<listItem>
19+
<para>The <codeInline>AddFixed</codeInline> and <codeInline>AddFloating</codeInline> methods of the
20+
<codeInline>HolidayCollection</codeInline> class now return the added instance.</para>
21+
</listItem>
22+
23+
<listItem>
24+
<para>The <codeInline>HolidayCollection</codeInline> class will now only return a holiday date if the
25+
instance falls within the valid year range for the holiday definition.</para>
26+
</listItem>
27+
28+
<listItem>
29+
<para>The <codeInline>AddStandardHolidays</codeInline> method of the
30+
<codeInline>HolidayCollection</codeInline> class was updated to allow passing in a set of one or more additional
31+
holiday instances to add to the standard set. If none are specified, only the standard set is used.</para>
32+
</listItem>
33+
34+
<listItem>
35+
<para>Merged a change from Jorge Giménez to the <codeInline>Recurrence</codeInline> class that fixes
36+
a bug that caused incorrect results for a rule with a yearly frequency and only a By Month Day rule.</para>
37+
</listItem>
38+
</list>
39+
40+
</content>
41+
</section>
42+
43+
<relatedTopics>
44+
<link xlink:href="8885fe94-537b-45a2-84e9-112fa9c976ff" />
45+
</relatedTopics>
46+
47+
</developerConceptualDocument>
48+
</topic>

‎Doc/ContentLayout.content‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,17 @@
112112
<HelpKeyword index="K" term="support, donate" />
113113
</HelpKeywords>
114114
</Topic>
115-
<Topic id="8885fe94-537b-45a2-84e9-112fa9c976ff" visible="True" isExpanded="true" title="Version History">
115+
<Topic id="8885fe94-537b-45a2-84e9-112fa9c976ff" visible="True" isExpanded="true" isSelected="true" title="Version History">
116116
<HelpKeywords>
117117
<HelpKeyword index="K" term="history" />
118118
<HelpKeyword index="K" term="version history" />
119119
</HelpKeywords>
120-
<Topic id="d3124c41-0d7f-435c-ab09-4deda9e40173" visible="True" isSelected="true" title="Version 2020.11.25.0">
120+
<Topic id="3ebeed58-ecb5-475f-93c1-c9e0098ac5a0" visible="True" title="Version 2021.11.23.0">
121+
<HelpKeywords>
122+
<HelpKeyword index="K" term="versions, 2021.11.23.0" />
123+
</HelpKeywords>
124+
</Topic>
125+
<Topic id="d3124c41-0d7f-435c-ab09-4deda9e40173" visible="True" title="Version 2020.11.25.0">
121126
<HelpKeywords>
122127
<HelpKeyword index="K" term="versions, 2020.11.25.0" />
123128
</HelpKeywords>

‎Doc/EWSoftwarePDI.shfbproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
</HtmlHelp1xCompilerPath>
2727
<WorkingPath>
2828
</WorkingPath>
29-
<FrameworkVersion>Cross-platform (.NET Core/.NET Standard)</FrameworkVersion>
29+
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
3030
<HelpTitle>EWSoftware.PDI Namespace Documentation</HelpTitle>
3131
<CopyrightHref>https://github.com/EWSoftware/PDI</CopyrightHref>
32-
<CopyrightText>[v{%40HelpFileVersion}] Copyright \xA9 2003-2020, Eric Woodruff, All Rights Reserved</CopyrightText>
32+
<CopyrightText>[v{%40HelpFileVersion}] Copyright \xA9 2003-2021, Eric Woodruff, All Rights Reserved</CopyrightText>
3333
<FeedbackEMailAddress>Eric%40EWoodruff.us</FeedbackEMailAddress>
3434
<PresentationStyle>VS2013</PresentationStyle>
3535
<SyntaxFilters>Standard</SyntaxFilters>
@@ -49,7 +49,7 @@
4949
<NamespaceSummaryItem name="EWSoftware.PDI.Web.Design" isDocumented="True">Personal Data Interchange ASP.NET web server control designers developed by Eric Woodruff.</NamespaceSummaryItem>
5050
<NamespaceSummaryItem name="EWSoftware.PDI.Windows.Forms" isDocumented="True">Personal Data Interchange Windows Forms controls developed by Eric Woodruff.</NamespaceSummaryItem>
5151
</NamespaceSummaries>
52-
<HelpFileVersion>2020.11.25.0</HelpFileVersion>
52+
<HelpFileVersion>2021.11.23.0</HelpFileVersion>
5353
<ApiFilter />
5454
<PlugInConfigurations>
5555
<PlugInConfig id="Output Deployment" enabled="True">
@@ -60,12 +60,6 @@
6060
<userCredentials useDefault="true" userName="" password="" />
6161
</proxyCredentials>
6262
</deploymentLocation>
63-
<deploymentLocation id="help2x" location="">
64-
<userCredentials useDefault="true" userName="" password="" />
65-
<proxyCredentials useProxy="false" proxyServer="">
66-
<userCredentials useDefault="true" userName="" password="" />
67-
</proxyCredentials>
68-
</deploymentLocation>
6963
<deploymentLocation id="helpViewer" location="" renameMSHA="false">
7064
<userCredentials useDefault="true" userName="" password="" />
7165
<proxyCredentials useProxy="false" proxyServer="">
@@ -106,6 +100,7 @@
106100
<Argument Key="logoAltText" Value="EWSoftware.PDI Library" />
107101
<Argument Key="logoPlacement" Value="left" />
108102
<Argument Key="logoAlignment" Value="left" />
103+
<Argument Key="logoUrl" Value="https://github.com/EWSoftware/PDI" />
109104
<Argument Key="maxVersionParts" Value="" />
110105
<Argument Key="defaultLanguage" Value="cs" />
111106
<Argument Key="includeEnumValues" Value="true" />
@@ -191,6 +186,7 @@
191186
<None Include="Content\VersionHistory\v2020.1.18.0.aml" />
192187
<None Include="Content\VersionHistory\v2020.11.25.0.aml" />
193188
<None Include="Content\VersionHistory\v2020.7.24.0.aml" />
189+
<None Include="Content\VersionHistory\v2021.11.23.0.aml" />
194190
<None Include="Content\Welcome.aml" />
195191
<None Include="Content\VersionHistory\v2.0.0.2.aml" />
196192
<None Include="Content\VersionHistory\v2.0.0.0.aml" />

‎Source/.editorconfig‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,41 @@ csharp_space_between_method_call_parameter_list_parentheses = false
9393
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
9494
csharp_space_between_method_declaration_name_and_open_parenthesis = false
9595
csharp_space_between_method_declaration_parameter_list_parentheses = false
96+
97+
# CA1303: Do not pass literals as localized parameters
98+
dotnet_diagnostic.CA1303.severity = none
99+
100+
# IDE0010: Add missing cases
101+
dotnet_diagnostic.IDE0010.severity = none
102+
103+
# IDE0032: Use auto property
104+
dotnet_diagnostic.IDE0032.severity = none
105+
106+
# IDE0045: Convert to conditional expression
107+
dotnet_diagnostic.IDE0045.severity = none
108+
109+
# IDE0046: Convert to conditional expression
110+
dotnet_diagnostic.IDE0046.severity = none
111+
112+
# IDE0047: Remove unnecessary parentheses
113+
dotnet_diagnostic.IDE0047.severity = none
114+
115+
# IDE0055: Fix formatting
116+
dotnet_diagnostic.IDE0055.severity = none
117+
118+
# IDE0058: Expression value is never used
119+
dotnet_diagnostic.IDE0058.severity = none
120+
121+
# IDE1006: Naming Styles
122+
dotnet_diagnostic.IDE1006.severity = none
123+
124+
# These are disabled as we're still targeting .NET Framework as well and I don't want a lot of conditional code
125+
# to suppress these.
126+
# IDE0056: Use index operator
127+
dotnet_diagnostic.IDE0056.severity = none
128+
129+
# IDE0057: Use range operator
130+
dotnet_diagnostic.IDE0057.severity = none
131+
132+
# IDE0063: Use simple 'using' statement
133+
dotnet_diagnostic.IDE0063.severity = none

‎Source/CSharpDemos/CalendarBrowser/Properties/AssemblyInfoShared.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// System : EWSoftware PDI Demonstration Applications
33
// File : AssemblyInfo.cs
44
// Author : Eric Woodruff (Eric@EWoodruff.us)
5-
// Updated : 11/25/2020
6-
// Note : Copyright 2004-2020, Eric Woodruff, All rights reserved
5+
// Updated : 11/23/2021
6+
// Note : Copyright 2004-2021, Eric Woodruff, All rights reserved
77
//
88
// PDI library demos common assembly attributes
99
//
@@ -27,7 +27,7 @@
2727
// General assembly information
2828
[assembly: AssemblyProduct("EWSoftware Personal Data Interchange Library")]
2929
[assembly: AssemblyCompany("Eric Woodruff")]
30-
[assembly: AssemblyCopyright("Copyright \xA9 2003-2020, Eric Woodruff, All Rights Reserved")]
30+
[assembly: AssemblyCopyright("Copyright \xA9 2003-2021, Eric Woodruff, All Rights Reserved")]
3131
[assembly: AssemblyCulture("")]
3232
#if DEBUG
3333
[assembly: AssemblyConfiguration("Debug")]
@@ -51,5 +51,5 @@
5151
// Day of release
5252
// Revision (typically zero unless multiple releases are made on the same day)
5353
//
54-
[assembly: AssemblyVersion("2020.11.25.0")]
55-
[assembly: AssemblyFileVersion("20.11.25.0")]
54+
[assembly: AssemblyVersion("2021.11.23.0")]
55+
[assembly: AssemblyFileVersion("21.11.23.0")]

‎Source/CSharpDemos/PDIDatesTest/PDIDatesTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
// System : EWSoftware PDI Demonstration Applications
33
// File : PDIDatesTest.cs
44
// Author : Eric Woodruff (Eric@EWoodruff.us)
5-
// Updated : 11/19/2018
6-
// Note : Copyright 2003-2018, Eric Woodruff, All rights reserved
7-
// Compiler: Visual C#
5+
// Updated : 11/22/2021
6+
// Note : Copyright 2003-2021, Eric Woodruff, All rights reserved
87
//
98
// This is a console mode application that runs through a few simple configurations to test the basics in the
109
// date utility, holiday, and recurrence classes.
@@ -529,6 +528,7 @@ static void Main(string[] args)
529528
holidays.AddFloating(DayOccurrence.Third, DayOfWeek.Monday, 1, 0, "Martin Luther King Day");
530529
holidays.AddFloating(DayOccurrence.Third, DayOfWeek.Monday, 2, 0, "President's Day");
531530
holidays.AddFloating(DayOccurrence.Last, DayOfWeek.Monday, 5, 0, "Memorial Day");
531+
holidays.AddFixed(6, 19, true, "Juneteenth").MinimumYear = 2021;
532532
holidays.AddFixed(7, 4, true, "Independence Day");
533533
holidays.AddFloating(DayOccurrence.First, DayOfWeek.Monday, 9, 0, "Labor Day");
534534
holidays.AddFixed(11, 11, true, "Veteran's Day");

‎Source/CSharpDemos/PDIDatesTest/PDIDatesTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<GenerateAssemblyTitleAttribute>False</GenerateAssemblyTitleAttribute>
77
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
88
<GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>

‎Source/CSharpDemos/PDIParserTest/PDIParserTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<GenerateAssemblyTitleAttribute>False</GenerateAssemblyTitleAttribute>
77
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
88
<GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>

0 commit comments

Comments
 (0)