Skip to content

Commit 4e31d5b

Browse files
jlaanstrajlaanstra
committed
Rename some more Xamarin projects.
1 parent aef6937 commit 4e31d5b

File tree

7 files changed

+182
-135
lines changed

7 files changed

+182
-135
lines changed

‎MobileSample-iOS/Info.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
<string>UIInterfaceOrientationLandscapeRight</string>
1010
</array>
1111
<key>MinimumOSVersion</key>
12-
<string>6.0</string>
12+
<string></string>
1313
<key>UIDeviceFamily</key>
1414
<array>
1515
<integer>1</integer>
1616
</array>
1717
<key>CFBundleDisplayName</key>
18-
<string>iOSPlayground</string>
18+
<string>MobileSample-iOS</string>
1919
<key>CFBundleIdentifier</key>
20-
<string>iOSPlayground</string>
20+
<string>MobileSample-iOS</string>
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>NSMainNibFile</key>

‎ReactiveUI.Tests/Info.plist

+24-20
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,29 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>UIDeviceFamily</key>
6-
<array>
7-
<integer>1</integer>
8-
<integer>2</integer>
9-
</array>
10-
<key>UISupportedInterfaceOrientations</key>
11-
<array>
12-
<string>UIInterfaceOrientationPortrait</string>
13-
<string>UIInterfaceOrientationLandscapeLeft</string>
14-
<string>UIInterfaceOrientationLandscapeRight</string>
15-
</array>
16-
<key>UISupportedInterfaceOrientations~ipad</key>
17-
<array>
18-
<string>UIInterfaceOrientationPortrait</string>
19-
<string>UIInterfaceOrientationPortraitUpsideDown</string>
20-
<string>UIInterfaceOrientationLandscapeLeft</string>
21-
<string>UIInterfaceOrientationLandscapeRight</string>
22-
</array>
23-
<key>MinimumOSVersion</key>
24-
<string>3.2</string>
5+
<key>UIDeviceFamily</key>
6+
<array>
7+
<integer>1</integer>
8+
</array>
9+
<key>UISupportedInterfaceOrientations</key>
10+
<array>
11+
<string>UIInterfaceOrientationPortrait</string>
12+
<string>UIInterfaceOrientationLandscapeLeft</string>
13+
<string>UIInterfaceOrientationLandscapeRight</string>
14+
</array>
15+
<key>UISupportedInterfaceOrientations~ipad</key>
16+
<array/>
17+
<key>MinimumOSVersion</key>
18+
<string></string>
19+
<key>CFBundleDisplayName</key>
20+
<string>ReactiveUI_Tests_iOS</string>
21+
<key>CFBundleIdentifier</key>
22+
<string>ReactiveUI_Tests_iOS</string>
23+
<key>CFBundleVersion</key>
24+
<string>1.0</string>
25+
<key>NSMainNibFile</key>
26+
<string></string>
27+
<key>NSMainNibFile~ipad</key>
28+
<string></string>
2529
</dict>
2630
</plist>

‎ReactiveUI.Tests/ReactiveUI.Tests_Monodroid.csproj renamed to ‎ReactiveUI.Tests/ReactiveUI.Tests_Android.csproj

+41-32
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@
88
<ProjectGuid>{56222D75-B176-4654-8396-377E60B22D39}</ProjectGuid>
99
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1010
<OutputType>Library</OutputType>
11+
<AppDesignerFolder>Properties</AppDesignerFolder>
1112
<RootNamespace>ReactiveUI.Tests</RootNamespace>
12-
<AndroidApplication>True</AndroidApplication>
13+
<AssemblyName>ReactiveUI.Tests_Android</AssemblyName>
14+
<FileAlignment>512</FileAlignment>
15+
<AndroidApplication>true</AndroidApplication>
1316
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
14-
<AndroidResgenClass>Resource</AndroidResgenClass>
15-
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
16-
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
17-
<AssemblyName>ReactiveUI.Tests_Monodroid</AssemblyName>
17+
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
19-
<AndroidSupportedAbis>armeabi%3barmeabi-v7a%3bx86</AndroidSupportedAbis>
20-
<MandroidI18n />
21-
<AndroidLinkMode>None</AndroidLinkMode>
2219
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
20+
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
21+
<AndroidStoreUncompressedFileExtensions />
22+
<MandroidI18n />
23+
<JavaMaximumHeapSize />
24+
<JavaOptions />
2325
</PropertyGroup>
2426
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2527
<DebugSymbols>true</DebugSymbols>
2628
<DebugType>full</DebugType>
2729
<Optimize>false</Optimize>
2830
<OutputPath>bin\Debug\Monoandroid\</OutputPath>
2931
<IntermediateOutputPath>obj\Debug\Monoandroid</IntermediateOutputPath>
30-
<DefineConstants>DEBUG; MONO</DefineConstants>
32+
<DefineConstants>DEBUG;MONO;ANDROID</DefineConstants>
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
33-
<ConsolePause>false</ConsolePause>
34-
<AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis>
35-
<AndroidStoreUncompressedFileExtensions>
36-
</AndroidStoreUncompressedFileExtensions>
35+
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
36+
<AndroidLinkMode>None</AndroidLinkMode>
3737
</PropertyGroup>
3838
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3939
<Optimize>true</Optimize>
4040
<OutputPath>bin\Release\Monoandroid\</OutputPath>
41+
<DefineConstants>MONO;ANDROID</DefineConstants>
4142
<IntermediateOutputPath>obj\Release\Monoandroid</IntermediateOutputPath>
4243
<ErrorReport>prompt</ErrorReport>
4344
<WarningLevel>4</WarningLevel>
4445
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
45-
<ConsolePause>false</ConsolePause>
46-
<DefineConstants>MONO</DefineConstants>
46+
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
4747
</PropertyGroup>
4848
<ItemGroup>
4949
<Reference Include="System" />
@@ -103,32 +103,41 @@
103103
</ItemGroup>
104104
<ItemGroup>
105105
<None Include="Resources\AboutResources.txt" />
106-
<None Include="Properties\AndroidManifest.xml" />
107106
</ItemGroup>
108107
<ItemGroup>
109-
<AndroidResource Include="Resources\drawable\Icon.png" />
108+
<AndroidResource Include="Resources\Drawable\Icon.png" />
110109
</ItemGroup>
111-
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
112110
<ItemGroup>
113-
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
114-
<Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
115-
<Name>ReactiveUI.Android</Name>
111+
<Content Include="Properties\AndroidManifest.xml" />
112+
</ItemGroup>
113+
<ItemGroup>
114+
<ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing_Android.csproj">
115+
<Project>{1131910a-9d6d-473f-9c69-3dcf6a1c81bc}</Project>
116+
<Name>Microsoft.Reactive.Testing_Android</Name>
116117
</ProjectReference>
117-
<ProjectReference Include="..\ReactiveUI.Mobile\ReactiveUI.Mobile_Monodroid.csproj">
118-
<Project>{A92E477B-BB94-43C1-984E-E177EF9FEDB1}</Project>
119-
<Name>ReactiveUI.Mobile_Monodroid</Name>
118+
<ProjectReference Include="..\ReactiveUI.Mobile\ReactiveUI.Mobile_Android.csproj">
119+
<Project>{a92e477b-bb94-43c1-984e-e177ef9fedb1}</Project>
120+
<Name>ReactiveUI.Mobile_Android</Name>
120121
</ProjectReference>
121-
<ProjectReference Include="..\ReactiveUI.Testing\ReactiveUI.Testing_Monodroid.csproj">
122-
<Project>{1920477B-BB94-93CF-984E-E177EF9FEDB1}</Project>
123-
<Name>ReactiveUI.Testing_Monodroid</Name>
122+
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
123+
<Project>{f5a6e11b-b074-4a0b-b937-267d840e31df}</Project>
124+
<Name>ReactiveUI.Android</Name>
124125
</ProjectReference>
125-
<ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing_Monodroid.csproj">
126-
<Project>{1131910A-9D6D-473F-9C69-3DCF6A1C81BC}</Project>
127-
<Name>Microsoft.Reactive.Testing_Monodroid</Name>
126+
<ProjectReference Include="..\ReactiveUI.Testing\ReactiveUI.Testing_Android.csproj">
127+
<Project>{1920477b-bb94-93cf-984e-e177ef9fedb1}</Project>
128+
<Name>ReactiveUI.Testing_Android</Name>
128129
</ProjectReference>
129130
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
130-
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
131+
<Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
131132
<Name>ReactiveUI</Name>
132133
</ProjectReference>
133134
</ItemGroup>
134-
</Project>
135+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
136+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
137+
Other similar extension points exist, see Microsoft.Common.targets.
138+
<Target Name="BeforeBuild">
139+
</Target>
140+
<Target Name="AfterBuild">
141+
</Target>
142+
-->
143+
</Project>

‎ReactiveUI.Tests/ReactiveUI.Tests_Monotouch.csproj renamed to ‎ReactiveUI.Tests/ReactiveUI.Tests_iOS.csproj

+19-77
Original file line numberDiff line numberDiff line change
@@ -10,78 +10,28 @@
1010
<OutputType>Exe</OutputType>
1111
<RootNamespace>ReactiveUI.Tests</RootNamespace>
1212
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13+
<AssemblyName>ReactiveUI_Tests_iOS</AssemblyName>
1314
</PropertyGroup>
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
15-
<DebugSymbols>true</DebugSymbols>
16-
<DebugType>full</DebugType>
17-
<Optimize>false</Optimize>
18-
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
19-
<DefineConstants>DEBUG; MONO</DefineConstants>
20-
<ErrorReport>prompt</ErrorReport>
21-
<WarningLevel>4</WarningLevel>
22-
<MtouchLink>None</MtouchLink>
23-
<ConsolePause>false</ConsolePause>
24-
<MtouchDebug>true</MtouchDebug>
25-
<AssemblyName>ReactiveUI_Tests_Monotouch</AssemblyName>
26-
<MtouchI18n>
27-
</MtouchI18n>
28-
<MtouchArch>ARMv7</MtouchArch>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<MtouchLink>None</MtouchLink>
36-
<ConsolePause>false</ConsolePause>
37-
<DefineConstants>MONO</DefineConstants>
38-
<AssemblyName>ReactiveUI_Tests_Monotouch</AssemblyName>
39-
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4116
<DebugSymbols>true</DebugSymbols>
4217
<DebugType>full</DebugType>
4318
<Optimize>false</Optimize>
4419
<OutputPath>bin\iPhone\Debug</OutputPath>
45-
<DefineConstants>DEBUG; MONO</DefineConstants>
20+
<DefineConstants>DEBUG;MONO</DefineConstants>
4621
<ErrorReport>prompt</ErrorReport>
4722
<WarningLevel>4</WarningLevel>
4823
<MtouchDebug>true</MtouchDebug>
4924
<ConsolePause>false</ConsolePause>
5025
<CodesignKey>iPhone Developer</CodesignKey>
51-
<AssemblyName>ReactiveUI_Tests_Monotouch</AssemblyName>
5226
</PropertyGroup>
53-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
54-
<DebugType>full</DebugType>
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+
<DebugType>none</DebugType>
5529
<Optimize>true</Optimize>
5630
<OutputPath>bin\iPhone\Release</OutputPath>
5731
<ErrorReport>prompt</ErrorReport>
5832
<WarningLevel>4</WarningLevel>
59-
<CodesignKey>iPhone Developer</CodesignKey>
60-
<ConsolePause>false</ConsolePause>
61-
<AssemblyName>ReactiveUITests_iOS</AssemblyName>
62-
</PropertyGroup>
63-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
64-
<DebugType>full</DebugType>
65-
<Optimize>true</Optimize>
66-
<OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
67-
<ErrorReport>prompt</ErrorReport>
68-
<WarningLevel>4</WarningLevel>
69-
<CodesignKey>iPhone Distribution</CodesignKey>
70-
<BuildIpa>true</BuildIpa>
7133
<ConsolePause>false</ConsolePause>
72-
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
73-
<AssemblyName>ReactiveUITests_iOS</AssemblyName>
74-
</PropertyGroup>
75-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
76-
<DebugType>full</DebugType>
77-
<Optimize>true</Optimize>
78-
<OutputPath>bin\iPhone\AppStore</OutputPath>
79-
<ErrorReport>prompt</ErrorReport>
80-
<WarningLevel>4</WarningLevel>
81-
<CodesignKey>iPhone Distribution</CodesignKey>
82-
<ConsolePause>false</ConsolePause>
83-
<CodesignProvision>Automatic:AppStore</CodesignProvision>
84-
<AssemblyName>ReactiveUITests_iOS</AssemblyName>
34+
<CodesignKey>iPhone Developer</CodesignKey>
8535
</PropertyGroup>
8636
<ItemGroup>
8737
<Reference Include="System" />
@@ -107,9 +57,6 @@
10757
<Reference Include="Xamarin.Mobile">
10858
<HintPath>..\ext\ios\Xamarin.Mobile.dll</HintPath>
10959
</Reference>
110-
<Reference Include="System.Reactive.Debugger">
111-
<HintPath>..\ext\ios\System.Reactive.Debugger.dll</HintPath>
112-
</Reference>
11360
<Reference Include="System.Runtime.Serialization" />
11461
<Reference Include="System.Json" />
11562
<Reference Include="Splat">
@@ -118,7 +65,6 @@
11865
</ItemGroup>
11966
<ItemGroup>
12067
<Folder Include="Resources\" />
121-
<Folder Include="Cocoa\" />
12268
</ItemGroup>
12369
<ItemGroup>
12470
<None Include="Info.plist" />
@@ -149,28 +95,24 @@
14995
<Compile Include="Cocoa\KVOBindingTests.cs" />
15096
</ItemGroup>
15197
<ItemGroup>
152-
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Cocoa_Monotouch.csproj">
153-
<Project>{9091337A-9E94-4DBD-801E-15E1FDA78FFC}</Project>
154-
<Name>ReactiveUI.Cocoa_Monotouch</Name>
155-
</ProjectReference>
156-
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_Monotouch_XS.csproj">
157-
<Project>{334E6DAC-0D70-4CE0-80CB-DFD3147DBE18}</Project>
158-
<Name>ReactiveUI.Events_Monotouch_XS</Name>
98+
<ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing_iOS.csproj">
99+
<Project>{74ba5b4e-257a-42a7-bdab-1fb40a903909}</Project>
100+
<Name>Microsoft.Reactive.Testing_iOS</Name>
159101
</ProjectReference>
160-
<ProjectReference Include="..\ReactiveUI.Mobile\ReactiveUI.Mobile_Monotouch.csproj">
161-
<Project>{9091337A-9E94-4DBD-801E-15E10DB72FFC}</Project>
162-
<Name>ReactiveUI.Mobile_Monotouch</Name>
102+
<ProjectReference Include="..\ReactiveUI.Mobile\ReactiveUI.Mobile_iOS.csproj">
103+
<Project>{9091337a-9e94-4dbd-801e-15e10db72ffc}</Project>
104+
<Name>ReactiveUI.Mobile_iOS</Name>
163105
</ProjectReference>
164-
<ProjectReference Include="..\ReactiveUI.Testing\ReactiveUI.Testing_Monotouch.csproj">
165-
<Project>{90913370-9E94-3DBD-8F1E-15E10DB72FFC}</Project>
166-
<Name>ReactiveUI.Testing_Monotouch</Name>
106+
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.iOS.csproj">
107+
<Project>{9091337a-9e94-4dbd-801e-15e1fda78ffc}</Project>
108+
<Name>ReactiveUI.iOS</Name>
167109
</ProjectReference>
168-
<ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing_Monotouch.csproj">
169-
<Project>{74BA5B4E-257A-42A7-BDAB-1FB40A903909}</Project>
170-
<Name>Microsoft.Reactive.Testing_Monotouch</Name>
110+
<ProjectReference Include="..\ReactiveUI.Testing\ReactiveUI.Testing_iOS.csproj">
111+
<Project>{90913370-9e94-3dbd-8f1e-15e10db72ffc}</Project>
112+
<Name>ReactiveUI.Testing_iOS</Name>
171113
</ProjectReference>
172114
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
173-
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
115+
<Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
174116
<Name>ReactiveUI</Name>
175117
</ProjectReference>
176118
</ItemGroup>

‎ReactiveUI/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
[assembly: InternalsVisibleTo("ReactiveUI.Xaml")]
99
[assembly: InternalsVisibleTo("ReactiveUI.Tests_Net45")]
1010
[assembly: InternalsVisibleTo("ReactiveUI.Tests_WinRT")]
11-
[assembly: InternalsVisibleTo("ReactiveUI_Tests_Monotouch")] // NB: iOS apps can't have '.' in the name
12-
[assembly: InternalsVisibleTo("ReactiveUI.Tests_Monodroid")]
11+
[assembly: InternalsVisibleTo("ReactiveUI_Tests_iOS")] // NB: iOS apps can't have '.' in the name
12+
[assembly: InternalsVisibleTo("ReactiveUI.Tests_Android")]
1313
[assembly: InternalsVisibleTo("ReactiveUI.NLog")]
1414
[assembly: InternalsVisibleTo("ReactiveUI.Gtk")]
1515
[assembly: InternalsVisibleTo("ReactiveUI.Cocoa")]

0 commit comments

Comments
 (0)