Skip to content

Commit

Permalink
Upgraded RavenDB to 2.0 stable and modified build.xml, now cc builds …
Browse files Browse the repository at this point in the history
…from the correct repo
  • Loading branch information
Marcus Lindblom committed Jan 7, 2013
1 parent 57d0fe8 commit 2c7675a
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 49 deletions.
28 changes: 13 additions & 15 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,38 @@
<items type="class" path="BrickPile.Sample/Areas" generateXml="false" target="runtime|testDebug" autover="true">
<item name="BrickPile.UI" projectFolderName="UI" type="web" />
</items>
<items path="packages/NUnit.2.6.0.12054/lib" type="reference" target="testDebug">
<items path="packages/NUnit.2.6.2/lib" type="reference" target="testDebug">
<item name="nunit.framework.dll"/>
</items>
<items path="packages/Moq.4.0.10827/lib/NET40" type="reference" target="testDebug">
<item name="Moq.dll"/>
</items>
<items path="packages/structuremap.2.6.3/lib" type="reference" target="testDebug">
<items path="packages/structuremap.2.6.4.1/lib" type="reference" target="testDebug">
<item name="StructureMap.dll"/>
</items>
<items path="packages/RavenDB.Embedded.1.2.2083-Unstable/lib/net40" type="reference" target="testDebug">
<items path="packages/RavenDB.Embedded.2.0.2230/lib/net40" type="reference" target="testDebug">
<item name="Raven.Client.Embedded.dll"/>
</items>
<items path="packages/RavenDB.Database.1.2.2083-Unstable/lib/net40" type="reference" target="testDebug">
<item name="BouncyCastle.Crypto.dll" />
<items path="packages/RavenDB.Database.2.0.2230/lib/net40" type="reference" target="testDebug">
<item name="Esent.Interop.dll" />
<item name="FSharp.Core.dll" />
<item name="GeoAPI.dll" />
<item name="ICSharpCode.NRefactory.CSharp.dll" />
<item name="ICSharpCode.NRefactory.dll" />
<item name="Jint.Raven.dll" />
<item name="Lucene.Net.Contrib.Spatial.NTS.dll" />
<item name="Lucene.Net.dll" />
<item name="NetTopologySuite.dll" />
<item name="PowerCollections.dll" />
<item name="Raven.Abstractions.dll"/>
<item name="Raven.Database.dll"/>
<item name="Mono.Cecil.dll" />
<item name="NetTopologySuite.dll"/>
<item name="PowerCollections.dll"/>
<item name="Raven.Abstractions.dll" />
<item name="Raven.Database.dll" />
<item name="Spatial4n.Core.NTS.dll" />
</items>
<items path="packages/RavenDB.Client.1.2.2083-Unstable/lib/net40" type="reference" target="testDebug">
<items path="packages/RavenDB.Client.2.0.2230/lib/net40" type="reference" target="testDebug">
<item name="Raven.Abstractions.dll" />
<item name="Raven.Client.Lightweight.dll" />
</items>
<items path="packages/NLog.2.0.0.2000/lib/net40" type="reference" target="testDebug">
<item name="NLog.dll"/>
</items>
<items path="packages/Newtonsoft.Json.4.5.1/lib/net40" type="reference" target="testDebug">
<items path="packages/Newtonsoft.Json.4.5.11/lib/net40" type="reference" target="testDebug">
<item name="Newtonsoft.Json.dll"/>
</items>
<items type="nunit" target="testDebug" autover="true" framework="4.0">
Expand Down
2 changes: 1 addition & 1 deletion src/BrickPile/BrickPile-AmazonS3.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>Amazon S3 virtual path provider for BrickPile CMS</description>
<tags>brickpile cms ravendb mvc nosql amazon s3</tags>
<dependencies>
<dependency id="AWSSDK" version="1.4.6.3" />
<dependency id="AWSSDK" version="1.5.10.0" />
</dependencies>
</metadata>
</package>
10 changes: 5 additions & 5 deletions src/BrickPile/BrickPile.Core/BrickPile.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Raven.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Abstractions.dll</HintPath>
<HintPath>..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<HintPath>..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand All @@ -63,15 +63,15 @@
<Compile Include="Infrastructure\Listeners\StoreListener.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BrickPile.Domain\BrickPile.Domain.csproj">
<Project>{827F415E-59D8-4F6A-B47A-1F345A790F5E}</Project>
<Name>BrickPile.Domain</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
4 changes: 1 addition & 3 deletions src/BrickPile/BrickPile.Core/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RavenDB" version="1.0.0.371" />
<package id="RavenDB.Client" version="1.2.2059-Unstable" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2230" targetFramework="net40" />
</packages>
6 changes: 3 additions & 3 deletions src/BrickPile/BrickPile.Docs/BrickPile.Docs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Raven.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Database.2.0.2187-Unstable\lib\net40\Raven.Abstractions.dll</HintPath>
<HintPath>..\packages\RavenDB.Database.2.0.2230\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<HintPath>..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Database, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Database.2.0.2187-Unstable\lib\net40\Raven.Database.dll</HintPath>
<HintPath>..\packages\RavenDB.Database.2.0.2230\lib\net40\Raven.Database.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand Down
4 changes: 2 additions & 2 deletions src/BrickPile/BrickPile.Docs/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RavenDB.Client" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Database" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2230" targetFramework="net40" />
<package id="RavenDB.Database" version="2.0.2230" targetFramework="net40" />
<package id="SyntaxHighlighter" version="3.0.83" />
</packages>
8 changes: 4 additions & 4 deletions src/BrickPile/BrickPile.Sample/Areas/UI/BrickPile.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@
<HintPath>..\..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Abstractions.dll</HintPath>
<HintPath>..\..\..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Embedded, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.Embedded.2.0.2187-Unstable\lib\net40\Raven.Client.Embedded.dll</HintPath>
<HintPath>..\..\..\packages\RavenDB.Embedded.2.0.2230\lib\net40\Raven.Client.Embedded.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<HintPath>..\..\..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Database, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.Database.2.0.2187-Unstable\lib\net40\Raven.Database.dll</HintPath>
<HintPath>..\..\..\packages\RavenDB.Database.2.0.2230\lib\net40\Raven.Database.dll</HintPath>
</Reference>
<Reference Include="SquishIt.Framework, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
6 changes: 3 additions & 3 deletions src/BrickPile/BrickPile.Sample/Areas/UI/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Database" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Embedded" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2230" targetFramework="net40" />
<package id="RavenDB.Database" version="2.0.2230" targetFramework="net40" />
<package id="RavenDB.Embedded" version="2.0.2230" targetFramework="net40" />
<package id="SquishIt" version="0.9.2-beta3" targetFramework="net40" />
<package id="structuremap" version="2.6.4.1" targetFramework="net40" />
<package id="underscore.js" version="1.4.3" targetFramework="net40" />
Expand Down
4 changes: 2 additions & 2 deletions src/BrickPile/BrickPile.Sample/BrickPile.Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Abstractions.dll</HintPath>
<HintPath>..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<HintPath>..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand Down
2 changes: 1 addition & 1 deletion src/BrickPile/BrickPile.Sample/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2230" targetFramework="net40" />
</packages>
8 changes: 4 additions & 4 deletions src/BrickPile/BrickPile.Tests/BrickPile.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Abstractions.dll</HintPath>
<HintPath>..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Embedded, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Embedded.2.0.2187-Unstable\lib\net40\Raven.Client.Embedded.dll</HintPath>
<HintPath>..\packages\RavenDB.Embedded.2.0.2230\lib\net40\Raven.Client.Embedded.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Client.2.0.2187-Unstable\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<HintPath>..\packages\RavenDB.Client.2.0.2230\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Database, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\packages\RavenDB.Database.2.0.2187-Unstable\lib\net40\Raven.Database.dll</HintPath>
<HintPath>..\packages\RavenDB.Database.2.0.2230\lib\net40\Raven.Database.dll</HintPath>
</Reference>
<Reference Include="StructureMap, Version=2.6.4.0, Culture=neutral, PublicKeyToken=e60ad81abae3c223, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
6 changes: 3 additions & 3 deletions src/BrickPile/BrickPile.Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<packages>
<package id="Moq" version="4.0.10827" />
<package id="NUnit" version="2.6.2" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Database" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Embedded" version="2.0.2187-Unstable" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2230" targetFramework="net40" />
<package id="RavenDB.Database" version="2.0.2230" targetFramework="net40" />
<package id="RavenDB.Embedded" version="2.0.2230" targetFramework="net40" />
<package id="structuremap" version="2.6.4.1" targetFramework="net40" />
</packages>
6 changes: 3 additions & 3 deletions src/BrickPile/BrickPile.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<description>BrickPile is a lightweight CMS built on RavenDB and ASP.NET MVC 4</description>
<tags>brickpile cms ravendb mvc nosql</tags>
<dependencies>
<dependency id="RavenDB.Embedded" version="1.2.2060-Unstable" />
<dependency id="structuremap" version="2.6.3" />
<dependency id="WebActivator" version="1.5" />
<dependency id="RavenDB.Embedded" version="2.0.2230" />
<dependency id="structuremap" version="2.6.4.1" />
<dependency id="WebActivator" version="1.5.3" />
<dependency id="SquishIt" version="0.8.6" />
</dependencies>
</metadata>
Expand Down

0 comments on commit 2c7675a

Please sign in to comment.