Skip to content

Commit 8f0f7e6

Browse files
committed
Merge pull request #804 from reactiveui/mac-unified
Updated ReactiveUI_Mac64 to output to Xamarin.Mac folder.
2 parents bbfcaab + 4c0656f commit 8f0f7e6

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,3 +208,4 @@ ext/monodroid/18
208208

209209

210210

211+
.DS_Store

MakeRelease.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
$Archs = {"Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10", "Portable-Net45+Win8+WP8+WPA81", "Net45", "WP8",
44
"WP81", "Win8", "Win81", "Mono", "Monoandroid", "Monotouch", "Monomac", "Portable-Win81+Wpa81", "WPA81",
5-
"Xamarin.iOS10"}
5+
"Xamarin.iOS10", "Xamarin.Mac10"}
66

77
$Projects = {
88
"ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Blend", "ReactiveUI.Winforms",

NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.dll

Whitespace-only changes.

NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.dll.mdb

Whitespace-only changes.

NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.xml

Whitespace-only changes.

ReactiveUI/ReactiveUI_Mac64.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<DebugSymbols>True</DebugSymbols>
1818
<DebugType>full</DebugType>
1919
<Optimize>False</Optimize>
20-
<OutputPath>bin\Debug\MonoMac</OutputPath>
21-
<IntermediateOutputPath>obj\Debug\MonoMac</IntermediateOutputPath>
20+
<OutputPath>bin\Debug\Xamarin.Mac10</OutputPath>
21+
<IntermediateOutputPath>obj\Debug\Xamarin.Mac10</IntermediateOutputPath>
2222
<DefineConstants>DEBUG;MONO;COCOA;UNIFIED</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
@@ -33,8 +33,8 @@
3333
</PropertyGroup>
3434
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3535
<Optimize>True</Optimize>
36-
<OutputPath>bin\Release\MonoMac</OutputPath>
37-
<IntermediateOutputPath>obj\Release\MonoMac</IntermediateOutputPath>
36+
<OutputPath>bin\Release\Xamarin.Mac10</OutputPath>
37+
<IntermediateOutputPath>obj\Release\Xamarin.Mac10</IntermediateOutputPath>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
4040
<EnablePackageSigning>False</EnablePackageSigning>
@@ -48,7 +48,7 @@
4848
<DefineConstants>MONO;COCOA;UNIFIED</DefineConstants>
4949
<DebugSymbols>true</DebugSymbols>
5050
<GenerateDocumentation>True</GenerateDocumentation>
51-
<DocumentationFile>bin\Release\MonoMac\ReactiveUI.xml</DocumentationFile>
51+
<DocumentationFile>bin\Release\Xamarin.Mac10\ReactiveUI.xml</DocumentationFile>
5252
<UseRefCounting>false</UseRefCounting>
5353
</PropertyGroup>
5454
<ItemGroup>
@@ -58,7 +58,7 @@
5858
<Reference Include="System.Xml.Linq" />
5959
<Reference Include="System.Runtime.Serialization" />
6060
<Reference Include="Splat">
61-
<HintPath>..\packages\Splat.1.6.0\lib\MonoMac\Splat.dll</HintPath>
61+
<HintPath>..\packages\Splat.1.6.0\lib\Xamarin.Mac10\Splat.dll</HintPath>
6262
</Reference>
6363
<Reference Include="System.Reactive.Core">
6464
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>

0 commit comments

Comments
 (0)