Permalink
Browse files

Updated to submodule dependency

  • Loading branch information...
grumpydev committed Oct 3, 2011
1 parent d8cb4fe commit e16202093e212f7f8a1c25ef7ae453ee528249d9
@@ -55,12 +55,6 @@
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<HintPath>..\packages\IronRuby.1.1.3\Lib\Microsoft.Scripting.Metadata.dll</HintPath>
</Reference>
- <Reference Include="Nancy">
- <HintPath>..\packages\Nancy.0.7.1\lib\net40\Nancy.dll</HintPath>
- </Reference>
- <Reference Include="Nancy.Hosting.Aspnet">
- <HintPath>..\packages\Nancy.Hosting.Aspnet.0.7.1\lib\net40\Nancy.Hosting.Aspnet.dll</HintPath>
- </Reference>
<Reference Include="SassAndCoffee.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SassAndCoffee.Core.1.0\lib\net40\SassAndCoffee.Core.dll</HintPath>
</Reference>
@@ -94,7 +88,7 @@
</Content>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\SharedAssemblyInfo.cs">
+ <Compile Include="..\..\dependencies\Nancy\src\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Bootstrapper.cs" />
@@ -104,6 +98,14 @@
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\dependencies\Nancy\src\Nancy.Hosting.Aspnet\Nancy.Hosting.Aspnet.csproj">
+ <Project>{15B7F794-0BB2-4B66-AD78-4A951F1209B2}</Project>
+ <Name>Nancy.Hosting.Aspnet</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\dependencies\Nancy\src\Nancy\Nancy.csproj">
+ <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
+ <Name>Nancy</Name>
+ </ProjectReference>
<ProjectReference Include="..\Nancy.SassAndCoffee\Nancy.SassAndCoffee.csproj">
<Project>{1079A176-5E38-4FD2-AAB7-60BE06D3120E}</Project>
<Name>Nancy.SassAndCoffee</Name>
@@ -6,14 +6,5 @@
<configuration>
<system.web>
<compilation debug="true" targetFramework="4.0" />
- <httpHandlers>
- <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
- </httpHandlers>
</system.web>
- <system.webServer>
- <validation validateIntegratedModeConfiguration="false" />
- <handlers>
- <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
- </handlers>
- </system.webServer>
</configuration>
@@ -2,6 +2,4 @@
<packages>
<package id="IronRuby" version="1.1.3" />
<package id="SassAndCoffee.Core" version="1.0" />
- <package id="Nancy.Hosting.Aspnet" version="0.7.1" />
- <package id="Nancy" version="0.7.1" />
</packages>
@@ -5,20 +5,50 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.SassAndCoffee", "Nanc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.SassAndCoffee.Demo", "Nancy.SassAndCoffee.Demo\Nancy.SassAndCoffee.Demo.csproj", "{69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy", "..\dependencies\Nancy\src\Nancy\Nancy.csproj", "{34576216-0DCA-4B0F-A0DC-9075E75A676F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Aspnet", "..\dependencies\Nancy\src\Nancy.Hosting.Aspnet\Nancy.Hosting.Aspnet.csproj", "{15B7F794-0BB2-4B66-AD78-4A951F1209B2}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ MonoDebug|Any CPU = MonoDebug|Any CPU
+ MonoRelease|Any CPU = MonoRelease|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1079A176-5E38-4FD2-AAB7-60BE06D3120E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1079A176-5E38-4FD2-AAB7-60BE06D3120E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1079A176-5E38-4FD2-AAB7-60BE06D3120E}.MonoDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1079A176-5E38-4FD2-AAB7-60BE06D3120E}.MonoDebug|Any CPU.Build.0 = Debug|Any CPU
+ {1079A176-5E38-4FD2-AAB7-60BE06D3120E}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {1079A176-5E38-4FD2-AAB7-60BE06D3120E}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
{1079A176-5E38-4FD2-AAB7-60BE06D3120E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1079A176-5E38-4FD2-AAB7-60BE06D3120E}.Release|Any CPU.Build.0 = Release|Any CPU
{69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.MonoDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.MonoDebug|Any CPU.Build.0 = Debug|Any CPU
+ {69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
{69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69EF6E2C-99C0-4636-B6C9-FBE12D9563A3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {34576216-0DCA-4B0F-A0DC-9075E75A676F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -52,9 +52,6 @@
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<HintPath>..\packages\IronRuby.1.1.3\Lib\Microsoft.Scripting.Metadata.dll</HintPath>
</Reference>
- <Reference Include="Nancy">
- <HintPath>..\packages\Nancy.0.7.1\lib\net40\Nancy.dll</HintPath>
- </Reference>
<Reference Include="SassAndCoffee.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SassAndCoffee.Core.1.0\lib\net40\SassAndCoffee.Core.dll</HintPath>
@@ -71,7 +68,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\SharedAssemblyInfo.cs">
+ <Compile Include="..\..\dependencies\Nancy\src\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Hooks.cs" />
@@ -80,6 +77,12 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\dependencies\Nancy\src\Nancy\Nancy.csproj">
+ <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
+ <Name>Nancy</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -2,5 +2,4 @@
<packages>
<package id="IronRuby" version="1.1.3" />
<package id="SassAndCoffee.Core" version="1.0" />
- <package id="Nancy" version="0.7.1" />
</packages>
@@ -1,8 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("Nancy")]
-[assembly: AssemblyDescription("A Sinatra inspired web framework for the .NET platform")]
-[assembly: AssemblyCompany("Nancy")]
-[assembly: AssemblyProduct("Nancy")]
-[assembly: AssemblyCopyright("Copyright (C) Andreas Hakansson, Steven Robbins and contributors")]
-[assembly: AssemblyVersion("0.0.0")]
Binary file not shown.
Binary file not shown.
@@ -1,14 +0,0 @@
-<configuration>
- <system.web>
- <httpHandlers>
- <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*"/>
- </httpHandlers>
- </system.web>
-
- <system.webServer>
- <validation validateIntegratedModeConfiguration="false"/>
- <handlers>
- <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*"/>
- </handlers>
- </system.webServer>
-</configuration>

0 comments on commit e162020

Please sign in to comment.