Fix Ix Android projects to build using xbuild (XS somehow built them w/ wrong GUIDs).

6 files changed, 76 insertions, 31 deletions

diff --git a/Ix/NET/Ix_Xamarin/InteractiveExtensionsForAndroid.nuspec b/Ix/NET/Ix_Xamarin/InteractiveExtensionsForAndroid.nuspec
new file mode 100644
index 0000000..d03891c
--- /dev/null
+++ b/Ix/NET/Ix_Xamarin/InteractiveExtensionsForAndroid.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>InteractiveExtensionsForAndroid</id>
+    <version>2.1.0</version>
+    <authors>Microsoft Open Technologies, Inc</authors>
+    <owners>Xamarin Inc.</owners>
+    <licenseUrl>https://raw.github.com/mono/rx/master/Ix/NET/license.txt</licenseUrl>
+    <projectUrl>https://github.com/mono/rx</projectUrl>
+    <iconUrl>https://raw.github.com/mono/rx/master/Ix/NET/Resources/Artwork/Logo_Color.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>a library for composing asynchronous and event-based programs using observable sequences and LINQ-style query operators. (Android)</description>
+    <releaseNotes>Initial NuGet package release. WARNING: this won't work as expected if you are not using Xamarin.Android v4.7.x or later, which ships with some runtime bugfixes.</releaseNotes>
+    <copyright>Copyright (c) Microsoft Open Technologies, Inc.  All rights reserved.</copyright>
+    <tags>Ix Interactive Linq Xamarin Android</tags>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Core" targetFramework="MonoAndroid" />
+    </frameworkAssemblies>
+  </metadata>
+  <files>
+	<file target="lib/MonoAndroid" src="android/ix/System.Interactive/bin/Release/System.Interactive.dll" />
+	<file target="lib/MonoAndroid" src="android/ix/System.Interactive.Async/bin/Release/System.Interactive.Async.dll" />
+	<file target="lib/MonoAndroid" src="android/ix/System.Interactive.Providers/bin/Release/System.Interactive.Providers.dll" />
+  </files>
+</package>
diff --git a/Ix/NET/Ix_Xamarin/Ix_Xamarin_android.sln b/Ix/NET/Ix_Xamarin/Ix_Xamarin_android.sln
new file mode 100644
index 0000000..f7a2e14
--- /dev/null
+++ b/Ix/NET/Ix_Xamarin/Ix_Xamarin_android.sln
@@ -0,0 +1,36 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_System.Interactive", "android\ix\System.Interactive\android_System.Interactive.csproj", "{5F7F40B6-19D3-48C7-8E15-AE1F976F60E1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_System.Interactive.Async", "android\ix\System.Interactive.Async\android_System.Interactive.Async.csproj", "{065F2411-7610-4AD6-9513-A1EFFCE576C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_System.Interactive.Providers", "android\ix\System.Interactive.Providers\android_System.Interactive.Providers.csproj", "{C4037060-1692-4423-B29E-76F3A74A72A5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{065F2411-7610-4AD6-9513-A1EFFCE576C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{065F2411-7610-4AD6-9513-A1EFFCE576C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{065F2411-7610-4AD6-9513-A1EFFCE576C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{065F2411-7610-4AD6-9513-A1EFFCE576C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F7F40B6-19D3-48C7-8E15-AE1F976F60E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F7F40B6-19D3-48C7-8E15-AE1F976F60E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F7F40B6-19D3-48C7-8E15-AE1F976F60E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F7F40B6-19D3-48C7-8E15-AE1F976F60E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4037060-1692-4423-B29E-76F3A74A72A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4037060-1692-4423-B29E-76F3A74A72A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4037060-1692-4423-B29E-76F3A74A72A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4037060-1692-4423-B29E-76F3A74A72A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = android\ix\System.Interactive\android_System.Interactive.csproj
+	EndGlobalSection
+EndGlobal
diff --git a/Ix/NET/Ix_Xamarin/Ix_Xamarin_iOS.sln b/Ix/NET/Ix_Xamarin/Ix_Xamarin_iOS.sln
new file mode 100644
index 0000000..2fadee3
--- /dev/null
+++ b/Ix/NET/Ix_Xamarin/Ix_Xamarin_iOS.sln
@@ -0,0 +1,9 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj
index e3f83a3..70bcda0 100644
--- a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj
+++ b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -39,8 +38,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -97,13 +94,11 @@
     <Compile Include="..\..\..\..\System.Interactive.Async\TaskExt.cs">
       <Link>TaskExt.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj
index e2f79f7..d9c97a0 100644
--- a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj
+++ b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -39,32 +38,18 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Interactive\android_System.Interactive.csproj">
-  <Project>{8E4B04F0-915E-48F9-9796-76278C6094BD}</Project>
-  <Name>android_System.Interactive</Name>
-</ProjectReference>
-    <!--
-    <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
-      <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
-      <Name>Android.NUnitLite</Name>
-    </ProjectReference>
-    -->
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="..\..\..\..\System.Interactive.Providers\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="..\..\..\..\System.Interactive.Providers\QueryableEx.cs">
       <Link>QueryableEx.cs</Link>
     </Compile>
-
-    <!--
-    <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
-      <Link>ColdObservable.cs</Link>
-    </Compile>
-    -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\System.Interactive\android_System.Interactive.csproj">
+      <Project>{5F7F40B6-19D3-48C7-8E15-AE1F976F60E1}</Project>
+      <Name>android_System.Interactive</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
diff --git a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj
index 70fb3f2..5248f4e 100644
--- a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj
+++ b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -39,8 +38,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -73,13 +70,11 @@
     <Compile Include="..\..\..\..\System.Interactive\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>