Skip to content
Browse files

Release preparations

  • Loading branch information...
1 parent 573ee75 commit a12019ce18b961c6a755ac20c623403e8f739df9 @lahma lahma committed
Showing with 98 additions and 25 deletions.
  1. +33 −16 Quartz.build
  2. +1 −1 Quartz.nuspec
  3. +53 −0 changelog.txt
  4. +1 −1 readme.txt
  5. +2 −2 server/AssemblyInfo.cs
  6. +2 −2 src/AssemblyInfo.cs
  7. +4 −1 src/Quartz/Core/QuartzScheduler.cs
  8. +2 −2 tools/NAnt/bin/NAnt.exe.config
View
49 Quartz.build
@@ -129,8 +129,8 @@
debug="${build.debug}"
define="${build.defines}"
optimize="${build.optimize}"
- noconfig="true"
- keyfile="${build.keyfile}">
+ keyfile="${build.keyfile}"
+ nostdlib="true" noconfig="true">
<nowarn>
<!-- do not report warnings for missing XML comments -->
<warning number="0162" />
@@ -152,6 +152,10 @@
<include name="src/Quartz/Xml/job_scheduling_data_2_0.xsd" />
</resources>
<references>
+ <include name="mscorlib.dll"/>
+ <include name="Microsoft.CSharp.dll"/>
+ <include name="System.Configuration.dll"/>
+ <include name="System.Core.dll"/>
<include name="System.dll" />
<include name="System.Core.dll" />
<include name="System.Configuration.dll" />
@@ -176,7 +180,8 @@
output="${buildoutputbasedir}.Examples\Quartz.Examples.exe"
debug="${build.debug}"
optimize="${build.optimize}"
- define="${build.defines}">
+ define="${build.defines}"
+ nostdlib="true" noconfig="true">
<nowarn>
<!-- do not report warnings for missing XML comments -->
<warning number="0162" />
@@ -189,6 +194,10 @@
<include name="src/Quartz.Examples/**/*.cs" />
</sources>
<references>
+ <include name="mscorlib.dll"/>
+ <include name="Microsoft.CSharp.dll"/>
+ <include name="System.Configuration.dll"/>
+ <include name="System.Core.dll"/>
<include name="System.dll" />
<include name="System.Data.dll" />
<include name="${common-logging-dll}" />
@@ -201,7 +210,6 @@
<fileset>
<include name="${buildoutputbasedir}\Quartz.*" />
<include name="${common-logging-dll}" />
- <include name="lib\2.0\C5.dll" if="${c5-collections}" />
</fileset>
</copy>
<copy file="src\Quartz.Examples\App.config" tofile="${buildoutputbasedir}.Examples\Quartz.Examples.exe.config" />
@@ -236,7 +244,8 @@
output="${buildoutputbasedir}.Server\Quartz.Server.exe"
debug="${build.debug}"
optimize="${build.optimize}"
- define="${build.defines}">
+ define="${build.defines}"
+ nostdlib="true" noconfig="true">
<nowarn>
</nowarn>
<sources>
@@ -245,12 +254,15 @@
<include name="${dir.server.src}/Quartz.Server.Core/**/*.cs" />
</sources>
<references>
+ <include name="mscorlib.dll"/>
+ <include name="Microsoft.CSharp.dll"/>
+ <include name="System.Configuration.dll"/>
+ <include name="System.Core.dll"/>
<include name="System.dll" />
<include name="System.Data.dll" />
<include name="${common-logging-dll}" />
<include name="${topshelf-dll}" />
<include name="${buildoutputbasedir}\Quartz.dll" />
- <include name="lib\2.0\C5.dll" if="${c5-collections}" />
</references>
</csc>
<copy todir="${buildoutputbasedir}.Server\" flatten="true" >
@@ -261,7 +273,6 @@
<include name="${common-logging-log4net-dll}" />
<include name="${log4net-dll}" />
<include name="${topshelf-dll}" />
- <include name="lib\2.0\C5.dll" if="${c5-collections}" />
</fileset>
</copy>
@@ -287,7 +298,8 @@
output="${buildoutputbasedir}.Tests.${test.project}\Quartz.Tests.${test.project}.dll"
debug="${build.debug}"
optimize="${build.optimize}"
- define="${build.defines}">
+ define="${build.defines}"
+ nostdlib="true" noconfig="true">
<nowarn>
<!-- do not report warnings for missing XML comments -->
<warning number="0162" />
@@ -305,13 +317,16 @@
<include name="src/Quartz.Tests.Unit/Xml/TestData/RichConfiguration_20.xml" />
</resources>
<references>
- <include name="System.dll" />
+ <include name="mscorlib.dll"/>
+ <include name="Microsoft.CSharp.dll"/>
+ <include name="System.Configuration.dll"/>
+ <include name="System.Core.dll"/>
+ <include name="System.dll" />
<include name="System.Data.dll" />
<include name="${common-logging-dll}" />
<include name="${nunit-dll}" />
<include name="${rhino-mocks-dll}" />
<include name="${buildoutputbasedir}\Quartz.dll" />
- <include name="lib\2.0\C5.dll" if="${c5-collections}" />
</references>
</csc>
@@ -321,7 +336,6 @@
<include name="${common-logging-dll}" />
<include name="${nunit-dll}" />
<include name="${rhino-mocks-dll}" />
- <include name="lib\2.0\C5.dll" if="${c5-collections}" />
</fileset>
</copy>
@@ -510,14 +524,17 @@
<target name="determine-lib-dirs">
<property name="nuget-framework" value="net40" />
<property name="nuget-framework" value="net35" if="${target.framework == '3.5'}" />
- <property name="common-logging-dll" value="packages/Common.Logging.2.1.1/lib/${nuget-framework}/Common.Logging.dll" />
- <property name="common-logging-log4net-dll" value="packages/Common.Logging.Log4Net1211.2.1.1/lib/${nuget-framework}/Common.Logging.Log4Net1211.dll" />
+ <property name="common-logging-dll" value="packages/Common.Logging.2.1.2/lib/${nuget-framework}/Common.Logging.dll" />
+ <property name="common-logging-log4net-dll" value="packages/Common.Logging.Log4Net1211.2.1.2/lib/${nuget-framework}/Common.Logging.Log4Net1211.dll" />
<property name="nunit-dll" value="packages/NUnit.2.6.2/lib/nunit.framework.dll" />
<property name="rhino-mocks-dll" value="packages/RhinoMocks.3.6.1/lib/net/Rhino.Mocks.dll" />
- <property name="topshelf-dll" value="packages/TopShelf.3.1.0/lib/${nuget-framework}\Topshelf.dll" />
+ <property name="topshelf-dll" value="packages/TopShelf.3.1.0/lib/net40-full/Topshelf.dll" />
- <property name="log4net-dll" value="packages/log4net.1.2.11/lib/${nuget-framework}-full/log4net.dll" unless="${client-profile}" />
- <property name="log4net-dll" value="packages/log4net.1.2.11/lib/${nuget-framework}-client/log4net.dll" if="${client-profile}" />
+ <if test="${target.framework == '3.5'}">
+ <property name="topshelf-dll" value="packages/TopShelf.3.1.0/lib/net35/Topshelf.dll" />
+ </if>
+ <property name="log4net-dll" value="packages/log4net.2.0.0/lib/${nuget-framework}-full/log4net.dll" unless="${client-profile}" />
+ <property name="log4net-dll" value="packages/log4net.2.0.0/lib/${nuget-framework}-client/log4net.dll" if="${client-profile}" />
</target>
<target name="build-website">
View
2 Quartz.nuspec
@@ -8,7 +8,7 @@
<language>en-US</language>
<projectUrl>http://www.quartz-scheduler.net/</projectUrl>
<dependencies>
- <dependency id="Common.Logging" version="2.1.1" />
+ <dependency id="Common.Logging" version="2.1.2" />
</dependencies>
</metadata>
<files>
View
53 changelog.txt
@@ -2,6 +2,59 @@ QUARTZ.NET CHANGELOG
==============================
http://www.quartz-scheduler.net
+Release 2.1, Dec 31, 2012
+--------------------------------
+
+This release contains important bug fixes, new functionality and minor breaking changes.
+Custom IJobFactory implementations now need to implement new method void ReturnJob(IJob job) for container managed cleanup.
+NthIncludedDayTrigger was removed as it was accidentally left behind even though being legacy and replaced by DailyTimeIntervalTrigger.
+
+NEW FEATURES
+
+* TimeZone support for calendars / Andrew Smith
+* Allow scheduling relative to replaced trigger with XML configuration
+* Add method to IJobFactory to destroy a job instance created by the factory breaking / minor breaking, added new required method
+* Internalize C5 dependency
+* Support for Oracle ODP 11.2 Release 4
+* Upgrade SQLite dependency to version 1.0.83
+* Upgrade to Common.Logging 2.1.2
+
+FIXES
+
+* Scheduled Shutdown blocked even if waitForJobsToComplete is false
+* DailyTimeIntervalTriggerImpl should be serializable
+* InstanceID = "AUTO" may cause "String or binary data would be truncated" error on qrtz_fired_triggers.entry_id
+* PlugInExample doesn't execute any jobs
+* Recovering triggers have empty/incorrect JobDataMap
+* Make Quartz.NET work under medium trust when running .NET 3.5
+* tables_oracle.sql uses deprecated VARCHAR type
+* Improve error reporting for database connection failure
+* Scheduler Shutdown Freezes when There are Jobs Still Running
+* Use System.Version instead of FileVersionInfo to retive current Quartz version
+* DailyTimeIntervalTriggerImpl Validate broken
+
+BREAKING CHANGES
+
+* Remove NthIncludedDayTrigger that was supposed to be removed in 2.0 breaking
+* Remove Visual Studio 2008 solutions and projects breaking
+* Add support for DateTimeOffset and TimeSpan to JobDataMap / minor breaking - cleanup of API
+
+
+Special thanks to Andrew Smith for working hard on TimeZone support.
+Credits go also to our vibrant community actively helping on mailing list and reportings issues and creating pull requests.
+
+Release 2.0.1, Apr 22, 2012
+--------------------------------
+
+This release contains some bug fixes.
+
+FIXES
+
+* Oracle database support broken
+* Incorrect .NET 4.5 requirement in 4.0 build (only NuGet affected)
+* XML validation fails as schema not embedded (only NuGet affected)
+* ObjectUtils.SetPropertyValue fails with explicitly implemented interface members
+
Release 2.0, Apr 9, 2012
--------------------------------
View
2 readme.txt
@@ -1,4 +1,4 @@
-QUARTZ JOB SCHEDULER .NET, 2.0, Apr 9, 2012
+QUARTZ JOB SCHEDULER .NET, 2.1, Dec 31, 2012
-----------------------------------------------------------------
http://www.quartz-scheduler.net/
View
4 server/AssemblyInfo.cs
@@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("net-3.5.win32; Release")]
#endif
-[assembly: AssemblyProduct("Quarz.NET Server 2.0")]
+[assembly: AssemblyProduct("Quarz.NET Server 2.1")]
[assembly: AssemblyDescription("Quartz Scheduling Server for .NET")]
[assembly : AssemblyCompany("http://quartznet.sourceforge.net/")]
[assembly : AssemblyCopyright("Copyright 2007-2012 Marko Lahma")]
@@ -21,7 +21,7 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.0.400")]
+[assembly: AssemblyVersion("2.1.0.400")]
#if STRONG
View
4 src/AssemblyInfo.cs
@@ -17,9 +17,9 @@
#endif
#if NET_40
-[assembly: AssemblyProduct("Quarz.NET 2.0 for .NET 4.0")]
+[assembly: AssemblyProduct("Quarz.NET 2.1 for .NET 4.0")]
#else
-[assembly: AssemblyProduct("Quarz.NET 2.0 for .NET 3.5 SP1")]
+[assembly: AssemblyProduct("Quarz.NET 2.1 for .NET 3.5 SP1")]
#endif
[assembly: AssemblyDescription("Quartz Scheduling Framework for .NET")]
[assembly: AssemblyCompany("http://www.quartz-scheduler.net/")]
View
5 src/Quartz/Core/QuartzScheduler.cs
@@ -1341,7 +1341,10 @@ public virtual IList<ITrigger> GetTriggersOfJob(JobKey jobKey)
IList<IOperableTrigger> triggersForJob = resources.JobStore.GetTriggersForJob(jobKey);
var retValue = new List<ITrigger>(triggersForJob.Count);
- retValue.AddRange(triggersForJob);
+ foreach (var trigger in triggersForJob)
+ {
+ retValue.Add(trigger);
+ }
return retValue;
}
View
4 tools/NAnt/bin/NAnt.exe.config
@@ -577,7 +577,7 @@
</strict>
</modes>
</runtime>
- <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}">
+ <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/.NETFramework/v4.0">
<include name="Accessibility.dll" />
<include name="Microsoft.Build.Conversion.v4.0.dll" />
<include name="Microsoft.Build.dll" />
@@ -683,7 +683,7 @@
<include name="System.Xml.Linq.dll" />
</reference-assemblies>
<!-- WPF Assemblies -->
- <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}/WPF">
+ <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/.NETFramework/v4.0">
<include name="NaturalLanguage6.dll" />
<include name="NlsData0009.dll" />
<include name="NlsLexicons0009.dll" />

0 comments on commit a12019c

Please sign in to comment.
Something went wrong with that request. Please try again.