Permalink
Browse files

Add packages.config files back to projects, update NUnit and TopShelf…

…, fix build file issues and bring back .NET 3.5 build support
  • Loading branch information...
1 parent 186e3e2 commit 2decb9b154cf87814460d2266a963e78e38d0720 @lahma lahma committed Dec 7, 2012
View
@@ -4,7 +4,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
src\AssemblyInfo.cs = src\AssemblyInfo.cs
changelog.txt = changelog.txt
- packages.config = packages.config
Quartz.build = Quartz.build
Quartz.nuspec = Quartz.nuspec
readme.txt = readme.txt
View
@@ -512,9 +512,9 @@
<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="nunit-dll" value="packages/NUnit.2.6.0.12054/lib/nunit.framework.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.2.3.0.0/lib/${nuget-framework}\Topshelf.dll" />
+ <property name="topshelf-dll" value="packages/TopShelf.3.1.0/lib/${nuget-framework}\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}" />
@@ -113,17 +113,19 @@
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
- <Reference Include="Topshelf, Version=3.0.85.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Topshelf, Version=3.1.106.0, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Topshelf.3.0.0\lib\net40-full\Topshelf.dll</HintPath>
+ <HintPath>..\..\packages\TopShelf.3.1.0\lib\net40-full\Topshelf.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="SampleJob.cs" />
<None Include="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <SubType>Designer</SubType>
</None>
+ <None Include="packages.config" />
<None Include="quartz.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@@ -3,5 +3,5 @@
<package id="Common.Logging" version="2.1.1" />
<package id="Common.Logging.Log4Net1211" version="2.1.1" />
<package id="log4net" version="1.2.11" />
- <package id="TopShelf" version="3.0.0" />
+ <package id="TopShelf" version="3.1.0" targetFramework="net40" />
</packages>
@@ -180,6 +180,7 @@
<Compile Include="IExample.cs">
<SubType>Code</SubType>
</Compile>
+ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="example15\XmlConfigurationExample.cs" />
@@ -84,9 +84,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Common.Logging.2.1.1\lib\net40\Common.Logging.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
+ <HintPath>..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
@@ -114,6 +114,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Impl\AdoJobStore\Common\" />
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Common.Logging" version="2.1.1" />
- <package id="NUnit" version="2.6.0.12054" />
+ <package id="NUnit" version="2.6.2" targetFramework="net40" />
<package id="RhinoMocks" version="3.6.1" />
</packages>
@@ -87,9 +87,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Common.Logging.2.1.1\lib\net40\Common.Logging.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
+ <HintPath>..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -196,6 +196,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="packages.config" />
<None Include="Serialized\AnnualCalendar_10.ser">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Common.Logging" version="2.1.1" />
- <package id="NUnit" version="2.6.0.12054" />
+ <package id="NUnit" version="2.6.2" targetFramework="net40" />
<package id="RhinoMocks" version="3.6.1" />
</packages>
@@ -146,11 +146,12 @@ public virtual void Execute(IJobExecutionContext context)
protected virtual void Send(MailMessage mimeMessage, string smtpHost)
{
- using (SmtpClient client = new SmtpClient(smtpHost))
+ SmtpClient client = new SmtpClient(smtpHost);
+ // Do not remove this using. In .NET 4.0 SmtpClient implements IDisposable.
+ using (client as IDisposable)
{
client.Send(mimeMessage);
- }
-
+ }
}
}
}
@@ -519,6 +519,9 @@
<Compile Include="Impl\Matchers\NotMatcher.cs" />
<Compile Include="Impl\Matchers\OrMatcher.cs" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>

0 comments on commit 2decb9b

Please sign in to comment.