Explorar el Código

Update iOS projects

Wiesław Šoltés hace 9 años
padre
commit
768fd0e79f

+ 19 - 3
src/iOS/Avalonia.iOS/Avalonia.iOS.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -87,13 +87,29 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Reactive.Core">
-      <HintPath>..\..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+    <Reference Include="System.Reactive.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.3\System.Reactive.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>

+ 22 - 0
src/iOS/Avalonia.iOS/packages.config

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.Collections" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="xamarinios10" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Linq" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Reactive" version="3.0.0" targetFramework="xamarinios10" />
+  <package id="System.Reactive.Core" version="3.0.0" targetFramework="xamarinios10" />
+  <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="xamarinios10" />
+  <package id="System.Reactive.Linq" version="3.0.0" targetFramework="xamarinios10" />
+  <package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="xamarinios10" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Threading" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="xamarinios10" />
+</packages>

+ 4 - 0
src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj

@@ -119,6 +119,10 @@
       <HintPath>..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />

+ 2 - 0
src/iOS/Avalonia.iOSTestApplication/packages.config

@@ -7,9 +7,11 @@
   <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="xamarinios10" />
   <package id="System.Globalization" version="4.0.11" targetFramework="xamarinios10" />
   <package id="System.Linq" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Reactive" version="3.0.0" targetFramework="xamarinios10" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="xamarinios10" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="xamarinios10" />
   <package id="System.Reactive.Linq" version="3.0.0" targetFramework="xamarinios10" />
+  <package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="xamarinios10" />
   <package id="System.Reflection" version="4.1.0" targetFramework="xamarinios10" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="xamarinios10" />
   <package id="System.Runtime" version="4.1.0" targetFramework="xamarinios10" />