Skip to content

Commit

Permalink
Fixing the build. Bumped fuburake and FubuCsProjFile
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaArnold committed Feb 11, 2014
1 parent 3c98e3f commit 14e8277
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 88 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ source 'http://rubygems.org'

gem "rake", "~>10.0.0"
gem "bundler", ">=1.3.5"
gem "fuburake", "~>0.5"
gem "fuburake", "~>1.0.1"
gem "ripple-cli", ">= 2.0.0.102"
gem "fubudocs", ">= 0.9.0.120"
2 changes: 1 addition & 1 deletion ripple.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Nugets>
<Dependency Name="Bottles" Version="2.0.0.550" Mode="Float" />
<Dependency Name="FubuCore" Version="1.1.0.242" Mode="Float" />
<Dependency Name="FubuCsProjFile" Version="1.0.0.58" Mode="Float" />
<Dependency Name="FubuCsProjFile" Version="1.2.0.88" Mode="Float" />
<Dependency Name="FubuObjectBlocks" Version="0.1.0.7" Mode="Float" />
<Dependency Name="Nuget.Core" Version="2.5" Mode="Fixed" />
<Dependency Name="NUnit" Version="2.5.10.11092" Mode="Fixed" />
Expand Down
177 changes: 91 additions & 86 deletions src/ripple.Docs/ripple.Docs.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ripple.Docs</RootNamespace>
<AssemblyName>ripple.Docs</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include=".package-manifest" />
<None Include="1.GettingStarted\1.Overview.spark" />
<None Include="1.GettingStarted\2.Concepts.spark" />
<None Include="1.GettingStarted\3.Feeds.spark" />
<None Include="1.GettingStarted\4.DirectoryStructure.spark" />
<None Include="1.GettingStarted\index.spark" />
<None Include="2.Commands\1.Clean.spark" />
<None Include="2.Commands\2.Float.spark" />
<None Include="2.Commands\3.Install.spark" />
<None Include="2.Commands\4.List.spark" />
<None Include="2.Commands\5.Lock.spark" />
<None Include="2.Commands\6.Restore.spark" />
<None Include="2.Commands\7.Update.spark" />
<None Include="2.Commands\8.Validate.spark" />
<None Include="2.Commands\index.spark" />
<None Include="index.spark">
<SubType>Designer</SubType>
</None>
<None Include="mappingExample.config" />
<None Include="sample-ripple.config" />
<None Include="splash.spark">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="Project.xml" />
<Content Include="ripple.cli.xml" />
</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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<EmbeddedResource Include="pak-WebContent.zip" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{5F6B1A70-3A36-4A4D-90F5-884B7413A79E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ripple.Docs</RootNamespace>
<AssemblyName>ripple.Docs</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include=".package-manifest" />
<None Include="1.GettingStarted\1.Overview.spark" />
<None Include="1.GettingStarted\2.Concepts.spark" />
<None Include="1.GettingStarted\3.Feeds.spark" />
<None Include="1.GettingStarted\4.DirectoryStructure.spark" />
<None Include="1.GettingStarted\index.spark" />
<None Include="2.Features\1.Local.spark" />
<None Include="2.Features\2.CreatingPackages.spark" />
<None Include="2.Features\index.spark" />
<None Include="3.Commands\1.Clean.spark" />
<None Include="3.Commands\10.Validate.spark" />
<None Include="3.Commands\2.CreatePackages.spark" />
<None Include="3.Commands\3.Float.spark" />
<None Include="3.Commands\4.Init.spark" />
<None Include="3.Commands\5.Install.spark" />
<None Include="3.Commands\6.List.spark" />
<None Include="3.Commands\7.Lock.spark" />
<None Include="3.Commands\8.Restore.spark" />
<None Include="3.Commands\9.Update.spark" />
<None Include="3.Commands\index.spark" />
<None Include="index.spark">
<SubType>Designer</SubType>
</None>
<None Include="mappingExample.config" />
<None Include="sample-ripple.config" />
<None Include="splash.spark">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="Project.xml" />
<Content Include="ripple.cli.xml" />
</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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<EmbeddedResource Include="pak-WebContent.zip" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
</Project>

0 comments on commit 14e8277

Please sign in to comment.