Skip to content

Commit

Permalink
#37 UK VE Day 2020 is not Monday
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Willey committed Jun 17, 2019
1 parent 941c166 commit c992d8e
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/PublicHoliday/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.4.0")]
[assembly: AssemblyFileVersion("2.0.4.0")]
[assembly: AssemblyVersion("2.0.5.0")]
[assembly: AssemblyFileVersion("2.0.5.0")]
6 changes: 4 additions & 2 deletions src/PublicHoliday/PublicHoliday.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<PackageTags>Holiday</PackageTags>
<PackageReleaseNotes>2.0.2: Fix for AU-NSW-2016 (thanks @dotnetshadow)
2.0.3: Canada BC changing family day from 2019
2.0.4: UK Early May Day 2020 moved (thanks @skipishere)</PackageReleaseNotes>

2.0.4: UK Early May Day 2020 moved (thanks @skipishere)
2.0.5: UK Early May Day 2020 Monday (thanks @deltafsdevelopment )</PackageReleaseNotes>
<PackageProjectUrl>https://github.com/martinjw/Holiday</PackageProjectUrl>
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
Expand All @@ -23,7 +25,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>2.0.4</Version>
<Version>2.0.5</Version>
</PropertyGroup>
<PropertyGroup>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
Expand Down
4 changes: 2 additions & 2 deletions tests/PublicHolidayTests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.4.0")]
[assembly: AssemblyFileVersion("2.0.4.0")]
[assembly: AssemblyVersion("2.0.5.0")]
[assembly: AssemblyFileVersion("2.0.5.0")]
6 changes: 3 additions & 3 deletions tests/PublicHolidayTests/PublicHolidayTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
<PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions tests/PublicHolidayTests/TestUKBankHoliday.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@ public void TestMayDay2020()
Assert.AreEqual(expected, actual.Value);
}

/// <summary>
/// Test May Day in 2020 (Moved to the 8th/May)
/// </summary>
[TestMethod]
public void TestMayDay2020IsNotMonday()
{
var veDay = UKBankHoliday.MayDay(2020).GetValueOrDefault();
Assert.IsTrue(new UKBankHoliday().IsBankHoliday(veDay));
}

/// <summary>
/// New Year is a Sunday, so bank holiday is Monday
/// </summary>
Expand Down

0 comments on commit c992d8e

Please sign in to comment.