Skip to content

Commit

Permalink
Ripple update
Browse files Browse the repository at this point in the history
  • Loading branch information
@bbehrens
bbehrens committed Jul 23, 2012
1 parent 75fbefe commit 5f4c2fd
Show file tree
Hide file tree
Showing 26 changed files with 49 additions and 27 deletions.
2 changes: 1 addition & 1 deletion buildsupport
Submodule buildsupport updated from cf465f to c33667
2 changes: 1 addition & 1 deletion src/Examples/Examples.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.0.9.9.159\lib\FubuCore.dll</HintPath>
<HintPath>..\packages\FubuCore.0.9.9.164\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions src/Examples/Examples.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Examples/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FubuCore" version="0.9.9.159" />
<package id="FubuCore" version="0.9.9.164" />
<package id="structuremap" version="2.6.3" />
</packages>
2 changes: 2 additions & 0 deletions src/ExtensionFixtures/ExtensionFixtures.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion src/SampleGenerator/SampleGenerator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.0.9.9.159\lib\FubuCore.dll</HintPath>
<HintPath>..\packages\FubuCore.0.9.9.164\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions src/SampleGenerator/SampleGenerator.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion src/SampleGenerator/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FubuCore" version="0.9.9.159" />
<package id="FubuCore" version="0.9.9.164" />
</packages>
2 changes: 2 additions & 0 deletions src/StoryTeller.Gallery/StoryTeller.Gallery.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion src/StoryTeller.Samples/StoryTeller.Samples.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.0.9.9.159\lib\FubuCore.dll</HintPath>
<HintPath>..\packages\FubuCore.0.9.9.164\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions src/StoryTeller.Samples/StoryTeller.Samples.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion src/StoryTeller.Samples/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FubuCore" version="0.9.9.159" />
<package id="FubuCore" version="0.9.9.164" />
<package id="NUnit" version="2.5.10.11092" />
<package id="structuremap" version="2.6.3" />
</packages>
2 changes: 2 additions & 0 deletions src/StoryTeller.TestRunner/StoryTeller.TestRunner.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
6 changes: 3 additions & 3 deletions src/StoryTeller.Testing/StoryTeller.Testing.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.0.9.9.159\lib\FubuCore.dll</HintPath>
<HintPath>..\packages\FubuCore.0.9.9.164\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuTestingSupport">
<HintPath>..\packages\FubuTestingSupport.0.9.9.159\lib\FubuTestingSupport.dll</HintPath>
<HintPath>..\packages\FubuTestingSupport.0.9.9.164\lib\FubuTestingSupport.dll</HintPath>
</Reference>
<Reference Include="HtmlTags">
<HintPath>..\packages\HtmlTags.1.1.0.80\lib\4.0\HtmlTags.dll</HintPath>
<HintPath>..\packages\HtmlTags.1.1.0.84\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions src/StoryTeller.Testing/StoryTeller.Testing.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
6 changes: 3 additions & 3 deletions src/StoryTeller.Testing/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FubuCore" version="0.9.9.159" />
<package id="FubuTestingSupport" version="0.9.9.159" />
<package id="HtmlTags" version="1.1.0.80" />
<package id="FubuCore" version="0.9.9.164" />
<package id="FubuTestingSupport" version="0.9.9.164" />
<package id="HtmlTags" version="1.1.0.84" />
<package id="Newtonsoft.Json" version="4.0.8" />
<package id="NUnit" version="2.5.10.11092" />
<package id="RhinoMocks" version="3.6" />
Expand Down
6 changes: 3 additions & 3 deletions src/StoryTeller.UserInterface.Testing/StoryTeller.UserInterface.Testing.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.0.9.9.159\lib\FubuCore.dll</HintPath>
<HintPath>..\packages\FubuCore.0.9.9.164\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuTestingSupport">
<HintPath>..\packages\FubuTestingSupport.0.9.9.159\lib\FubuTestingSupport.dll</HintPath>
<HintPath>..\packages\FubuTestingSupport.0.9.9.164\lib\FubuTestingSupport.dll</HintPath>
</Reference>
<Reference Include="HtmlTags">
<HintPath>..\packages\HtmlTags.1.1.0.80\lib\4.0\HtmlTags.dll</HintPath>
<HintPath>..\packages\HtmlTags.1.1.0.84\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions ...oryTeller.UserInterface.Testing/StoryTeller.UserInterface.Testing.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
6 changes: 3 additions & 3 deletions src/StoryTeller.UserInterface.Testing/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FubuCore" version="0.9.9.159" />
<package id="FubuTestingSupport" version="0.9.9.159" />
<package id="HtmlTags" version="1.1.0.80" />
<package id="FubuCore" version="0.9.9.164" />
<package id="FubuTestingSupport" version="0.9.9.164" />
<package id="HtmlTags" version="1.1.0.84" />
<package id="Newtonsoft.Json" version="4.0.8" />
<package id="NUnit" version="2.5.10.11092" />
<package id="RhinoMocks" version="3.6" />
Expand Down
4 changes: 2 additions & 2 deletions src/StoryTeller.UserInterface/StoryTeller.UserInterface.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.0.9.9.159\lib\FubuCore.dll</HintPath>
<HintPath>..\packages\FubuCore.0.9.9.164\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="HtmlTags">
<HintPath>..\packages\HtmlTags.1.1.0.80\lib\4.0\HtmlTags.dll</HintPath>
<HintPath>..\packages\HtmlTags.1.1.0.84\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
Expand Down
2 changes: 2 additions & 0 deletions src/StoryTeller.UserInterface/StoryTeller.UserInterface.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
4 changes: 2 additions & 2 deletions src/StoryTeller.UserInterface/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FubuCore" version="0.9.9.159" />
<package id="HtmlTags" version="1.1.0.80" />
<package id="FubuCore" version="0.9.9.164" />
<package id="HtmlTags" version="1.1.0.84" />
<package id="structuremap" version="2.6.3" />
</packages>
4 changes: 2 additions & 2 deletions src/StoryTeller/StoryTeller.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FubuCore">
<HintPath>..\packages\FubuCore.0.9.9.159\lib\FubuCore.dll</HintPath>
<HintPath>..\packages\FubuCore.0.9.9.164\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="HtmlTags">
<HintPath>..\packages\HtmlTags.1.1.0.80\lib\4.0\HtmlTags.dll</HintPath>
<HintPath>..\packages\HtmlTags.1.1.0.84\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/StoryTeller/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FubuCore" version="0.9.9.159" />
<package id="HtmlTags" version="1.1.0.80" />
<package id="FubuCore" version="0.9.9.164" />
<package id="HtmlTags" version="1.1.0.84" />
<package id="Newtonsoft.Json" version="4.0.8" />
<package id="structuremap" version="2.6.3" />
</packages>
2 changes: 2 additions & 0 deletions src/StoryTellerRunner/StoryTellerRunner.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 2 additions & 0 deletions src/StoryTellerUI/StoryTellerUI.csproj.DotSettings.user
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/Housekeeping/ProjectSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

0 comments on commit 5f4c2fd

Please sign in to comment.