From 2762db3ee3017a68866c683089c147efde6220d6 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 14 Jan 2019 12:23:39 +0100 Subject: [PATCH 01/12] Add source link support. --- NCrontab.Advanced/NCrontab.Advanced.csproj | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/NCrontab.Advanced/NCrontab.Advanced.csproj b/NCrontab.Advanced/NCrontab.Advanced.csproj index 8313b57..b05ff04 100644 --- a/NCrontab.Advanced/NCrontab.Advanced.csproj +++ b/NCrontab.Advanced/NCrontab.Advanced.csproj @@ -20,9 +20,19 @@ false false false - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client + + + true + true + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + + + From 84329653b4b7d723c66db44e2ec3158bb2ced043 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Fri, 15 Dec 2017 15:05:08 +0100 Subject: [PATCH 02/12] Add signing. --- NCrontab.Advanced/Directory.Build.props | 7 +++++++ NCrontab.Advanced/key.snk | Bin 0 -> 596 bytes 2 files changed, 7 insertions(+) create mode 100644 NCrontab.Advanced/Directory.Build.props create mode 100644 NCrontab.Advanced/key.snk diff --git a/NCrontab.Advanced/Directory.Build.props b/NCrontab.Advanced/Directory.Build.props new file mode 100644 index 0000000..95f6921 --- /dev/null +++ b/NCrontab.Advanced/Directory.Build.props @@ -0,0 +1,7 @@ + + + + true + key.snk + + diff --git a/NCrontab.Advanced/key.snk b/NCrontab.Advanced/key.snk new file mode 100644 index 0000000000000000000000000000000000000000..6a7af40dfa1432c939c13959da53b37c17130590 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096~kmK(BW9Q|o5rV^!T1>|Q1D%5o{z#D@ zLL~i9{Z(=j0O9d|wVu7kTzKu-tPet5Q?hic2#NskFdr}iNIUH(l(f|vn@zlzeNqC~aw+?}orrG#J5D)VL9P0J{) z3quU>u2+-ODc8sCd1{=nmJ3W`iD+yBQIHG@bL+xN2N?j?fyh zRp3v~ves0!BHSB`t`17*2V7pMFNmIQbagRmw_Rd#b!|@tojw|CAEO2!2tl66W$ts* z(3)~P8sua|jpPN=e{C?W#iW|-DCFcnvUEZjY(f>W{sJJR_Xj>FYpiCL7BE8D6xsy@ zJVpCK=YWEMIEV}$GIACh6?|-sBrSH0O_rirEIX%I>IQV!kGh`zH;S!lb=AATRi$!~ zD_^`I0kC=fMh0#c8FcaW6)c)sNeUO#A;*AlAYj#eA|Ly*eUeZ^+VxMppdY*Mv9q-d z#@vVmM!k~#MG2&@?*kCVV{Ot$6lT$7l7!4lTvCH4w2kC3OzcLS(3*awZB;VS2kX3k iLLBSu+-5+<^w<%qS8l9v$xG|KTH>AU6vK4i!>CS3Xc>tB literal 0 HcmV?d00001 From 314501a0b467819f78d792ee881ca47f9e58f51a Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Fri, 15 Dec 2017 15:02:37 +0100 Subject: [PATCH 03/12] Updated package info. --- NCrontab.Advanced/Directory.Build.props | 11 +++++++++++ NCrontab.Advanced/Directory.Build.targets | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 NCrontab.Advanced/Directory.Build.targets diff --git a/NCrontab.Advanced/Directory.Build.props b/NCrontab.Advanced/Directory.Build.props index 95f6921..edf390c 100644 --- a/NCrontab.Advanced/Directory.Build.props +++ b/NCrontab.Advanced/Directory.Build.props @@ -1,7 +1,18 @@ + 1.3.15 + true key.snk + + jcoutch; VisualOn + Apache-2.0 + https://github.com/VisualOn/NCrontab-Advanced + https://raw.githubusercontent.com/VisualOn/NCrontab-Advanced/master/NCrontab.Advanced/Icons/x-office-calendar.png + + + + diff --git a/NCrontab.Advanced/Directory.Build.targets b/NCrontab.Advanced/Directory.Build.targets new file mode 100644 index 0000000..b4e5563 --- /dev/null +++ b/NCrontab.Advanced/Directory.Build.targets @@ -0,0 +1,6 @@ + + + + VisualOn.NCrontab.Advanced + + From 25cae94290d6cb52c5c352f57ed9ea839c74661a Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 15 Jan 2019 16:09:21 +0100 Subject: [PATCH 04/12] Version bump to 2.0.0. --- NCrontab.Advanced/Directory.Build.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NCrontab.Advanced/Directory.Build.props b/NCrontab.Advanced/Directory.Build.props index edf390c..b286781 100644 --- a/NCrontab.Advanced/Directory.Build.props +++ b/NCrontab.Advanced/Directory.Build.props @@ -1,7 +1,8 @@ - 1.3.15 + 2.0 + v true key.snk From 62b6a0d2f6076dfc075adea5e76041dec73b9ef9 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 14 Jan 2019 12:20:31 +0100 Subject: [PATCH 05/12] Generate attributes. --- NCrontab.Advanced/NCrontab.Advanced.csproj | 11 ------- NCrontab.Advanced/Properties/AssemblyInfo.cs | 33 ++------------------ 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/NCrontab.Advanced/NCrontab.Advanced.csproj b/NCrontab.Advanced/NCrontab.Advanced.csproj index b05ff04..28168a4 100644 --- a/NCrontab.Advanced/NCrontab.Advanced.csproj +++ b/NCrontab.Advanced/NCrontab.Advanced.csproj @@ -5,24 +5,13 @@ 1.2.3.3 Joe Coutcher netstandard1.0;net46;net451;net45;net40;net35 - NCrontab.Advanced - NCrontab.Advanced NCrontab.Advanced Cron string parser for .NET win10-x64 $(PackageTargetFallback);dnxcore50 1.6.0 - false - false - false - false - false - false - false - false C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - true true diff --git a/NCrontab.Advanced/Properties/AssemblyInfo.cs b/NCrontab.Advanced/Properties/AssemblyInfo.cs index 33787f0..0ba1328 100644 --- a/NCrontab.Advanced/Properties/AssemblyInfo.cs +++ b/NCrontab.Advanced/Properties/AssemblyInfo.cs @@ -1,21 +1,7 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("NCrontab.Advanced")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Joe Coutcher")] -[assembly: AssemblyProduct("NCrontab.Advanced")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -23,16 +9,3 @@ #if !NETSTANDARD1_0 [assembly: Guid("d56bc51a-e8f9-4911-8c4c-eab2763699cd")] #endif - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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("1.2.3.3")] -[assembly: AssemblyFileVersion("1.2.3.3")] From 1d480911fb122a9df872c0fd042b557b0950b6bd Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 15 Jan 2019 16:31:50 +0100 Subject: [PATCH 06/12] Target framework cleanup. --- NCrontab.Advanced/NCrontab.Advanced.csproj | 31 +--------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/NCrontab.Advanced/NCrontab.Advanced.csproj b/NCrontab.Advanced/NCrontab.Advanced.csproj index 28168a4..1e15736 100644 --- a/NCrontab.Advanced/NCrontab.Advanced.csproj +++ b/NCrontab.Advanced/NCrontab.Advanced.csproj @@ -4,7 +4,7 @@ 1.2.3.3 1.2.3.3 Joe Coutcher - netstandard1.0;net46;net451;net45;net40;net35 + netstandard1.0;netstandard2.0;net46;net45;net40;net35 NCrontab.Advanced Cron string parser for .NET win10-x64 @@ -22,33 +22,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 199a4ee21c8e5b4ebe0e931e2d7c8cc58597b6eb Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 15 Jan 2019 16:37:29 +0100 Subject: [PATCH 07/12] Add appveyor settings. --- .appveyor.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..3c2cbff --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,41 @@ +pull_requests: + do_not_increment_build_number: true +branches: + only: + - master +skip_tags: true +max_jobs: 1 +skip_commits: + files: + - README.md + - .editorconfig + - .gitignore + +image: Visual Studio 2017 + +cache: + - '%USERPROFILE%\.nuget\packages -> **\*.csproj' + +init: + - git config --global core.autocrlf true + +nuget: + account_feed: false + project_feed: true + disable_publish_on_pr: true + +configuration: Release + +before_build: + - dotnet --version + - dotnet restore --verbosity m + +build: + verbosity: minimal + publish_nuget: true + publish_nuget_symbols: false + +test: + assemblies: + only: + - 'NCrontab.Advanced.Tests\bin\**\UnitTests.dll' From 27ab90537638d784d2bd47cdda9f96ef6c50a81f Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 15 Jan 2019 16:45:10 +0100 Subject: [PATCH 08/12] Update build branches. --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 3c2cbff..70b5af4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,6 +3,7 @@ pull_requests: branches: only: - master + - dev skip_tags: true max_jobs: 1 skip_commits: From b824c28cb420f83362c4828ab9ed6279e2d0f15c Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 15 Jan 2019 16:50:00 +0100 Subject: [PATCH 09/12] Fix test assembly name for appveyor. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 70b5af4..2b6da40 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,4 +39,4 @@ build: test: assemblies: only: - - 'NCrontab.Advanced.Tests\bin\**\UnitTests.dll' + - 'NCrontab.Advanced.Tests\bin\**\NCrontab.Advanced.Tests.dll' From 2d41d54618b16c215ff58b28d40ebef11d8132b1 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 15 Jan 2019 16:56:46 +0100 Subject: [PATCH 10/12] Updated readme. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a31153..608364e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# NCrontab Advanced +# NCrontab Advanced [![Build status](https://ci.appveyor.com/api/projects/status/74py94r0mcwogo5f?svg=true)](https://ci.appveyor.com/project/ViceIce/ncrontab-advanced) -[![Build status](https://ci.appveyor.com/api/projects/status/kf0q2cp6xx9qf84w?svg=true)](https://ci.appveyor.com/project/jcoutch/ncrontab-advanced) +This is a fork from [Joe Coutcher](https://github.com/jcoutch/NCrontab-Advanced). **If you have any problems, make sure to file an issue here on Github.** From aa6f0d74d3263bcf16d75cfd7ac383dd0a82440c Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 16 Jan 2019 11:58:15 +0100 Subject: [PATCH 11/12] Added changelog --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ README.md | 11 +++++++++++ 2 files changed, 45 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..3041e12 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,34 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +## [2.0.0] +### Added +- Changes from [Joe Coutcher](https://github.com/jcoutch/NCrontab-Advanced) v1.3.15. +- Target framework version `netstandard2.0`. +- Source link support. +- Changelog + +### Changed +- Switched to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +- Refactored project files. + +### Removed +- Target framework version `net451`. `net45` will be used as fallback. + +### Fixed +- [Zero Month/Day parsing](https://github.com/jcoutch/NCrontab-Advanced#11) +- [GetNextOccurrence() blows up for 29W, 30W, 31W](https://github.com/jcoutch/NCrontab-Advanced#12) +- [Correctly roll over from 58 to 59 minutes/seconds](https://github.com/jcoutch/NCrontab-Advanced#14) + +## 1.2.3.3 - 2017-12-15 +### Added +- First release as signed fork of [Joe Coutcher](https://github.com/jcoutch/NCrontab-Advanced) v1.2.3.3. + + +[Unreleased]: https://github.com/visualon/NCrontab-Advanced/compare/v2.0.0...HEAD +[2.0.0]: https://github.com/visualon/NCrontab-Advanced/compare/v1.2.3.3...v2.0.0 diff --git a/README.md b/README.md index 608364e..8f2563c 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,17 @@ This is a fork from [Joe Coutcher](https://github.com/jcoutch/NCrontab-Advanced). +Cron string parser for .NET + +## Changes +See [Changelog](CHANGELOG.md) + +## License +[Apache License 2.0](LICENSE) + + +### Howto + **If you have any problems, make sure to file an issue here on Github.** We were looking to implement [NCrontab](https://github.com/atifaziz/NCrontab) for a project, but found it had a few shortcomings: From 95a7215377bf5d673c28d03d35644900be53a093 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 16 Jan 2019 11:59:05 +0100 Subject: [PATCH 12/12] Do not build on changelog changes. --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 2b6da40..b95074a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,6 +9,7 @@ max_jobs: 1 skip_commits: files: - README.md + - CHANGELOG.md - .editorconfig - .gitignore