Skip to content

Commit

Permalink
Merge pull request #1 from VisualOn/dev
Browse files Browse the repository at this point in the history
Prepare release 2.0.0
  • Loading branch information
viceice authored Jan 16, 2019
2 parents b569ac9 + 95a7215 commit 3c3bb86
Show file tree
Hide file tree
Showing 8 changed files with 127 additions and 71 deletions.
43 changes: 43 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
pull_requests:
do_not_increment_build_number: true
branches:
only:
- master
- dev
skip_tags: true
max_jobs: 1
skip_commits:
files:
- README.md
- CHANGELOG.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\**\NCrontab.Advanced.Tests.dll'
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions NCrontab.Advanced/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<MinVerMinimumMajorMinor>2.0</MinVerMinimumMajorMinor>
<MinVerTagPrefix>v</MinVerTagPrefix>

<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>

<Authors>jcoutch; VisualOn</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/VisualOn/NCrontab-Advanced</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/VisualOn/NCrontab-Advanced/master/NCrontab.Advanced/Icons/x-office-calendar.png</PackageIconUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="1.0.0-beta.4" PrivateAssets="All" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions NCrontab.Advanced/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<PackageId>VisualOn.NCrontab.Advanced</PackageId>
</PropertyGroup>
</Project>
48 changes: 9 additions & 39 deletions NCrontab.Advanced/NCrontab.Advanced.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,22 @@
<Version>1.2.3.3</Version>
<FileVersion>1.2.3.3</FileVersion>
<Company>Joe Coutcher</Company>
<TargetFrameworks>netstandard1.0;net46;net451;net45;net40;net35</TargetFrameworks>
<AssemblyName>NCrontab.Advanced</AssemblyName>
<PackageId>NCrontab.Advanced</PackageId>
<TargetFrameworks>netstandard1.0;netstandard2.0;net46;net45;net40;net35</TargetFrameworks>
<Product>NCrontab.Advanced</Product>
<Description>Cron string parser for .NET</Description>
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.0' ">1.6.0</NetStandardImplicitPackageVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
<!--<PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />-->
</ItemGroup>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' and '$(MSBuildRuntimeType)' == 'Core'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release'">true</GenerateDocumentationFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- including PDB files in NuGet for source link because symbolsource.org does not support portable PDBs -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>

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

</Project>
33 changes: 3 additions & 30 deletions NCrontab.Advanced/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,38 +1,11 @@
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)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
#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")]
Binary file added NCrontab.Advanced/key.snk
Binary file not shown.
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# 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).

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.**

Expand Down

0 comments on commit 3c3bb86

Please sign in to comment.