Skip to content

Commit e8f612a

Browse files
anaisbettsanaisbetts
committed
Start to retarget things to the PLib version
1 parent 889beb7 commit e8f612a

15 files changed

+86
-142
lines changed

‎ReactiveUI.Mobile/ReactiveUI.Mobile_Monodroid.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@
149149
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
150150
</ItemGroup>
151151
<ItemGroup>
152-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
153-
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
154-
<Name>ReactiveUI_Monodroid</Name>
155-
</ProjectReference>
156152
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
157153
<Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
158154
<Name>ReactiveUI.Android</Name>
159155
</ProjectReference>
156+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
157+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
158+
<Name>ReactiveUI</Name>
159+
</ProjectReference>
160160
</ItemGroup>
161161
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
162162
Other similar extension points exist, see Microsoft.Common.targets.

‎ReactiveUI.Mobile/ReactiveUI.Mobile_Monotouch.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DefineConstants>MONO; UIKIT</DefineConstants>
3535
<DocumentationFile>bin\Release\Monotouch\ReactiveUI.Mobile.XML</DocumentationFile>
3636
<DebugSymbols>true</DebugSymbols>
37-
<GenerateDocumentation>true</GenerateDocumentation>
37+
<GenerateDocumentation>True</GenerateDocumentation>
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="Newtonsoft.Json">
@@ -75,14 +75,14 @@
7575
<Compile Include="JsonSuspensionDriver.cs" />
7676
</ItemGroup>
7777
<ItemGroup>
78-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monotouch.csproj">
79-
<Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
80-
<Name>ReactiveUI_Monotouch</Name>
81-
</ProjectReference>
8278
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Cocoa_Monotouch.csproj">
8379
<Project>{9091337A-9E94-4DBD-801E-15E1FDA78FFC}</Project>
8480
<Name>ReactiveUI.Cocoa_Monotouch</Name>
8581
</ProjectReference>
82+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
83+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
84+
<Name>ReactiveUI</Name>
85+
</ProjectReference>
8686
</ItemGroup>
8787
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
8888
</Project>

‎ReactiveUI.NLog/ReactiveUI.NLog_Mono.csproj

+7-8
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
<DefineConstants>TRACE</DefineConstants>
2929
<ErrorReport>prompt</ErrorReport>
3030
<WarningLevel>4</WarningLevel>
31-
<DocumentationFile>bin\Release\Mono\ReactiveUI.NLog.XML</DocumentationFile>
31+
<DocumentationFile>bin\Release\MonoMac\ReactiveUI.NLog.xml</DocumentationFile>
3232
<DebugSymbols>true</DebugSymbols>
33-
<GenerateDocumentation>true</GenerateDocumentation>
3433
</PropertyGroup>
3534
<ItemGroup>
3635
<Reference Include="System" />
@@ -65,14 +64,14 @@
6564
<Target Name="AfterBuild">
6665
</Target>
6766
-->
68-
<ItemGroup>
69-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_MonoMac.csproj">
70-
<Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
71-
<Name>ReactiveUI_MonoMac</Name>
72-
</ProjectReference>
73-
</ItemGroup>
7467
<ItemGroup>
7568
<Compile Include="NLogLogger.cs" />
7669
<Compile Include="Registrations.cs" />
7770
</ItemGroup>
71+
<ItemGroup>
72+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
73+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
74+
<Name>ReactiveUI</Name>
75+
</ProjectReference>
76+
</ItemGroup>
7877
</Project>

‎ReactiveUI.Platforms/ReactiveUI.Android.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@
7878
<Compile Include="Android\AndroidDefaultPropertyBinding.cs" />
7979
<Compile Include="Android\AndroidObservableForWidgets.cs" />
8080
</ItemGroup>
81-
<ItemGroup>
82-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
83-
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
84-
<Name>ReactiveUI_Monodroid</Name>
85-
</ProjectReference>
86-
</ItemGroup>
8781
<ItemGroup>
8882
<Folder Include="Properties\" />
8983
</ItemGroup>
9084
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
9185
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
86+
<ItemGroup>
87+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
88+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
89+
<Name>ReactiveUI</Name>
90+
</ProjectReference>
91+
</ItemGroup>
9292
</Project>

‎ReactiveUI.Platforms/ReactiveUI.Cocoa.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<UseSGen>False</UseSGen>
4545
<DefineConstants>MONO; COCOA</DefineConstants>
4646
<DebugSymbols>true</DebugSymbols>
47-
<GenerateDocumentation>true</GenerateDocumentation>
47+
<GenerateDocumentation>True</GenerateDocumentation>
4848
</PropertyGroup>
4949
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
5050
<DebugType>none</DebugType>
@@ -105,12 +105,12 @@
105105
<Compile Include="Cocoa\ReactiveImageView.cs" />
106106
</ItemGroup>
107107
<ItemGroup>
108-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_MonoMac.csproj">
109-
<Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
110-
<Name>ReactiveUI_MonoMac</Name>
111-
</ProjectReference>
108+
<Folder Include="Cocoa\" />
112109
</ItemGroup>
113110
<ItemGroup>
114-
<Folder Include="Cocoa\" />
111+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
112+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
113+
<Name>ReactiveUI</Name>
114+
</ProjectReference>
115115
</ItemGroup>
116116
</Project>

‎ReactiveUI.Platforms/ReactiveUI.Cocoa_Monotouch.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<DebugSymbols>true</DebugSymbols>
3737
<RegisterForComInterop>false</RegisterForComInterop>
3838
<DocumentationFile>bin\Release\Monotouch\ReactiveUICocoa.XML</DocumentationFile>
39-
<GenerateDocumentation>true</GenerateDocumentation>
39+
<GenerateDocumentation>True</GenerateDocumentation>
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<Reference Include="System" />
@@ -91,11 +91,11 @@
9191
<Compile Include="Cocoa\ReactiveCollectionViewSource.cs" />
9292
<Compile Include="Cocoa\CommonReactiveSource.cs" />
9393
</ItemGroup>
94+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
9495
<ItemGroup>
95-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monotouch.csproj">
96-
<Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
97-
<Name>ReactiveUI_Monotouch</Name>
96+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
97+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
98+
<Name>ReactiveUI</Name>
9899
</ProjectReference>
99100
</ItemGroup>
100-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
101101
</Project>

‎ReactiveUI.Testing/ReactiveUI.Testing_MonoMac.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@
139139
</Target>
140140
-->
141141
<ItemGroup>
142-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_MonoMac.csproj">
143-
<Project>{292A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
144-
<Name>ReactiveUI_MonoMac</Name>
145-
</ProjectReference>
146142
<ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing_MonoMac.csproj">
147143
<Project>{AA27F817-FAD2-4622-B68A-651A8AA9E076}</Project>
148144
<Name>Microsoft.Reactive.Testing_MonoMac</Name>
149145
</ProjectReference>
146+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
147+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
148+
<Name>ReactiveUI</Name>
149+
</ProjectReference>
150150
</ItemGroup>
151151
</Project>

‎ReactiveUI.Testing/ReactiveUI.Testing_Monodroid.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@
139139
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
140140
</ItemGroup>
141141
<ItemGroup>
142-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
143-
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
144-
<Name>ReactiveUI_Monodroid</Name>
145-
</ProjectReference>
146142
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
147143
<Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
148144
<Name>ReactiveUI.Android</Name>
@@ -151,6 +147,10 @@
151147
<Project>{1131910A-9D6D-473F-9C69-3DCF6A1C81BC}</Project>
152148
<Name>Microsoft.Reactive.Testing_Monodroid</Name>
153149
</ProjectReference>
150+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
151+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
152+
<Name>ReactiveUI</Name>
153+
</ProjectReference>
154154
</ItemGroup>
155155
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
156156
Other similar extension points exist, see Microsoft.Common.targets.

‎ReactiveUI.Testing/ReactiveUI.Testing_Monotouch.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DefineConstants>MONO; UIKIT</DefineConstants>
3535
<DocumentationFile>bin\Release\Monotouch\ReactiveUI.Testing.XML</DocumentationFile>
3636
<DebugSymbols>true</DebugSymbols>
37-
<GenerateDocumentation>true</GenerateDocumentation>
37+
<GenerateDocumentation>True</GenerateDocumentation>
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="Newtonsoft.Json">
@@ -63,10 +63,6 @@
6363
</ItemGroup>
6464
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
6565
<ItemGroup>
66-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monotouch.csproj">
67-
<Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
68-
<Name>ReactiveUI_Monotouch</Name>
69-
</ProjectReference>
7066
<ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Cocoa_Monotouch.csproj">
7167
<Project>{9091337A-9E94-4DBD-801E-15E1FDA78FFC}</Project>
7268
<Name>ReactiveUI.Cocoa_Monotouch</Name>
@@ -75,6 +71,10 @@
7571
<Project>{74BA5B4E-257A-42A7-BDAB-1FB40A903909}</Project>
7672
<Name>Microsoft.Reactive.Testing_Monotouch</Name>
7773
</ProjectReference>
74+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
75+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
76+
<Name>ReactiveUI</Name>
77+
</ProjectReference>
7878
</ItemGroup>
7979
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
8080
<ItemGroup>

‎ReactiveUI.Tests/ReactiveUI.Tests_Monodroid.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@
116116
<Project>{1920477B-BB94-93CF-984E-E177EF9FEDB1}</Project>
117117
<Name>ReactiveUI.Testing_Monodroid</Name>
118118
</ProjectReference>
119-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
120-
<Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
121-
<Name>ReactiveUI_Monodroid</Name>
122-
</ProjectReference>
123119
<ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing_Monodroid.csproj">
124120
<Project>{1131910A-9D6D-473F-9C69-3DCF6A1C81BC}</Project>
125121
<Name>Microsoft.Reactive.Testing_Monodroid</Name>
126122
</ProjectReference>
123+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
124+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
125+
<Name>ReactiveUI</Name>
126+
</ProjectReference>
127127
</ItemGroup>
128128
</Project>

‎ReactiveUI.Tests/ReactiveUI.Tests_Monotouch.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@
159159
<Project>{9091337A-9E94-4DBD-801E-15E10DB72FFC}</Project>
160160
<Name>ReactiveUI.Mobile_Monotouch</Name>
161161
</ProjectReference>
162-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Monotouch.csproj">
163-
<Project>{9091337A-9E94-4DBD-801E-05E1FDA78FFC}</Project>
164-
<Name>ReactiveUI_Monotouch</Name>
165-
</ProjectReference>
166162
<ProjectReference Include="..\ReactiveUI.Testing\ReactiveUI.Testing_Monotouch.csproj">
167163
<Project>{90913370-9E94-3DBD-8F1E-15E10DB72FFC}</Project>
168164
<Name>ReactiveUI.Testing_Monotouch</Name>
@@ -171,5 +167,9 @@
171167
<Project>{74BA5B4E-257A-42A7-BDAB-1FB40A903909}</Project>
172168
<Name>Microsoft.Reactive.Testing_Monotouch</Name>
173169
</ProjectReference>
170+
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
171+
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
172+
<Name>ReactiveUI</Name>
173+
</ProjectReference>
174174
</ItemGroup>
175175
</Project>

‎ReactiveUI/ReactiveUI.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<ProductVersion>10.0.0</ProductVersion>
20+
<SchemaVersion>2.0</SchemaVersion>
1921
</PropertyGroup>
2022
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2123
<DebugSymbols>true</DebugSymbols>

‎ReactiveUI/ReactiveUI_MonoMac.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@
9898
<CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
9999
<CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
100100
<CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
101-
<DocumentationFile>bin\Release\Mono\ReactiveUI.xml</DocumentationFile>
101+
<DocumentationFile>bin\Release\MonoMac\ReactiveUI.xml</DocumentationFile>
102102
<DebugSymbols>true</DebugSymbols>
103-
<GenerateDocumentation>true</GenerateDocumentation>
104103
</PropertyGroup>
105104
<ItemGroup>
106105
<Reference Include="System" />

‎ReactiveUI/ReactiveUI_Monotouch.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DefineConstants>MONO; IOS</DefineConstants>
3535
<DocumentationFile>bin\Release\Monotouch\ReactiveUI.XML</DocumentationFile>
3636
<DebugSymbols>true</DebugSymbols>
37-
<GenerateDocumentation>true</GenerateDocumentation>
37+
<GenerateDocumentation>True</GenerateDocumentation>
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="System" />

0 commit comments

Comments
 (0)