From 10a149b245f1f13515cb67cf369e9c2f19b2901e Mon Sep 17 00:00:00 2001 From: mteper Date: Mon, 9 Feb 2015 14:22:49 -0800 Subject: [PATCH 1/4] Updated ReactiveUI_Mac64 to output to Xamarin.Mac folder. --- ReactiveUI/ReactiveUI_Mac64.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactiveUI/ReactiveUI_Mac64.csproj b/ReactiveUI/ReactiveUI_Mac64.csproj index efb2321b15..553dafb9ff 100644 --- a/ReactiveUI/ReactiveUI_Mac64.csproj +++ b/ReactiveUI/ReactiveUI_Mac64.csproj @@ -17,7 +17,7 @@ True full False - bin\Debug\MonoMac + bin\Debug\Xamarin.Mac obj\Debug\MonoMac DEBUG;MONO;COCOA;UNIFIED prompt @@ -33,7 +33,7 @@ True - bin\Release\MonoMac + bin\Release\Xamarin.Mac obj\Release\MonoMac prompt 4 From e9db98be1fe7001cdbba78a919f32f8cd6eb3379 Mon Sep 17 00:00:00 2001 From: mteper Date: Mon, 9 Feb 2015 14:45:07 -0800 Subject: [PATCH 2/4] Added missing Xamarin.Mac pointers, updated MakeRelease.ps1 --- .gitignore | 1 + MakeRelease.ps1 | 2 +- NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll | 0 NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll.mdb | 0 NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.xml | 0 ReactiveUI/ReactiveUI_Mac64.csproj | 6 +++--- 6 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll create mode 100644 NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll.mdb create mode 100644 NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.xml diff --git a/.gitignore b/.gitignore index 895a4e6882..d944c29a3c 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,4 @@ ext/monodroid/18 +.DS_Store diff --git a/MakeRelease.ps1 b/MakeRelease.ps1 index a259432c3f..9cddd93ed7 100644 --- a/MakeRelease.ps1 +++ b/MakeRelease.ps1 @@ -2,7 +2,7 @@ $Archs = {"Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10", "Portable-Net45+Win8+WP8+WPA81", "Net45", "WP8", "WP81", "Win8", "Win81", "Mono", "Monoandroid", "Monotouch", "Monomac", "Portable-Win81+Wpa81", "WPA81", - "Xamarin.iOS10"} + "Xamarin.iOS10", "Xamarin.Mac"} $Projects = { "ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Blend", "ReactiveUI.Winforms", diff --git a/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll b/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll new file mode 100644 index 0000000000..e69de29bb2 diff --git a/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll.mdb b/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll.mdb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.xml b/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ReactiveUI/ReactiveUI_Mac64.csproj b/ReactiveUI/ReactiveUI_Mac64.csproj index 553dafb9ff..ffb7b20280 100644 --- a/ReactiveUI/ReactiveUI_Mac64.csproj +++ b/ReactiveUI/ReactiveUI_Mac64.csproj @@ -18,7 +18,7 @@ full False bin\Debug\Xamarin.Mac - obj\Debug\MonoMac + obj\Debug\Xamarin.Mac DEBUG;MONO;COCOA;UNIFIED prompt 4 @@ -34,7 +34,7 @@ True bin\Release\Xamarin.Mac - obj\Release\MonoMac + obj\Release\Xamarin.Mac prompt 4 False @@ -48,7 +48,7 @@ MONO;COCOA;UNIFIED true True - bin\Release\MonoMac\ReactiveUI.xml + bin\Release\Xamarin.Mac\ReactiveUI.xml false From 4b68351f5e7fa8cb77bafa2fc572b56330e44723 Mon Sep 17 00:00:00 2001 From: mteper Date: Mon, 9 Feb 2015 14:56:01 -0800 Subject: [PATCH 3/4] Updated Splat reference and changed paths to Xamarin.Mac10 --- .../{Xamarin.Mac => Xamarin.Mac10}/ReactiveUI.dll | 0 .../ReactiveUI.dll.mdb | 0 .../{Xamarin.Mac => Xamarin.Mac10}/ReactiveUI.xml | 0 ReactiveUI/ReactiveUI_Mac64.csproj | 12 ++++++------ 4 files changed, 6 insertions(+), 6 deletions(-) rename NuGet/ReactiveUI-Core/lib/{Xamarin.Mac => Xamarin.Mac10}/ReactiveUI.dll (100%) rename NuGet/ReactiveUI-Core/lib/{Xamarin.Mac => Xamarin.Mac10}/ReactiveUI.dll.mdb (100%) rename NuGet/ReactiveUI-Core/lib/{Xamarin.Mac => Xamarin.Mac10}/ReactiveUI.xml (100%) diff --git a/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll b/NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.dll similarity index 100% rename from NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll rename to NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.dll diff --git a/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll.mdb b/NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.dll.mdb similarity index 100% rename from NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.dll.mdb rename to NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.dll.mdb diff --git a/NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.xml b/NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.xml similarity index 100% rename from NuGet/ReactiveUI-Core/lib/Xamarin.Mac/ReactiveUI.xml rename to NuGet/ReactiveUI-Core/lib/Xamarin.Mac10/ReactiveUI.xml diff --git a/ReactiveUI/ReactiveUI_Mac64.csproj b/ReactiveUI/ReactiveUI_Mac64.csproj index ffb7b20280..131b1e3a8c 100644 --- a/ReactiveUI/ReactiveUI_Mac64.csproj +++ b/ReactiveUI/ReactiveUI_Mac64.csproj @@ -17,8 +17,8 @@ True full False - bin\Debug\Xamarin.Mac - obj\Debug\Xamarin.Mac + bin\Debug\Xamarin.Mac10 + obj\Debug\Xamarin.Mac10 DEBUG;MONO;COCOA;UNIFIED prompt 4 @@ -33,8 +33,8 @@ True - bin\Release\Xamarin.Mac - obj\Release\Xamarin.Mac + bin\Release\Xamarin.Mac10 + obj\Release\Xamarin.Mac10 prompt 4 False @@ -48,7 +48,7 @@ MONO;COCOA;UNIFIED true True - bin\Release\Xamarin.Mac\ReactiveUI.xml + bin\Release\Xamarin.Mac10\ReactiveUI.xml false @@ -58,7 +58,7 @@ - ..\packages\Splat.1.6.0\lib\MonoMac\Splat.dll + ..\packages\Splat.1.6.0\lib\Xamarin.Mac10\Splat.dll ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll From 4c0656f37bd4701c41362532d4573f35b751f41a Mon Sep 17 00:00:00 2001 From: mteper Date: Mon, 9 Feb 2015 14:57:06 -0800 Subject: [PATCH 4/4] Fixed up MakeRelease to point to Xamarin.Mac10 --- MakeRelease.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MakeRelease.ps1 b/MakeRelease.ps1 index 9cddd93ed7..5c4a77f198 100644 --- a/MakeRelease.ps1 +++ b/MakeRelease.ps1 @@ -2,7 +2,7 @@ $Archs = {"Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10", "Portable-Net45+Win8+WP8+WPA81", "Net45", "WP8", "WP81", "Win8", "Win81", "Mono", "Monoandroid", "Monotouch", "Monomac", "Portable-Win81+Wpa81", "WPA81", - "Xamarin.iOS10", "Xamarin.Mac"} + "Xamarin.iOS10", "Xamarin.Mac10"} $Projects = { "ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Blend", "ReactiveUI.Winforms",