Update packages and use Common.Logging instead of Common.Logging.Core.

themotleyfool · Dec 5, 2014 · cad62a3 · cad62a3
1 parent a89171e
commit cad62a3
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 34 deletions.
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Ciao" version="1.0.2" />
+  <package id="Ciao" version="1.1.0" />
   <package id="NUnit.Runners" version="2.6.3" />
 </packages>
diff --git a/Ciao.proj b/Ciao.proj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" InitialTargets="Validate" DefaultTargets="Bootstrap" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" InitialTargets="Validate" DefaultTargets="Bootstrap;Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <!--
         The main Ciao point of entry. Continuous Integration builds should invoke
         this build script with MSBuild 4.0 or later.
@@ -9,6 +9,7 @@
     <Import Project="Ciao.props" Condition="Exists('Ciao.props')"/>
 
     <PropertyGroup>
+        <ProjectDirectory>$(MSBuildThisFileDirectory)</ProjectDirectory>
         <BuildDirectory Condition=" '$(BuildDirectory)' == '' ">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'build'))$([System.IO.Path]::DirectorySeparatorChar)</BuildDirectory>
         <ToolsDirectory Condition=" '$(ToolsDirectory)' == '' ">$([System.IO.Path]::Combine('$(BuildDirectory)', 'tools'))$([System.IO.Path]::DirectorySeparatorChar)</ToolsDirectory>
         <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$([System.IO.Path]::Combine('$(ToolsDirectory)', 'NuGet.exe'))</NuGetExePath>
@@ -18,12 +19,15 @@
         <NuGetClientDownloadUrl Condition=" '$(NuGetClientDownloadUrl)' == '' ">https://www.nuget.org/nuget.exe</NuGetClientDownloadUrl>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <CiaoVersion>1.1.0</CiaoVersion>
+        <CiaoPackageEntryProject>$(ProjectDirectory)packages\Ciao.$(CiaoVersion)\tools\Ciao.targets</CiaoPackageEntryProject>
+    </PropertyGroup>
+
     <PropertyGroup>
         <BootstrapDependsOn>
             DownloadNuGetCommandLineClient;
             RestoreSolutionPackages;
-            ResolveCiao;
-            Build
         </BootstrapDependsOn>
     </PropertyGroup>
 
@@ -35,25 +39,65 @@
     <Target Name="Bootstrap" DependsOnTargets="$(BootstrapDependsOn)"/>
 
     <Target Name="RestoreSolutionPackages" DependsOnTargets="DownloadNuGetCommandLineClient">
-        <Exec Command="$(NuGetCommand) restore &quot;$(SolutionFile)&quot; -NonInteractive -Source http://www.nuget.org/api/v2/"/>
-    </Target>
-
-    <Target Name="ResolveCiao" Condition=" '$(CiaoPackageEntryProject)' == '' ">
+        <Exec Command="$(NuGetCommand) restore &quot;$(SolutionFile)&quot; -NonInteractive"/>
         <PropertyGroup>
-            <SolutionDirectory Condition="Exists('$(SolutionFile)')">$([System.IO.Path]::GetDirectoryName($([System.IO.Path]::GetFullPath('$(SolutionFile)'))))$([System.IO.Path]::DirectorySeparatorChar)</SolutionDirectory>
-            <SolutionPackageDirectory Condition="Exists('$(SolutionDirectory)')">$([System.IO.Path]::Combine('$(SolutionDirectory)', 'packages'))$([System.IO.Path]::DirectorySeparatorChar)</SolutionPackageDirectory>
+            <_CiaoRestoreSolutionPackagesCompleted>True</_CiaoRestoreSolutionPackagesCompleted>
         </PropertyGroup>
-        <ItemGroup>
-            <CiaoPackageEntryProject Include="$(SolutionPackageDirectory)Ciao.*\tools\Ciao.proj"/>
-        </ItemGroup>
-        <CreateProperty Value="%(CiaoPackageEntryProject.Identity)">
-            <Output TaskParameter="Value" PropertyName="CiaoPackageEntryProject"/>
-        </CreateProperty>
-        <Error Text="Unable to locate Caio package in Solution packages directory $(SolutionPackageDirectory) (is Ciao installed in the Solution?)" Condition="!Exists('$(CiaoPackageEntryProject)')"/>
     </Target>
 
-    <Target Name="Build">
-        <MSBuild Projects="$(CiaoPackageEntryProject)" Targets="$(CiaoTargets)" Properties="ProjectDirectory=$(MSBuildThisFileDirectory)"/>
+    <!--
+        Standard Targets
+
+        These targets are defined in Ciao.targets which will override them when the Ciao package
+        is restored and present. In case the build is restoring Ciao these targets are here
+        to enable targets to be executed after Ciao is restored.
+    -->
+
+    <Target Name="Clean" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
+        <MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Clean" Properties="$(_CiaoProperties)"/>
+    </Target>
+
+    <Target Name="Build" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
+        <MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Build" Properties="$(_CiaoProperties)"/>
+    </Target>
+
+    <Target Name="Compile" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
+        <MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Compile" Properties="$(_CiaoProperties)"/>
+    </Target>
+
+    <Target Name="Test" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
+        <MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Test" Properties="$(_CiaoProperties)"/>
+    </Target>
+
+    <Target Name="Package" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
+        <MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Package" Properties="$(_CiaoProperties)"/>
+    </Target>
+
+    <Target Name="Rebuild" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
+        <MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Rebuild" Properties="$(_CiaoProperties)"/>
+    </Target>
+
+
+    <!-- End of Standard Targets -->
+
+    <Target Name="ValidateCiaoInstalled">
+        <Error Text="Ciao targets must be restored using the Bootstrap target before executing other targets."
+               Condition="!Exists('$(CiaoPackageEntryProject)') and '$(_CiaoRestoreSolutionPackagesCompleted)' != 'True' "/>
+        <Error Text="Ciao targets file '$(CiaoPackageEntryProject)' does not exist. Make sure to install Ciao in $(SolutionFile)."
+               Condition="!Exists('$(CiaoPackageEntryProject)')"/>
+    </Target>
+
+    <Target Name="CreateProperties">
+        <PropertyGroup>
+            <_CiaoProperties>
+                ImportCiaoProperties=True;
+                ProjectDirectory=$(ProjectDirectory);
+                SolutionFile=$([System.IO.Path]::Combine('$(ProjectDirectory)', '$(SolutionFile)'));
+                BuildDirectory=$(BuildDirectory);
+                ToolsDirectory=$(ToolsDirectory);
+                NuGetExePath=$(NuGetExePath);
+            </_CiaoProperties>
+        </PropertyGroup>
     </Target>
 
     <Target Name="DownloadNuGetCommandLineClient" Condition="!Exists('$(NuGetExePath)')">
@@ -63,6 +107,8 @@
         <Exec Command="curl -L -o &quot;$(NuGetExePath)&quot; $(NuGetClientDownloadUrl)" Condition=" '$(OS)' != 'Windows_NT' "/>
     </Target>
 
+    <Import Project="$(CiaoPackageEntryProject)" Condition="Exists('$(CiaoPackageEntryProject)')"/>
+
     <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
         <ParameterGroup>
             <Url ParameterType="System.String" Required="true" />

diff --git a/source/Lucene.Net.Linq.Tests/Lucene.Net.Linq.Tests.csproj b/source/Lucene.Net.Linq.Tests/Lucene.Net.Linq.Tests.csproj
@@ -33,12 +33,9 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+    <Reference Include="Common.Logging, Version=2.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Common.Logging.2.2.0\lib\net40\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Core">
-      <HintPath>..\..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll</HintPath>
+      <HintPath>..\..\packages\Common.Logging.2.3.1\lib\net40\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -73,6 +70,9 @@
     <Reference Include="Lucene.Net.Contrib.SpellChecker">
       <HintPath>..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -83,9 +83,6 @@
     <Reference Include="Lucene.Net">
       <HintPath>..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="Remotion.Linq">
       <HintPath>..\..\packages\Remotion.Linq.1.13.183.0\lib\net35\Remotion.Linq.dll</HintPath>
     </Reference>

diff --git a/source/Lucene.Net.Linq.Tests/packages.config b/source/Lucene.Net.Linq.Tests/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Common.Logging" version="2.2.0" targetFramework="net40" />
-  <package id="Common.Logging.Core" version="2.2.0" targetFramework="net40" />
+  <package id="Common.Logging" version="2.3.1" targetFramework="net40" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net40" />
   <package id="Lucene.Net.Contrib" version="3.0.3" targetFramework="net40" />
-  <package id="NUnit" version="2.6.2" targetFramework="net40" />
+  <package id="NUnit" version="2.6.3" targetFramework="net40" />
   <package id="Remotion.Linq" version="1.13.183.0" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" />
   <package id="SharpZipLib" version="0.86.0" />

diff --git a/source/Lucene.Net.Linq/Lucene.Net.Linq.csproj b/source/Lucene.Net.Linq/Lucene.Net.Linq.csproj
@@ -34,8 +34,9 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging.Core">
-      <HintPath>..\..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll</HintPath>
+    <Reference Include="Common.Logging, Version=2.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Common.Logging.2.3.1\lib\net40\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

diff --git a/source/Lucene.Net.Linq/Lucene.Net.Linq.nuspec b/source/Lucene.Net.Linq/Lucene.Net.Linq.nuspec
@@ -20,7 +20,7 @@
       See https://github.com/themotleyfool/Lucene.Net.Linq/releases
     </releaseNotes>
     <dependencies>
-      <dependency id="Common.Logging.Core" version="[2.2, 3.0)"/>
+      <dependency id="Common.Logging" version="[2.3.1, 3.0)"/>
       <dependency id="Lucene.Net" version="[3.0.3, 3.6)"/>
       <dependency id="Remotion.Linq" version="[1.13.183, 1.15.10)"/>
     </dependencies>

diff --git a/source/Lucene.Net.Linq/packages.config b/source/Lucene.Net.Linq/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Common.Logging.Core" version="2.2.0" targetFramework="net40" />
+  <package id="Common.Logging" version="2.3.1" targetFramework="net40" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net40-Client" />
   <package id="Remotion.Linq" version="1.13.183.0" targetFramework="net40-Client" />
   <package id="SharpZipLib" version="0.86.0" />