Permalink
Browse files

REVERT ME

  • Loading branch information...
1 parent 2ff8bfa commit 5781c639f8dd570f27e9b1faa93a595d48a2202b @paulcbetts paulcbetts committed Mar 10, 2013
@@ -62,9 +62,9 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Android.csproj">
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI_Android</Name>
+ <Name>ReactiveUI_Monodroid</Name>
</ProjectReference>
</ItemGroup>
</Project>
@@ -5,12 +5,12 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{F61AC9BA-4A9C-440C-9B6C-2569978F0610}</ProjectGuid>
+ <ProjectGuid>{E92A477B-BB94-43C1-984E-E177EF9FEDB7}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ReactiveUI.Xaml</RootNamespace>
- <AssemblyName>ReactiveUI.Xaml</AssemblyName>
+ <RootNamespace>ReactiveUI</RootNamespace>
+ <AssemblyName>ReactiveUI.Xaml_Monodroid</AssemblyName>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@@ -27,7 +27,7 @@
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\ReactiveUI.Android\bin\Debug\Monodroid</OutputPath>
<DefineConstants>DEBUG;TRACE; MONO</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -62,7 +62,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>True</Optimize>
- <OutputPath>bin\Release\Android\</OutputPath>
+ <OutputPath>..\ReactiveUI.Android\bin\Release\Monodroid</OutputPath>
<DefineConstants>TRACE; MONO</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -89,7 +89,7 @@
<CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
<CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
<CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <DocumentationFile>bin\Release\Android\ReactiveUI.Xaml.xml</DocumentationFile>
+ <DocumentationFile>bin\Release\Android\ReactiveUI.xml</DocumentationFile>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
@@ -99,19 +99,35 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Xml" />
+ <Reference Include="System.Reactive.Core">
+ <HintPath>..\ext\monodroid\System.Reactive.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Interfaces">
+ <HintPath>..\ext\monodroid\System.Reactive.Interfaces.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Linq">
+ <HintPath>..\ext\monodroid\System.Reactive.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.PlatformServices">
+ <HintPath>..\ext\monodroid\System.Reactive.PlatformServices.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Providers">
+ <HintPath>..\ext\monodroid\System.Reactive.Providers.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="CommandBinding.cs" />
+ <Compile Include="CreatesCommandBinding.cs" />
<Compile Include="Errors.cs" />
<Compile Include="Interfaces.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReactiveAsyncCommand.cs" />
<Compile Include="ReactiveCommand.cs" />
- <Compile Include="ICommand.cs" />
- <Compile Include="CommandBinding.cs" />
- <Compile Include="CreatesCommandBinding.cs" />
- <Compile Include="SampleDataBinder.cs" />
<Compile Include="ServiceLocationRegistration.cs" />
+ <Compile Include="WaitForDispatcherScheduler.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -121,11 +137,11 @@
<Target Name="AfterBuild">
</Target>
-->
+ <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Android.csproj">
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
- <Name>ReactiveUI_Android</Name>
+ <Name>ReactiveUI_Monodroid</Name>
</ProjectReference>
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
</Project>
@@ -16,6 +16,7 @@
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_WP7")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_WP8")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_Monotouch")]
+[assembly: InternalsVisibleTo("ReactiveUI.Xaml_Monodroid")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_SL4")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_SL5")]
@@ -10,7 +10,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI</RootNamespace>
- <AssemblyName>ReactiveUI</AssemblyName>
+ <AssemblyName>ReactiveUI_Monodroid</AssemblyName>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@@ -27,7 +27,7 @@
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
- <OutputPath>bin\Debug\Android</OutputPath>
+ <OutputPath>..\ReactiveUI.Android\bin\Debug\Monodroid</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -62,7 +62,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>True</Optimize>
- <OutputPath>bin\Release\Android\</OutputPath>
+ <OutputPath>..\ReactiveUI.Android\bin\Release\Monodroid</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -357,7 +357,7 @@ public static Type GetEventArgsTypeForEvent(Type type, string eventName)
var eventArgsType = ei.EventHandlerType.GetMethods().First(x => x.Name == "Invoke").GetParameters()[1].ParameterType;
return eventArgsType;
}
- /*
+
internal static IObservable<TProp> ViewModelWhenAnyValue<TView, TViewModel, TProp>(TViewModel viewModel, TView view, Expression<Func<TViewModel, TProp>> property)
where TView : IViewFor
where TViewModel : class
@@ -366,7 +366,6 @@ public static Type GetEventArgsTypeForEvent(Type type, string eventName)
.Where(x => x != null)
.SelectMany(x => ((TViewModel)x).WhenAny(property, y => y.Value));
}
- */
internal static FieldInfo GetSafeField(Type type, string propertyName, BindingFlags flags)
{
@@ -1,16 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_Android", "ReactiveUI\ReactiveUI_Android.csproj", "{F92A477B-BB94-43C1-984E-E177EF9FEDB7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_Monodroid", "ReactiveUI\ReactiveUI_Monodroid.csproj", "{F92A477B-BB94-43C1-984E-E177EF9FEDB7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Android", "ReactiveUI.Android\ReactiveUI.Android.csproj", "{F5A6E11B-B074-4A0B-B937-267D840E31DF}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Xaml_Monodroid", "ReactiveUI.Xaml\ReactiveUI.Xaml_Monodroid.csproj", "{E92A477B-BB94-43C1-984E-E177EF9FEDB7}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {E92A477B-BB94-43C1-984E-E177EF9FEDB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E92A477B-BB94-43C1-984E-E177EF9FEDB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E92A477B-BB94-43C1-984E-E177EF9FEDB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E92A477B-BB94-43C1-984E-E177EF9FEDB7}.Release|Any CPU.Build.0 = Release|Any CPU
{F5A6E11B-B074-4A0B-B937-267D840E31DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5A6E11B-B074-4A0B-B937-267D840E31DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5A6E11B-B074-4A0B-B937-267D840E31DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -21,6 +27,6 @@ Global
{F92A477B-BB94-43C1-984E-E177EF9FEDB7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = ReactiveUI\ReactiveUI_Android.csproj
+ StartupItem = ReactiveUI\ReactiveUI_Monodroid.csproj
EndGlobalSection
EndGlobal

0 comments on commit 5781c63

Please sign in to comment.