Bump versions of various packages

reactiveui · Jul 16, 2014 · 21d549b · 21d549b
1 parent a2048cd
commit 21d549b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 51 deletions.
diff --git a/NuGet/ReactiveUI-AndroidSupport/ReactiveUI-AndroidSupport.nuspec b/NuGet/ReactiveUI-AndroidSupport/ReactiveUI-AndroidSupport.nuspec
@@ -12,7 +12,7 @@
 
     <dependencies>
       <dependency id="reactiveui-platforms" version="[6.0.1]" />
-      <dependency id="Xamarin.Android.Support.v4" version="19.1.0" />
+      <dependency id="Xamarin.Android.Support.v4" version="20.0.0" />
     </dependencies>
   </metadata>
 </package>
diff --git a/NuGet/ReactiveUI-XamForms/ReactiveUI-XamForms.nuspec b/NuGet/ReactiveUI-XamForms/ReactiveUI-XamForms.nuspec
@@ -12,7 +12,7 @@
 
     <dependencies>
       <dependency id="reactiveui-core" version="[6.0.1]" />
-      <dependency id="Xamarin.Forms" version="1.0.6188" />
+      <dependency id="Xamarin.Forms" version="1.2.1.6229" />
     </dependencies>
   </metadata>
 </package>
diff --git a/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj b/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
@@ -64,7 +64,7 @@
       <HintPath>..\packages\Rx-PlatformServices.2.2.4\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\packages\Xamarin.Android.Support.v4.19.0.2\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Android.Support.v4.20.0.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/ReactiveUI.AndroidSupport/packages.config b/ReactiveUI.AndroidSupport/packages.config
@@ -6,5 +6,5 @@
   <package id="Rx-Main" version="2.2.4" targetFramework="MonoAndroid403" />
   <package id="Rx-PlatformServices" version="2.2.4" targetFramework="MonoAndroid403" />
   <package id="Splat" version="1.3.1" targetFramework="MonoAndroid403" />
-  <package id="Xamarin.Android.Support.v4" version="19.0.2" targetFramework="MonoAndroid403" />
+  <package id="Xamarin.Android.Support.v4" version="20.0.0" targetFramework="MonoAndroid403" />
 </packages>
diff --git a/ReactiveUI.Events/ReactiveUI.Events_XamForms_XS.csproj b/ReactiveUI.Events/ReactiveUI.Events_XamForms_XS.csproj
@@ -67,11 +67,11 @@
     <Reference Include="System.Reactive.PlatformServices">
       <HintPath>..\packages\Rx-PlatformServices.2.2.4\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.1.0.6188\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.1.0.6188\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj b/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj
@@ -64,10 +64,10 @@
       <HintPath>..\packages\Rx-PlatformServices.2.2.4\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.1.0.6188\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.1.0.6188\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -83,6 +83,7 @@
     <Compile Include="XamForms\DeviceScheduler.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="..\packages\Xamarin.Forms.1.2.1.6229\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.2.1.6229\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.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">
@@ -99,4 +100,7 @@
       <Name>ReactiveUI</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
diff --git a/ReactiveUI.XamForms/packages.config b/ReactiveUI.XamForms/packages.config
@@ -6,5 +6,5 @@
   <package id="Rx-Main" version="2.2.4" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.4" targetFramework="net45" />
   <package id="Splat" version="1.3.1" targetFramework="net45" />
-  <package id="Xamarin.Forms" version="1.0.6188" targetFramework="net45" />
-</packages>
+  <package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
+</packages>
diff --git a/packages/repositories.config b/packages/repositories.config
@@ -8,6 +8,8 @@
   <repository path="../Playground-XamForms.iOS/packages.config" />
   <repository path="../Playground-XamForms/packages.config" />
   <repository path="../ReactiveUI.AndroidSupport/packages.config" />
+  <repository path="../ReactiveUI.Events/packages.ReactiveUI.Events_Android_XS.config" />
+  <repository path="../ReactiveUI.Events/packages.ReactiveUI.Events_iOS_XS.config" />
   <repository path="../ReactiveUI.Events/packages.ReactiveUI.Events_Mac.config" />
   <repository path="../ReactiveUI.Testing/packages.ReactiveUI.Testing_Android.config" />
   <repository path="../ReactiveUI.Testing/packages.ReactiveUI.Testing_iOS.config" />
@@ -17,43 +19,4 @@
   <repository path="../ReactiveUI/packages.ReactiveUI_Android.config" />
   <repository path="../ReactiveUI/packages.ReactiveUI_iOS.config" />
   <repository path="../ReactiveUI/packages.ReactiveUI_Mac.config" />
-  <repository path="..\Microsoft.Reactive.Testing\packages.Microsoft.Reactive.Testing_Android.config" />
-  <repository path="..\Microsoft.Reactive.Testing\packages.Microsoft.Reactive.Testing_iOS.config" />
-  <repository path="..\PerfConsoleRunner\packages.config" />
-  <repository path="..\Playground-Android\packages.config" />
-  <repository path="..\Playground-iOS\packages.config" />
-  <repository path="..\Playground-WP8\packages.config" />
-  <repository path="..\Playground-Wpa81\Playground-Wpa81.Windows\packages.config" />
-  <repository path="..\Playground-Wpa81\Playground-Wpa81.WindowsPhone\packages.config" />
-  <repository path="..\ReactiveUI.AndroidSupport\packages.config" />
-  <repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_Net45.config" />
-  <repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_WinRT.config" />
-  <repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_WP8.config" />
-  <repository path="..\ReactiveUI.Events\packages.EventBuilder.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Android.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_iOS.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Net45.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WinRT.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WinRT80.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WP8.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WP81.config" />
-  <repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WPA81.config" />
-  <repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Android.config" />
-  <repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_iOS.config" />
-  <repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Net45.config" />
-  <repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_WinRT.config" />
-  <repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_WinRT80.config" />
-  <repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_WP8.config" />
-  <repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Android.config" />
-  <repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_iOS.config" />
-  <repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Net45.config" />
-  <repository path="..\ReactiveUI.Winforms\packages.config" />
-  <repository path="..\ReactiveUI\packages.ReactiveUI.config" />
-  <repository path="..\ReactiveUI\packages.ReactiveUI_Android.config" />
-  <repository path="..\ReactiveUI\packages.ReactiveUI_iOS.config" />
-  <repository path="..\ReactiveUI\packages.ReactiveUI_Net45.config" />
-  <repository path="..\ReactiveUI\packages.ReactiveUI_WinRT.config" />
-  <repository path="..\ReactiveUI\packages.ReactiveUI_WinRT80.config" />
-  <repository path="..\ReactiveUI\packages.ReactiveUI_WP8.config" />
-  <repository path="..\RxUIViewModelGenerator\packages.config" />
 </repositories>