Skip to content

Commit 7e44abb

Browse files
ghuntleyghuntley
committed
[wip] bring up reactiveui-core for xamarin.mac on windows
1 parent 2eecba7 commit 7e44abb

5 files changed

Lines changed: 59 additions & 174 deletions

File tree

‎build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Task("BuildReactiveUI")
299299
SourceLink(solution);
300300
};
301301

302-
// once Windows Phone 8.x silverlight is retired then change this to MSBuildPlatform.Automatic
302+
// once Windows Phone 8.x silverlight is retired you can change this to MSBuildPlatform.Automatic
303303
build("ReactiveUI.sln", MSBuildPlatform.x86);
304304
}
305305
});

‎src/ReactiveUI.Events/ReactiveUI.Events_Mac.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,6 @@
124124
<ItemGroup>
125125
<None Include="packages.ReactiveUI.Events_Mac.config" />
126126
</ItemGroup>
127-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
127+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" Condition=" '$(OS)' != 'Windows_NT' " />
128+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(OS)' == 'Windows_NT' " />
128129
</Project>

‎src/ReactiveUI/ReactiveUI_Mac.csproj‎

Lines changed: 55 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{0913BF79-061F-4667-ADF9-8E6CDA6D1213}</ProjectGuid>
9-
<ProjectTypeGuids>{42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8+
<ProjectGuid>{1913BF79-061F-4667-ADF9-8E6CDA6D1211}</ProjectGuid>
9+
<ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1010
<OutputType>Library</OutputType>
1111
<RootNamespace>ReactiveUI</RootNamespace>
1212
<AssemblyName>ReactiveUI</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
14+
<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>True</DebugSymbols>
1718
<DebugType>full</DebugType>
1819
<Optimize>False</Optimize>
19-
<OutputPath>bin\Debug\MonoMac</OutputPath>
20-
<IntermediateOutputPath>obj\Debug\MonoMac</IntermediateOutputPath>
21-
<DefineConstants>DEBUG; MONO; COCOA</DefineConstants>
20+
<OutputPath>bin\Debug\Xamarin.Mac20</OutputPath>
21+
<IntermediateOutputPath>obj\Debug\Xamarin.Mac10</IntermediateOutputPath>
22+
<DefineConstants>DEBUG;MONO;COCOA;UNIFIED</DefineConstants>
2223
<ErrorReport>prompt</ErrorReport>
2324
<WarningLevel>4</WarningLevel>
2425
<EnablePackageSigning>False</EnablePackageSigning>
@@ -33,8 +34,8 @@
3334
</PropertyGroup>
3435
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3536
<Optimize>True</Optimize>
36-
<OutputPath>bin\Release\MonoMac</OutputPath>
37-
<IntermediateOutputPath>obj\Release\MonoMac</IntermediateOutputPath>
37+
<OutputPath>bin\Release\Xamarin.Mac20</OutputPath>
38+
<IntermediateOutputPath>obj\Release\Xamarin.Mac10</IntermediateOutputPath>
3839
<ErrorReport>prompt</ErrorReport>
3940
<WarningLevel>4</WarningLevel>
4041
<EnablePackageSigning>False</EnablePackageSigning>
@@ -45,23 +46,58 @@
4546
<CreatePackage>False</CreatePackage>
4647
<CodeSigningKey>Mac Developer</CodeSigningKey>
4748
<UseSGen>False</UseSGen>
48-
<DefineConstants>MONO; COCOA</DefineConstants>
49+
<DefineConstants>MONO;COCOA;UNIFIED</DefineConstants>
4950
<DebugSymbols>true</DebugSymbols>
5051
<GenerateDocumentation>True</GenerateDocumentation>
51-
<DocumentationFile>bin\Release\MonoMac\ReactiveUI.xml</DocumentationFile>
52+
<DocumentationFile>bin\Release\Xamarin.Mac10\ReactiveUI.xml</DocumentationFile>
5253
<UseRefCounting>false</UseRefCounting>
5354
<Profiling>false</Profiling>
5455
</PropertyGroup>
55-
<ItemGroup>
56+
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
5657
<Reference Include="System" />
5758
<Reference Include="System.Xml" />
5859
<Reference Include="System.Core" />
5960
<Reference Include="System.Xml.Linq" />
60-
<Reference Include="System.Drawing" />
61-
<Reference Include="XamMac" />
6261
<Reference Include="System.Runtime.Serialization" />
62+
<Reference Include="Xamarin.Mac" />
63+
</ItemGroup>
64+
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
65+
<NoStdLib>true</NoStdLib>
66+
<XamarinMacMobile>packages\ReactiveUI-TargetingPack-XamarinMac.1.0.0.1461330102\lib\XamarinMacMobile\</XamarinMacMobile>
67+
<XamarinMacXM45>packages\ReactiveUI-TargetingPack-XamarinMac.1.0.0.1461330102\lib\XamarinMac45\</XamarinMacXM45>
68+
</PropertyGroup>
69+
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
70+
<Reference Include="mscorlib">
71+
<HintPath>$(XamarinMacMobile)\mscorlib.dll</HintPath>
72+
</Reference>
73+
<Reference Include="System">
74+
<HintPath>$(XamarinMacMobile)\System.dll</HintPath>
75+
</Reference>
76+
<Reference Include="System.Core">
77+
<HintPath>$(XamarinMacMobile)\System.Core.dll</HintPath>
78+
</Reference>
79+
<Reference Include="System.Runtime.Serialization">
80+
<HintPath>$(XamarinMacMobile)\System.Runtime.Serialization.dll</HintPath>
81+
</Reference>
82+
<Reference Include="System.Xml.Linq">
83+
<HintPath>$(XamarinMacMobile)\System.Xml.Linq.dll</HintPath>
84+
</Reference>
85+
<Reference Include="Microsoft.CSharp">
86+
<HintPath>$(XamarinMacMobile)\Microsoft.CSharp.dll</HintPath>
87+
</Reference>
88+
<Reference Include="System.ComponentModel.DataAnnotations">
89+
<HintPath>$(XamarinMacMobile)\System.ComponentModel.DataAnnotations.dll</HintPath>
90+
</Reference>
91+
<Reference Include="System.Drawing">
92+
<HintPath>$(XamarinMacMobile)\System.Drawing.dll</HintPath>
93+
</Reference>
94+
<Reference Include="Xamarin.Mac">
95+
<HintPath>$(XamarinMacMobile)\Xamarin.Mac.dll</HintPath>
96+
</Reference>
97+
</ItemGroup>
98+
<ItemGroup>
6399
<Reference Include="Splat">
64-
<HintPath>..\packages\Splat.1.6.2\lib\MonoMac\Splat.dll</HintPath>
100+
<HintPath>..\packages\Splat.1.6.2\lib\Xamarin.Mac10\Splat.dll</HintPath>
65101
</Reference>
66102
<Reference Include="System.Reactive.Core">
67103
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
@@ -76,7 +112,6 @@
76112
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
77113
</Reference>
78114
</ItemGroup>
79-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
80115
<ItemGroup>
81116
<Compile Include="Cocoa\KVOObservableForProperty.cs" />
82117
<Compile Include="Cocoa\NSRunloopScheduler.cs" />
@@ -154,4 +189,9 @@
154189
<ItemGroup>
155190
<Folder Include="Cocoa\" />
156191
</ItemGroup>
192+
<ItemGroup>
193+
<None Include="packages.ReactiveUI_Mac.config" />
194+
</ItemGroup>
195+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" Condition=" '$(OS)' != 'Windows_NT' " />
196+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(OS)' == 'Windows_NT' " />
157197
</Project>

‎src/ReactiveUI/ReactiveUI_Mac64.csproj‎

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

‎src/ReactiveUI/packages.ReactiveUI_Mac.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="XamarinMac10" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="XamarinMac10" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="XamarinMac10" />
8+
<package id="ReactiveUI-TargetingPack-XamarinMac" version="1.0.0.1461330102"/>
89
</packages>

0 commit comments

Comments
 (0)