Skip to content

Commit 3c3bb86

Browse files
viceiceviceice
authored
Merge pull request #1 from VisualOn/dev
Prepare release 2.0.0
2 parents b569ac9 + 95a7215 commit 3c3bb86

8 files changed

Lines changed: 127 additions & 71 deletions

File tree

‎.appveyor.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
pull_requests:
2+
do_not_increment_build_number: true
3+
branches:
4+
only:
5+
- master
6+
- dev
7+
skip_tags: true
8+
max_jobs: 1
9+
skip_commits:
10+
files:
11+
- README.md
12+
- CHANGELOG.md
13+
- .editorconfig
14+
- .gitignore
15+
16+
image: Visual Studio 2017
17+
18+
cache:
19+
- '%USERPROFILE%\.nuget\packages -> **\*.csproj'
20+
21+
init:
22+
- git config --global core.autocrlf true
23+
24+
nuget:
25+
account_feed: false
26+
project_feed: true
27+
disable_publish_on_pr: true
28+
29+
configuration: Release
30+
31+
before_build:
32+
- dotnet --version
33+
- dotnet restore --verbosity m
34+
35+
build:
36+
verbosity: minimal
37+
publish_nuget: true
38+
publish_nuget_symbols: false
39+
40+
test:
41+
assemblies:
42+
only:
43+
- 'NCrontab.Advanced.Tests\bin\**\NCrontab.Advanced.Tests.dll'

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
## [Unreleased]
8+
9+
## [2.0.0]
10+
### Added
11+
- Changes from [Joe Coutcher](https://github.com/jcoutch/NCrontab-Advanced) v1.3.15.
12+
- Target framework version `netstandard2.0`.
13+
- Source link support.
14+
- Changelog
15+
16+
### Changed
17+
- Switched to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
18+
- Refactored project files.
19+
20+
### Removed
21+
- Target framework version `net451`. `net45` will be used as fallback.
22+
23+
### Fixed
24+
- [Zero Month/Day parsing](https://github.com/jcoutch/NCrontab-Advanced#11)
25+
- [GetNextOccurrence() blows up for 29W, 30W, 31W](https://github.com/jcoutch/NCrontab-Advanced#12)
26+
- [Correctly roll over from 58 to 59 minutes/seconds](https://github.com/jcoutch/NCrontab-Advanced#14)
27+
28+
## 1.2.3.3 - 2017-12-15
29+
### Added
30+
- First release as signed fork of [Joe Coutcher](https://github.com/jcoutch/NCrontab-Advanced) v1.2.3.3.
31+
32+
33+
[Unreleased]: https://github.com/visualon/NCrontab-Advanced/compare/v2.0.0...HEAD
34+
[2.0.0]: https://github.com/visualon/NCrontab-Advanced/compare/v1.2.3.3...v2.0.0

‎NCrontab.Advanced/Directory.Build.props‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<MinVerMinimumMajorMinor>2.0</MinVerMinimumMajorMinor>
5+
<MinVerTagPrefix>v</MinVerTagPrefix>
6+
7+
<SignAssembly>true</SignAssembly>
8+
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
9+
10+
<Authors>jcoutch; VisualOn</Authors>
11+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
12+
<PackageProjectUrl>https://github.com/VisualOn/NCrontab-Advanced</PackageProjectUrl>
13+
<PackageIconUrl>https://raw.githubusercontent.com/VisualOn/NCrontab-Advanced/master/NCrontab.Advanced/Icons/x-office-calendar.png</PackageIconUrl>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="MinVer" Version="1.0.0-beta.4" PrivateAssets="All" />
18+
</ItemGroup>
19+
</Project>

‎NCrontab.Advanced/Directory.Build.targets‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<PackageId>VisualOn.NCrontab.Advanced</PackageId>
5+
</PropertyGroup>
6+
</Project>

‎NCrontab.Advanced/NCrontab.Advanced.csproj‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,22 @@
44
<Version>1.2.3.3</Version>
55
<FileVersion>1.2.3.3</FileVersion>
66
<Company>Joe Coutcher</Company>
7-
<TargetFrameworks>netstandard1.0;net46;net451;net45;net40;net35</TargetFrameworks>
8-
<AssemblyName>NCrontab.Advanced</AssemblyName>
9-
<PackageId>NCrontab.Advanced</PackageId>
7+
<TargetFrameworks>netstandard1.0;netstandard2.0;net46;net45;net40;net35</TargetFrameworks>
108
<Product>NCrontab.Advanced</Product>
119
<Description>Cron string parser for .NET</Description>
1210
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
1311
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1412
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.0' ">1.6.0</NetStandardImplicitPackageVersion>
15-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
16-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
17-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
18-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
19-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
20-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
21-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
22-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
23-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
24-
</PropertyGroup>
25-
26-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
27-
<!--<PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
28-
<PackageReference Include="System.Linq" Version="4.3.0" />-->
29-
</ItemGroup>
13+
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' and '$(MSBuildRuntimeType)' == 'Core'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
3014

31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
32-
<Reference Include="System" />
33-
<Reference Include="Microsoft.CSharp" />
34-
</ItemGroup>
35-
36-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
37-
<Reference Include="System" />
38-
<Reference Include="Microsoft.CSharp" />
39-
</ItemGroup>
40-
41-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
42-
<Reference Include="System" />
43-
<Reference Include="Microsoft.CSharp" />
44-
</ItemGroup>
45-
46-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
47-
<Reference Include="System" />
48-
<Reference Include="Microsoft.CSharp" />
49-
</ItemGroup>
15+
<GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release'">true</GenerateDocumentationFile>
16+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17+
<!-- including PDB files in NuGet for source link because symbolsource.org does not support portable PDBs -->
18+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
19+
</PropertyGroup>
5020

51-
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
52-
<Reference Include="System" />
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
5323
</ItemGroup>
5424

5525
</Project>

‎NCrontab.Advanced/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,11 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
1+
using System.Runtime.InteropServices;
42

5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
8-
[assembly: AssemblyTitle("NCrontab.Advanced")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("Joe Coutcher")]
12-
[assembly: AssemblyProduct("NCrontab.Advanced")]
13-
[assembly: AssemblyCopyright("")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
16-
17-
// Setting ComVisible to false makes the types in this assembly not visible
18-
// to COM components. If you need to access a type in this assembly from
3+
// Setting ComVisible to false makes the types in this assembly not visible
4+
// to COM components. If you need to access a type in this assembly from
195
// COM, set the ComVisible attribute to true on that type.
206
[assembly: ComVisible(false)]
217

228
// The following GUID is for the ID of the typelib if this project is exposed to COM
239
#if !NETSTANDARD1_0
2410
[assembly: Guid("d56bc51a-e8f9-4911-8c4c-eab2763699cd")]
2511
#endif
26-
27-
// Version information for an assembly consists of the following four values:
28-
//
29-
// Major Version
30-
// Minor Version
31-
// Build Number
32-
// Revision
33-
//
34-
// You can specify all the values or you can default the Build and Revision Numbers
35-
// by using the '*' as shown below:
36-
// [assembly: AssemblyVersion("1.0.*")]
37-
[assembly: AssemblyVersion("1.2.3.3")]
38-
[assembly: AssemblyFileVersion("1.2.3.3")]

‎NCrontab.Advanced/key.snk‎

596 Bytes
Binary file not shown.

‎README.md‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
# NCrontab Advanced
1+
# NCrontab Advanced [![Build status](https://ci.appveyor.com/api/projects/status/74py94r0mcwogo5f?svg=true)](https://ci.appveyor.com/project/ViceIce/ncrontab-advanced)
22

3-
[![Build status](https://ci.appveyor.com/api/projects/status/kf0q2cp6xx9qf84w?svg=true)](https://ci.appveyor.com/project/jcoutch/ncrontab-advanced)
3+
This is a fork from [Joe Coutcher](https://github.com/jcoutch/NCrontab-Advanced).
4+
5+
Cron string parser for .NET
6+
7+
## Changes
8+
See [Changelog](CHANGELOG.md)
9+
10+
## License
11+
[Apache License 2.0](LICENSE)
12+
13+
14+
### Howto
415

516
**If you have any problems, make sure to file an issue here on Github.**
617

0 commit comments

Comments
 (0)