Permalink
Browse files

Merged with code52/master and corrected .gitignore file

  • Loading branch information...
2 parents b39eb44 + c66fe3b commit 7479487fb66c59114b51e8fe93ec7945a0050f61 @alexbeletsky alexbeletsky committed Feb 10, 2012
View
@@ -1,19 +1,18 @@
-[Oo]bj/
-[Bb]in/
-*.user
-/TestResults
-*.vspscc
-*.vssscc
-deploy
-deploy/*
-*.suo
-*.cache
-packages/
-msbuild.log
-artifacts/log
-artifacts/
-post-build*
-_ReSharper.*
-deploy-to-ec2*
-*crunchsolution*
-*crunchproject*
+[Oo]bj/
+[Bb]in/
+*.user
+/TestResults
+*.vspscc
+*.vssscc
+deploy
+deploy/*
+*.suo
+*.cache
+packages/
+msbuild.log
+artifacts/log
+artifacts/
+post-build*
+_ReSharper.*
+*deploy-to-ec2*
+*ncrunch*
@@ -41,9 +41,6 @@
<Reference Include="Autofac.Configuration">
<HintPath>..\packages\Autofac.2.5.2.830\lib\NET40\Autofac.Configuration.dll</HintPath>
</Reference>
- <Reference Include="Devtalk.EF.CodeFirst">
- <HintPath>..\packages\EFCodeFirst.CreateTablesOnly.1.0.2\lib\Devtalk.EF.CodeFirst.dll</HintPath>
- </Reference>
<Reference Include="EntityFramework, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\EntityFramework.4.3.0-beta1\lib\net40\EntityFramework.dll</HintPath>
@@ -1,4 +1,3 @@
-using System;
using System.Data.Entity.Migrations;
using Autofac;
using Ideastrike.Nancy.Helpers;
@@ -13,8 +12,6 @@ namespace Ideastrike.Nancy
{
public class IdeastrikeBootstrapper : AutofacNancyBootstrapper
{
- private const string SqlClient = "System.Data.SqlClient";
-
protected override void ConfigureApplicationContainer(ILifetimeScope existingContainer)
{
var builder = new ContainerBuilder();
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="2.5.2.830" />
- <package id="EFCodeFirst.CreateTablesOnly" version="1.0.2" />
<package id="EntityFramework" version="4.3.0-beta1" />
<package id="MarkdownDeep.NET" version="1.4" />
<package id="MarkdownHelper" version="1.3" />
@@ -117,4 +117,4 @@
<Target Name="AfterBuild" Condition=" '$(Configuration)' == 'Debug' AND $(NCRUNCH) == ''">
<xunit Assembly="bin\debug\IdeaStrike.Tests.dll" />
</Target>
-</Project>
+</Project>

0 comments on commit 7479487

Please sign in to comment.