Skip to content

Commit cad62a3

Browse files
chriseldredgechriseldredge
committed
Update packages and use Common.Logging instead of Common.Logging.Core.
1 parent a89171e commit cad62a3

File tree

7 files changed

+77
-34
lines changed

7 files changed

+77
-34
lines changed

‎.nuget/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Ciao" version="1.0.2" />
3+
<package id="Ciao" version="1.1.0" />
44
<package id="NUnit.Runners" version="2.6.3" />
55
</packages>

‎Ciao.proj‎

Lines changed: 64 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" InitialTargets="Validate" DefaultTargets="Bootstrap" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" InitialTargets="Validate" DefaultTargets="Bootstrap;Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!--
44
The main Ciao point of entry. Continuous Integration builds should invoke
55
this build script with MSBuild 4.0 or later.
@@ -9,6 +9,7 @@
99
<Import Project="Ciao.props" Condition="Exists('Ciao.props')"/>
1010

1111
<PropertyGroup>
12+
<ProjectDirectory>$(MSBuildThisFileDirectory)</ProjectDirectory>
1213
<BuildDirectory Condition=" '$(BuildDirectory)' == '' ">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'build'))$([System.IO.Path]::DirectorySeparatorChar)</BuildDirectory>
1314
<ToolsDirectory Condition=" '$(ToolsDirectory)' == '' ">$([System.IO.Path]::Combine('$(BuildDirectory)', 'tools'))$([System.IO.Path]::DirectorySeparatorChar)</ToolsDirectory>
1415
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$([System.IO.Path]::Combine('$(ToolsDirectory)', 'NuGet.exe'))</NuGetExePath>
@@ -18,12 +19,15 @@
1819
<NuGetClientDownloadUrl Condition=" '$(NuGetClientDownloadUrl)' == '' ">https://www.nuget.org/nuget.exe</NuGetClientDownloadUrl>
1920
</PropertyGroup>
2021

22+
<PropertyGroup>
23+
<CiaoVersion>1.1.0</CiaoVersion>
24+
<CiaoPackageEntryProject>$(ProjectDirectory)packages\Ciao.$(CiaoVersion)\tools\Ciao.targets</CiaoPackageEntryProject>
25+
</PropertyGroup>
26+
2127
<PropertyGroup>
2228
<BootstrapDependsOn>
2329
DownloadNuGetCommandLineClient;
2430
RestoreSolutionPackages;
25-
ResolveCiao;
26-
Build
2731
</BootstrapDependsOn>
2832
</PropertyGroup>
2933

@@ -35,25 +39,65 @@
3539
<Target Name="Bootstrap" DependsOnTargets="$(BootstrapDependsOn)"/>
3640

3741
<Target Name="RestoreSolutionPackages" DependsOnTargets="DownloadNuGetCommandLineClient">
38-
<Exec Command="$(NuGetCommand) restore &quot;$(SolutionFile)&quot; -NonInteractive -Source http://www.nuget.org/api/v2/"/>
39-
</Target>
40-
41-
<Target Name="ResolveCiao" Condition=" '$(CiaoPackageEntryProject)' == '' ">
42+
<Exec Command="$(NuGetCommand) restore &quot;$(SolutionFile)&quot; -NonInteractive"/>
4243
<PropertyGroup>
43-
<SolutionDirectory Condition="Exists('$(SolutionFile)')">$([System.IO.Path]::GetDirectoryName($([System.IO.Path]::GetFullPath('$(SolutionFile)'))))$([System.IO.Path]::DirectorySeparatorChar)</SolutionDirectory>
44-
<SolutionPackageDirectory Condition="Exists('$(SolutionDirectory)')">$([System.IO.Path]::Combine('$(SolutionDirectory)', 'packages'))$([System.IO.Path]::DirectorySeparatorChar)</SolutionPackageDirectory>
44+
<_CiaoRestoreSolutionPackagesCompleted>True</_CiaoRestoreSolutionPackagesCompleted>
4545
</PropertyGroup>
46-
<ItemGroup>
47-
<CiaoPackageEntryProject Include="$(SolutionPackageDirectory)Ciao.*\tools\Ciao.proj"/>
48-
</ItemGroup>
49-
<CreateProperty Value="%(CiaoPackageEntryProject.Identity)">
50-
<Output TaskParameter="Value" PropertyName="CiaoPackageEntryProject"/>
51-
</CreateProperty>
52-
<Error Text="Unable to locate Caio package in Solution packages directory $(SolutionPackageDirectory) (is Ciao installed in the Solution?)" Condition="!Exists('$(CiaoPackageEntryProject)')"/>
5346
</Target>
5447

55-
<Target Name="Build">
56-
<MSBuild Projects="$(CiaoPackageEntryProject)" Targets="$(CiaoTargets)" Properties="ProjectDirectory=$(MSBuildThisFileDirectory)"/>
48+
<!--
49+
Standard Targets
50+
51+
These targets are defined in Ciao.targets which will override them when the Ciao package
52+
is restored and present. In case the build is restoring Ciao these targets are here
53+
to enable targets to be executed after Ciao is restored.
54+
-->
55+
56+
<Target Name="Clean" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
57+
<MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Clean" Properties="$(_CiaoProperties)"/>
58+
</Target>
59+
60+
<Target Name="Build" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
61+
<MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Build" Properties="$(_CiaoProperties)"/>
62+
</Target>
63+
64+
<Target Name="Compile" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
65+
<MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Compile" Properties="$(_CiaoProperties)"/>
66+
</Target>
67+
68+
<Target Name="Test" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
69+
<MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Test" Properties="$(_CiaoProperties)"/>
70+
</Target>
71+
72+
<Target Name="Package" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
73+
<MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Package" Properties="$(_CiaoProperties)"/>
74+
</Target>
75+
76+
<Target Name="Rebuild" DependsOnTargets="ValidateCiaoInstalled;CreateProperties">
77+
<MSBuild Projects="$(CiaoPackageEntryProject)" Targets="Rebuild" Properties="$(_CiaoProperties)"/>
78+
</Target>
79+
80+
81+
<!-- End of Standard Targets -->
82+
83+
<Target Name="ValidateCiaoInstalled">
84+
<Error Text="Ciao targets must be restored using the Bootstrap target before executing other targets."
85+
Condition="!Exists('$(CiaoPackageEntryProject)') and '$(_CiaoRestoreSolutionPackagesCompleted)' != 'True' "/>
86+
<Error Text="Ciao targets file '$(CiaoPackageEntryProject)' does not exist. Make sure to install Ciao in $(SolutionFile)."
87+
Condition="!Exists('$(CiaoPackageEntryProject)')"/>
88+
</Target>
89+
90+
<Target Name="CreateProperties">
91+
<PropertyGroup>
92+
<_CiaoProperties>
93+
ImportCiaoProperties=True;
94+
ProjectDirectory=$(ProjectDirectory);
95+
SolutionFile=$([System.IO.Path]::Combine('$(ProjectDirectory)', '$(SolutionFile)'));
96+
BuildDirectory=$(BuildDirectory);
97+
ToolsDirectory=$(ToolsDirectory);
98+
NuGetExePath=$(NuGetExePath);
99+
</_CiaoProperties>
100+
</PropertyGroup>
57101
</Target>
58102

59103
<Target Name="DownloadNuGetCommandLineClient" Condition="!Exists('$(NuGetExePath)')">
@@ -63,6 +107,8 @@
63107
<Exec Command="curl -L -o &quot;$(NuGetExePath)&quot; $(NuGetClientDownloadUrl)" Condition=" '$(OS)' != 'Windows_NT' "/>
64108
</Target>
65109

110+
<Import Project="$(CiaoPackageEntryProject)" Condition="Exists('$(CiaoPackageEntryProject)')"/>
111+
66112
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
67113
<ParameterGroup>
68114
<Url ParameterType="System.String" Required="true" />

‎source/Lucene.Net.Linq.Tests/Lucene.Net.Linq.Tests.csproj‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@
3333
<SignAssembly>false</SignAssembly>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Common.Logging, Version=2.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
36+
<Reference Include="Common.Logging, Version=2.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
3737
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\..\packages\Common.Logging.2.2.0\lib\net40\Common.Logging.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Common.Logging.Core">
41-
<HintPath>..\..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll</HintPath>
38+
<HintPath>..\..\packages\Common.Logging.2.3.1\lib\net40\Common.Logging.dll</HintPath>
4239
</Reference>
4340
<Reference Include="ICSharpCode.SharpZipLib">
4441
<HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -73,6 +70,9 @@
7370
<Reference Include="Lucene.Net.Contrib.SpellChecker">
7471
<HintPath>..\..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll</HintPath>
7572
</Reference>
73+
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
75+
</Reference>
7676
<Reference Include="System" />
7777
<Reference Include="System.Core" />
7878
<Reference Include="System.Xml.Linq" />
@@ -83,9 +83,6 @@
8383
<Reference Include="Lucene.Net">
8484
<HintPath>..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
8585
</Reference>
86-
<Reference Include="nunit.framework">
87-
<HintPath>..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
88-
</Reference>
8986
<Reference Include="Remotion.Linq">
9087
<HintPath>..\..\packages\Remotion.Linq.1.13.183.0\lib\net35\Remotion.Linq.dll</HintPath>
9188
</Reference>

‎source/Lucene.Net.Linq.Tests/packages.config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Common.Logging" version="2.2.0" targetFramework="net40" />
4-
<package id="Common.Logging.Core" version="2.2.0" targetFramework="net40" />
3+
<package id="Common.Logging" version="2.3.1" targetFramework="net40" />
54
<package id="Lucene.Net" version="3.0.3" targetFramework="net40" />
65
<package id="Lucene.Net.Contrib" version="3.0.3" targetFramework="net40" />
7-
<package id="NUnit" version="2.6.2" targetFramework="net40" />
6+
<package id="NUnit" version="2.6.3" targetFramework="net40" />
87
<package id="Remotion.Linq" version="1.13.183.0" targetFramework="net40" />
98
<package id="RhinoMocks" version="3.6.1" />
109
<package id="SharpZipLib" version="0.86.0" />

‎source/Lucene.Net.Linq/Lucene.Net.Linq.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
<NoWarn>1591</NoWarn>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Common.Logging.Core">
38-
<HintPath>..\..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll</HintPath>
37+
<Reference Include="Common.Logging, Version=2.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
38+
<SpecificVersion>False</SpecificVersion>
39+
<HintPath>..\..\packages\Common.Logging.2.3.1\lib\net40\Common.Logging.dll</HintPath>
3940
</Reference>
4041
<Reference Include="ICSharpCode.SharpZipLib">
4142
<HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

‎source/Lucene.Net.Linq/Lucene.Net.Linq.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
See https://github.com/themotleyfool/Lucene.Net.Linq/releases
2121
</releaseNotes>
2222
<dependencies>
23-
<dependency id="Common.Logging.Core" version="[2.2, 3.0)"/>
23+
<dependency id="Common.Logging" version="[2.3.1, 3.0)"/>
2424
<dependency id="Lucene.Net" version="[3.0.3, 3.6)"/>
2525
<dependency id="Remotion.Linq" version="[1.13.183, 1.15.10)"/>
2626
</dependencies>

‎source/Lucene.Net.Linq/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Common.Logging.Core" version="2.2.0" targetFramework="net40" />
3+
<package id="Common.Logging" version="2.3.1" targetFramework="net40" />
44
<package id="Lucene.Net" version="3.0.3" targetFramework="net40-Client" />
55
<package id="Remotion.Linq" version="1.13.183.0" targetFramework="net40-Client" />
66
<package id="SharpZipLib" version="0.86.0" />

0 commit comments

Comments
 (0)