Skip to content

Commit 8099657

Browse files
anaisbettsanaisbetts
committed
Update some stuff
1 parent 8d9eaac commit 8099657

File tree

12 files changed

+104
-64
lines changed

12 files changed

+104
-64
lines changed

‎Playground-XamForms.iOS/AppDelegate.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using System.Collections.Generic;
33
using System.Linq;
44

5-
using MonoTouch.Foundation;
6-
using MonoTouch.UIKit;
5+
using Foundation;
6+
using UIKit;
77
using ReactiveUI;
88

99
using Xamarin.Forms;

‎Playground-XamForms.iOS/Main.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
44

5-
using MonoTouch.Foundation;
6-
using MonoTouch.UIKit;
5+
using Foundation;
6+
using UIKit;
77

88
namespace PlaygroundXamForms.iOS
99
{

‎Playground-XamForms.iOS/Playground-XamForms.iOS.csproj‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
6-
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
6+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
77
<ProjectGuid>{3844D000-B4DE-4539-A22D-F525723150F8}</ProjectGuid>
88
<OutputType>Exe</OutputType>
99
<RootNamespace>PlaygroundXamForms.iOS</RootNamespace>
1010
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1111
<AssemblyName>PlaygroundXamFormsiOS</AssemblyName>
1212
<ProductVersion>8.0.30703</ProductVersion>
1313
<SchemaVersion>2.0</SchemaVersion>
14+
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
15+
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1618
<DebugSymbols>true</DebugSymbols>
@@ -41,6 +43,7 @@
4143
<MtouchI18n>
4244
</MtouchI18n>
4345
<MtouchArch>ARMv7</MtouchArch>
46+
<CodesignKey>iPhone Developer</CodesignKey>
4447
</PropertyGroup>
4548
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
4649
<DebugSymbols>true</DebugSymbols>
@@ -54,6 +57,7 @@
5457
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
5558
<MtouchDebug>true</MtouchDebug>
5659
<CodesignKey>iPhone Developer</CodesignKey>
60+
<MtouchArch>ARMv7</MtouchArch>
5761
</PropertyGroup>
5862
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
5963
<DebugType>full</DebugType>
@@ -68,7 +72,7 @@
6872
<MtouchLink>None</MtouchLink>
6973
<MtouchI18n>
7074
</MtouchI18n>
71-
<MtouchArch>ARMv7</MtouchArch>
75+
<MtouchArch>ARMv7, ARM64</MtouchArch>
7276
</PropertyGroup>
7377
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
7478
<DebugType>full</DebugType>
@@ -82,6 +86,7 @@
8286
<BuildIpa>true</BuildIpa>
8387
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
8488
<CodesignKey>iPhone Distribution</CodesignKey>
89+
<MtouchArch>ARMv7, ARM64</MtouchArch>
8590
</PropertyGroup>
8691
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
8792
<DebugType>full</DebugType>
@@ -94,21 +99,12 @@
9499
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
95100
<CodesignProvision>Automatic:AppStore</CodesignProvision>
96101
<CodesignKey>iPhone Distribution</CodesignKey>
102+
<MtouchArch>ARMv7, ARM64</MtouchArch>
97103
</PropertyGroup>
98104
<ItemGroup>
99105
<Reference Include="System" />
100106
<Reference Include="System.Xml" />
101107
<Reference Include="System.Core" />
102-
<Reference Include="monotouch" />
103-
<Reference Include="Xamarin.Forms.Platform.iOS">
104-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.dll</HintPath>
105-
</Reference>
106-
<Reference Include="Xamarin.Forms.Core">
107-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
108-
</Reference>
109-
<Reference Include="Xamarin.Forms.Xaml">
110-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
111-
</Reference>
112108
<Reference Include="System.Reactive.Interfaces">
113109
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
114110
</Reference>
@@ -121,31 +117,41 @@
121117
<Reference Include="System.Reactive.PlatformServices">
122118
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
123119
</Reference>
120+
<Reference Include="Xamarin.iOS" />
121+
<Reference Include="Xamarin.Forms.Core">
122+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
123+
</Reference>
124+
<Reference Include="Xamarin.Forms.Platform.iOS">
125+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
126+
</Reference>
127+
<Reference Include="Xamarin.Forms.Xaml">
128+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
129+
</Reference>
124130
<Reference Include="Splat">
125-
<HintPath>..\packages\Splat.1.6.0\lib\monotouch\Splat.dll</HintPath>
131+
<HintPath>..\packages\Splat.1.6.0\lib\Xamarin.iOS10\Splat.dll</HintPath>
126132
</Reference>
127133
</ItemGroup>
128134
<ItemGroup>
129135
<ProjectReference Include="..\Playground-XamForms\Playground-XamForms.csproj">
130136
<Project>{EE4BDA1D-EB01-4A45-8525-D996A0F0F6AC}</Project>
131137
<Name>Playground-XamForms</Name>
132138
</ProjectReference>
133-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_iOS.csproj">
134-
<Project>{9091337A-9E94-4DBD-801E-15E1FDA78FFC}</Project>
135-
<Name>ReactiveUI_iOS</Name>
136-
</ProjectReference>
137139
<ProjectReference Include="..\ReactiveUI.XamForms\ReactiveUI.XamForms.csproj">
138140
<Project>{864CB812-199F-401B-BE4C-E8F0515CD19D}</Project>
139141
<Name>ReactiveUI.XamForms</Name>
140142
</ProjectReference>
141-
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_iOS_XS.csproj">
142-
<Project>{334E6DAC-0D70-4CE0-80CB-DFD3147DBE18}</Project>
143-
<Name>ReactiveUI.Events_iOS_XS</Name>
144-
</ProjectReference>
145143
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_XamForms_XS.csproj">
146144
<Project>{864CBF13-F9AF-401B-BE4C-E8F0515CD19D}</Project>
147145
<Name>ReactiveUI.Events_XamForms_XS</Name>
148146
</ProjectReference>
147+
<ProjectReference Include="..\ReactiveUI\ReactiveUI_iOS64.csproj">
148+
<Project>{AF913370-A394-4DBD-801E-15E1FDA78FFC}</Project>
149+
<Name>ReactiveUI_iOS64</Name>
150+
</ProjectReference>
151+
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_iOS64.csproj">
152+
<Project>{334E6DAA-1D70-4CE0-80CB-DFD3147DBE18}</Project>
153+
<Name>ReactiveUI.Events_iOS64</Name>
154+
</ProjectReference>
149155
</ItemGroup>
150156
<ItemGroup>
151157
<BundleResource Include="Resources\Default-568h%402x.png" />
@@ -159,7 +165,6 @@
159165
<Compile Include="Main.cs" />
160166
<Compile Include="AppDelegate.cs" />
161167
</ItemGroup>
162-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
163-
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
164-
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
168+
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
169+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
165170
</Project>

‎Playground-XamForms/Playground-XamForms.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,8 @@
4949
</Compile>
5050
</ItemGroup>
5151
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
52-
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
52+
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
5353
<ItemGroup>
54-
<Reference Include="Xamarin.Forms.Core">
55-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
56-
</Reference>
57-
<Reference Include="Xamarin.Forms.Xaml">
58-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
59-
</Reference>
6054
<Reference Include="Splat">
6155
<HintPath>..\packages\Splat.1.6.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
6256
</Reference>
@@ -72,6 +66,12 @@
7266
<Reference Include="System.Reactive.PlatformServices">
7367
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
7468
</Reference>
69+
<Reference Include="Xamarin.Forms.Core">
70+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
71+
</Reference>
72+
<Reference Include="Xamarin.Forms.Xaml">
73+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
74+
</Reference>
7575
</ItemGroup>
7676
<ItemGroup>
7777
<None Include="packages.config" />

‎ReactiveUI.Events/ReactiveUI.Events_Mac.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<EnablePackageSigning>false</EnablePackageSigning>
4343
<IncludeMonoRuntime>false</IncludeMonoRuntime>
4444
<UseSGen>false</UseSGen>
45+
<UseRefCounting>false</UseRefCounting>
4546
</PropertyGroup>
4647
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4748
<Optimize>True</Optimize>
@@ -61,6 +62,7 @@
6162
<EnablePackageSigning>false</EnablePackageSigning>
6263
<IncludeMonoRuntime>false</IncludeMonoRuntime>
6364
<UseSGen>false</UseSGen>
65+
<UseRefCounting>false</UseRefCounting>
6466
</PropertyGroup>
6567
<ItemGroup>
6668
<Reference Include="System" />

‎ReactiveUI.Events/ReactiveUI.Events_XamForms_XS.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
<Link>Properties\CommonAssemblyInfo.cs</Link>
8080
</Compile>
8181
<Compile Include="Events.cs" />
82-
<Compile Include="Shims.cs" />
8382
<Compile Include="SingleAwaitSubject.cs" />
8483
</ItemGroup>
8584
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

‎ReactiveUI.Events/ReactiveUI.Events_iOS64.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@
7272
<ItemGroup>
7373
<None Include="packages.ReactiveUI.Events_iOS64.config" />
7474
</ItemGroup>
75-
7675
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
77-
7876
<!-- Visual Studio -->
7977
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
8078
<PreBuildEvent>%25SystemRoot%25\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /p:Configuration=Release "$(ProjectDir)EventBuilder.csproj"
@@ -85,7 +83,6 @@ del "$(ProjectDir)Nustache.Core.dll"
8583
del "$(ProjectDir)Mono.Cecil.dll"
8684
del "$(ProjectDir)Mono.Cecil.pdb"</PreBuildEvent>
8785
</PropertyGroup>
88-
8986
<!-- Xamarin Studio -->
9087
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
9188
<PreBuildEvent>/usr/bin/env ruby "$(ProjectDir)/generate_events.rb" "/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.iOS/Xamarin.iOS.dll" &amp;&amp; mv Events.cs ../../..</PreBuildEvent>

‎ReactiveUI.Events/Shims.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎ReactiveUI.Tests/ReactiveUI.Tests_iOS.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
3636
<DefineConstants>MONO</DefineConstants>
3737
<AssemblyName>ReactiveUI_Tests_iOS</AssemblyName>
38+
<CodesignKey>iPhone Developer</CodesignKey>
3839
</PropertyGroup>
3940
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
4041
<DebugSymbols>true</DebugSymbols>

‎ReactiveUI.XamForms/ReactiveUI.XamForms.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Xamarin.Forms.Core">
67-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
67+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Xamarin.Forms.Xaml">
70-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
70+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
7171
</Reference>
7272
</ItemGroup>
7373
<ItemGroup>

0 commit comments

Comments
 (0)