Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix up the rest of the project files

  • Loading branch information...
commit 4733b030a341495e622ebb0d4f86d878590442ee 1 parent 556567f
@paulcbetts paulcbetts authored
View
2  ReactiveUI.Cocoa/ReactiveUI.Cocoa.csproj
@@ -10,7 +10,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ReactiveUI.Cocoa</RootNamespace>
<AssemblyName>ReactiveUI.Cocoa_Mono</AssemblyName>
- <LastXamMacNagTime>12/15/2012 10:45:01 PM</LastXamMacNagTime>
+ <LastXamMacNagTime>1/2/2013 10:55:11 PM</LastXamMacNagTime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
View
10 ReactiveUI.Routing/AutoDataTemplateBindingHook.cs
@@ -8,6 +8,10 @@
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Markup;
+#else
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Markup;
#endif
namespace ReactiveUI.Routing
@@ -37,7 +41,11 @@ public bool ExecuteHook(object source, object target, string sourceProperty, str
var itemsControl = target as ItemsControl;
if (itemsControl == null) return true;
- if (itemsControl.ItemTemplate != null || itemsControl.ItemTemplateSelector != null) return true;
+ if (itemsControl.ItemTemplate != null) return true;
+
+#if !SILVERLIGHT
+ if (itemsControl.ItemTemplateSelector != null) return true;
+#endif
itemsControl.ItemTemplate = DefaultItemTemplate;
return true;
View
2  ReactiveUI.Routing/ReactiveUI.Routing.csproj
@@ -68,11 +68,13 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RoutingState.cs" />
<Compile Include="RxRouting.cs" />
<Compile Include="RoutedViewHost.cs" />
+ <Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
View
11 ReactiveUI.Routing/ReactiveUI.Routing_Mono.csproj
@@ -17,7 +17,7 @@
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\Mono\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>DEBUG;TRACE; MONO</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -25,7 +25,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release\Mono\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>TRACE; MONO</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Mono\ReactiveUI.Routing.XML</DocumentationFile>
@@ -46,21 +46,22 @@
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\ext\mono\System.Reactive.Interfaces.dll</HintPath>
</Reference>
- <Reference Include="&lt;Module&gt;">
- <HintPath>..\ext\mono\System.Reactive.Linq.dll</HintPath>
- </Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\ext\mono\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\mono\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
+ <Reference Include="System.Reactive.Linq">
+ <HintPath>..\ext\mono\System.Reactive.Linq.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RoutingState.cs" />
<Compile Include="RxRouting.cs" />
+ <Compile Include="ServiceLocationRegistration.cs" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
View
2  ReactiveUI.Routing/ReactiveUI.Routing_Net45.csproj
@@ -68,11 +68,13 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RoutingState.cs" />
<Compile Include="RxRouting.cs" />
<Compile Include="RoutedViewHost.cs" />
+ <Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
View
2  ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj
@@ -88,11 +88,13 @@
<Reference Include="System.Windows.Browser" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RoutedViewHost.cs" />
<Compile Include="RoutingState.cs" />
<Compile Include="RxRouting.cs" />
+ <Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
View
2  ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj
@@ -114,11 +114,13 @@
<Reference Include="System.Net" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RoutedViewHost.cs" />
<Compile Include="RoutingState.cs" />
<Compile Include="RxRouting.cs" />
+ <Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
View
4 ReactiveUI.Routing/ReactiveUI.Routing_WP8.csproj
@@ -111,11 +111,13 @@
<Reference Include="System.Net" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RoutedViewHost.cs" />
<Compile Include="RoutingState.cs" />
<Compile Include="RxRouting.cs" />
+ <Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
@@ -139,4 +141,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
2  ReactiveUI.Routing/ServiceLocationRegistration.cs
@@ -10,7 +10,9 @@ public class ServiceLocationRegistration : IWantsToRegisterStuff
{
public void Register()
{
+#if !MONO
RxApp.Register(typeof(AutoDataTemplateBindingHook), typeof(IPropertyBindingHook));
+#endif
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.