Merge branch 'releases/3.3.0'

alphacloud · Nov 1, 2016 · 26f33fa · 26f33fa
2 parents 17c9cda + 1a8f2ec
commit 26f33fa
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 29 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
diff --git a/build.proj b/build.proj
@@ -46,7 +46,7 @@
 
   <Target Name="Test" DependsOnTargets="BuildAll">
     <Exec WorkingDirectory="$(SrcDir)\Tests\bin\$(BuildConfig)"
-          Command="$(PkgDir)\Nunit.ConsoleRunner.3.4.1\tools\nunit3-console.exe Autofac.Extras.Quartz.Tests.dll /stoponerror --dispose-runners --noheader"
+          Command="$(PkgDir)\Nunit.ConsoleRunner.3.5.0\tools\nunit3-console.exe Autofac.Extras.Quartz.Tests.dll /stoponerror --dispose-runners --noheader"
     />          
   </Target>
 

diff --git a/src/Autofac.Extras.Quartz/Autofac.Extras.Quartz.csproj b/src/Autofac.Extras.Quartz/Autofac.Extras.Quartz.csproj
@@ -54,8 +54,8 @@
       <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="JetBrains.Annotations, Version=10.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.2.0\lib\net\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Quartz, Version=2.4.1.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">

diff --git a/src/Autofac.Extras.Quartz/packages.config b/src/Autofac.Extras.Quartz/packages.config
@@ -3,7 +3,7 @@
   <package id="Autofac" version="4.1.1" targetFramework="net451" />
   <package id="Common.Logging" version="3.3.1" targetFramework="net40" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net40" />
-  <package id="JetBrains.Annotations" version="10.2.0" targetFramework="net451" developmentDependency="true" />
+  <package id="JetBrains.Annotations" version="10.2.1" targetFramework="net451" developmentDependency="true" />
   <package id="Quartz" version="2.4.1" targetFramework="net451" />
   <package id="System.Runtime" version="4.1.0" targetFramework="net451" />
 </packages>
diff --git a/src/Samples/SimpleService/SimpleService.csproj b/src/Samples/SimpleService/SimpleService.csproj
@@ -67,15 +67,15 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Topshelf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Topshelf.4.0.2\lib\net452\Topshelf.dll</HintPath>
+      <HintPath>..\..\packages\Topshelf.4.0.3\lib\net452\Topshelf.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Topshelf.Autofac, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Topshelf.Autofac.3.0.0\lib\net452\Topshelf.Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Topshelf.Log4Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Topshelf.Log4Net.4.0.2\lib\net452\Topshelf.Log4Net.dll</HintPath>
+      <HintPath>..\..\packages\Topshelf.Log4Net.4.0.3\lib\net452\Topshelf.Log4Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Topshelf.Quartz, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/src/Samples/SimpleService/packages.config b/src/Samples/SimpleService/packages.config
@@ -6,8 +6,8 @@
   <package id="Common.Logging.Log4Net1213" version="3.3.1" targetFramework="net45" />
   <package id="log4net" version="2.0.5" targetFramework="net45" />
   <package id="Quartz" version="2.4.1" targetFramework="net452" />
-  <package id="Topshelf" version="4.0.2" targetFramework="net452" />
+  <package id="Topshelf" version="4.0.3" targetFramework="net452" />
   <package id="Topshelf.Autofac" version="3.0.0" targetFramework="net452" />
-  <package id="Topshelf.Log4Net" version="4.0.2" targetFramework="net452" />
+  <package id="Topshelf.Log4Net" version="4.0.3" targetFramework="net452" />
   <package id="Topshelf.Quartz" version="0.4.0.1" targetFramework="net45" />
 </packages>
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -70,21 +70,21 @@
       <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.14.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.14.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.16.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.16.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.14.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.14.0\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.16.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.16.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="JetBrains.Annotations, Version=10.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.2.0\lib\net\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Moq, Version=4.5.22.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.22\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.23.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.23\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">

diff --git a/src/Tests/app.config b/src/Tests/app.config
@@ -13,7 +13,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.22.0" newVersion="4.5.22.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.23.0" newVersion="4.5.23.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />

diff --git a/src/Tests/packages.config b/src/Tests/packages.config
@@ -6,11 +6,11 @@
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
-  <package id="FluentAssertions" version="4.14.0" targetFramework="net451" />
-  <package id="JetBrains.Annotations" version="10.2.0" targetFramework="net451" />
-  <package id="Moq" version="4.5.22" targetFramework="net451" />
+  <package id="FluentAssertions" version="4.16.0" targetFramework="net451" />
+  <package id="JetBrains.Annotations" version="10.2.1" targetFramework="net451" />
+  <package id="Moq" version="4.5.23" targetFramework="net451" />
   <package id="NUnit" version="3.5.0" targetFramework="net451" />
-  <package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net451" />
+  <package id="NUnit.ConsoleRunner" version="3.5.0" targetFramework="net451" />
   <package id="Quartz" version="2.4.1" targetFramework="net451" />
   <package id="System.Runtime" version="4.1.0" targetFramework="net451" />
 </packages>