From 6b7b9ae489b996550b074c4f99cf0409e8b743a3 Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Sun, 27 Mar 2016 23:36:39 +1100 Subject: [PATCH] impl reactiveui-events nuget package creation --- .gitignore | 8 ++- COPYING | 50 ---------------- LICENSE | 55 ++++++++++++++++++ .../ReactiveUI-Events.nuspec | 25 -------- .../lib/wp8/ReactiveUI.Events.dll | 0 .../lib/wp8/ReactiveUI.Events.pdb | 0 ...packages.ReactiveUI.Events_XamForms.config | 9 --- build.cake | 26 +++++++-- .../CommonAssemblyInfo.cs | 8 +-- src/ReactiveUI-Events.nuspec | 43 ++++++++++++++ .../ReactiveUI.Events}/EventBuilder.cs | 0 .../ReactiveUI.Events}/EventBuilder.csproj | 0 .../ReactiveUI.Events}/Events.mustache | 0 .../Properties/ReactiveUI.Events.rd.xml | 0 .../ReactiveUI.Events_Android.csproj | 0 .../ReactiveUI.Events_Android.sln | 0 .../ReactiveUI.Events_Mac.csproj | 0 .../ReactiveUI.Events_Net45.csproj | 0 .../ReactiveUI.Events_Net45.sln | 0 .../ReactiveUI.Events_UWP.csproj | 4 +- .../ReactiveUI.Events_UWP.project.json | 7 ++- .../ReactiveUI.Events_UWP.sln | 0 .../ReactiveUI.Events_WP81.csproj | 0 .../ReactiveUI.Events_WP81.sln | 0 .../ReactiveUI.Events_WPA81.csproj | 0 .../ReactiveUI.Events_WPA81.sln | 0 .../ReactiveUI.Events_XamForms.csproj | 51 ++++++++-------- .../ReactiveUI.Events_XamForms.sln | 0 .../ReactiveUI.Events_iOS.csproj | 0 .../ReactiveUI.Events_iOS.sln | 0 .../Resources/Resource.Designer.cs | 0 .../ReactiveUI.Events}/SingleAwaitSubject.cs | 0 .../WinMetadata.UWP/Windows.winmd | Bin .../WinMetadata.WPA81/Windows.winmd | Bin .../WinMetadata.Win81/Windows.winmd | Bin .../ReactiveUI.Events}/generate_events.rb | 0 .../packages.EventBuilder.config | 0 .../packages.ReactiveUI.Events.config | 0 .../packages.ReactiveUI.Events_Android.config | 0 .../packages.ReactiveUI.Events_Mac.config | 0 .../packages.ReactiveUI.Events_Net45.config | 0 .../packages.ReactiveUI.Events_WP81.config | 0 .../packages.ReactiveUI.Events_WPA81.config | 0 ...packages.ReactiveUI.Events_XamForms.config | 10 ++++ .../packages.ReactiveUI.Events_iOS.config | 0 45 files changed, 171 insertions(+), 125 deletions(-) delete mode 100644 COPYING create mode 100644 LICENSE delete mode 100644 NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec delete mode 100644 NuGet/ReactiveUI-Events/lib/wp8/ReactiveUI.Events.dll delete mode 100644 NuGet/ReactiveUI-Events/lib/wp8/ReactiveUI.Events.pdb delete mode 100644 ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config rename CommonAssemblyInfo.cs => src/CommonAssemblyInfo.cs (62%) create mode 100644 src/ReactiveUI-Events.nuspec rename {ReactiveUI.Events => src/ReactiveUI.Events}/EventBuilder.cs (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/EventBuilder.csproj (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/Events.mustache (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/Properties/ReactiveUI.Events.rd.xml (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_Android.csproj (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_Android.sln (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_Mac.csproj (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_Net45.csproj (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_Net45.sln (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_UWP.csproj (97%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_UWP.project.json (82%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_UWP.sln (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_WP81.csproj (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_WP81.sln (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_WPA81.csproj (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_WPA81.sln (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_XamForms.csproj (79%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_XamForms.sln (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_iOS.csproj (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/ReactiveUI.Events_iOS.sln (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/Resources/Resource.Designer.cs (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/SingleAwaitSubject.cs (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/WinMetadata.UWP/Windows.winmd (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/WinMetadata.WPA81/Windows.winmd (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/WinMetadata.Win81/Windows.winmd (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/generate_events.rb (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.EventBuilder.config (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.ReactiveUI.Events.config (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.ReactiveUI.Events_Android.config (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.ReactiveUI.Events_Mac.config (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.ReactiveUI.Events_Net45.config (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.ReactiveUI.Events_WP81.config (100%) rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.ReactiveUI.Events_WPA81.config (100%) create mode 100644 src/ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config rename {ReactiveUI.Events => src/ReactiveUI.Events}/packages.ReactiveUI.Events_iOS.config (100%) diff --git a/.gitignore b/.gitignore index 94702416e5..112c1fdee8 100644 --- a/.gitignore +++ b/.gitignore @@ -140,7 +140,7 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings +# TODO: Comment the next line if you want to checkin your web deploy settings # but database connection strings (with potential passwords) will be unencrypted *.pubxml *.publishproj @@ -235,5 +235,7 @@ _Pvt_Extensions # Tools tools/ -ReactiveUI.Events/Events.cs -ReactiveUI.Events/Events_*.cs \ No newline at end of file +# ReactiveUI +artifacts/ +src/CommonAssemblyInfo.cs +src/ReactiveUI.Events/Events_*.cs diff --git a/COPYING b/COPYING deleted file mode 100644 index fd31438931..0000000000 --- a/COPYING +++ /dev/null @@ -1,50 +0,0 @@ -Microsoft Public License (Ms-PL) - -This license governs use of the accompanying software. If you use the software, -you accept this license. If you do not accept the license, do not use the -software. - -1. Definitions -The terms "reproduce," "reproduction," "derivative works," and "distribution" -have the same meaning here as under U.S. copyright law. A "contribution" is the -original software, or any additions or changes to the software. A "contributor" -is any person that distributes its contribution under this license. "Licensed -patents" are a contributor's patent claims that read directly on its -contribution. - -2. Grant of Rights - -(A) Copyright Grant- Subject to the terms of this license, including the license -conditions and limitations in section 3, each contributor grants you a -non-exclusive, worldwide, royalty-free copyright license to reproduce its -contribution, prepare derivative works of its contribution, and distribute its -contribution or any derivative works that you create. - -(B) Patent Grant- Subject -to the terms of this license, including the license conditions and limitations -in section 3, each contributor grants you a non-exclusive, worldwide, -royalty-free license under its licensed patents to make, have made, use, sell, -offer for sale, import, and/or otherwise dispose of its contribution in the -software or derivative works of the contribution in the software. - -3. Conditions and Limitations - -(A) No Trademark License- This license does not grant you rights to use any -contributors' name, logo, or trademarks. -(B) If you bring a patent claim against any contributor over patents that you -claim are infringed by the software, your patent license from such contributor -to the software ends automatically. -(C) If you distribute any portion of the software, you must retain all -copyright, patent, trademark, and attribution notices that are present in the -software. -(D) If you distribute any portion of the software in source code form, you may -do so only under this license by including a complete copy of this license with -your distribution. If you distribute any portion of the software in compiled or -object code form, you may only do so under a license that complies with this -license. -(E) The software is licensed "as-is." You bear the risk of using it. The -contributors give no express warranties, guarantees or conditions. You may have -additional consumer rights under your local laws which this license cannot -change. To the extent permitted under your local laws, the contributors exclude -the implied warranties of merchantability, fitness for a particular purpose and -non-infringement. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..9573cdee39 --- /dev/null +++ b/LICENSE @@ -0,0 +1,55 @@ +Microsoft Public License (Ms-PL) + +This license governs use of the accompanying software. If you use the software, +you accept this license. If you do not accept the license, do not use the +software. + +1. Definitions + +The terms "reproduce," "reproduction," "derivative works," and "distribution" +have the same meaning here as under U.S. copyright law. A "contribution" is the +original software, or any additions or changes to the software. A "contributor" +is any person that distributes its contribution under this license. "Licensed +patents" are a contributor's patent claims that read directly on its +contribution. + +2. Grant of Rights + + (A) Copyright Grant- Subject to the terms of this license, including the license + conditions and limitations in section 3, each contributor grants you a + non-exclusive, worldwide, royalty-free copyright license to reproduce its + contribution, prepare derivative works of its contribution, and distribute its + contribution or any derivative works that you create. + + (B) Patent Grant- Subject + to the terms of this license, including the license conditions and limitations + in section 3, each contributor grants you a non-exclusive, worldwide, + royalty-free license under its licensed patents to make, have made, use, sell, + offer for sale, import, and/or otherwise dispose of its contribution in the + software or derivative works of the contribution in the software. + +3. Conditions and Limitations + + (A) No Trademark License- This license does not grant you rights to use any + contributors' name, logo, or trademarks. + + (B) If you bring a patent claim against any contributor over patents that you + claim are infringed by the software, your patent license from such contributor + to the software ends automatically. + + (C) If you distribute any portion of the software, you must retain all + copyright, patent, trademark, and attribution notices that are present in the + software. + + (D) If you distribute any portion of the software in source code form, you may + do so only under this license by including a complete copy of this license with + your distribution. If you distribute any portion of the software in compiled or + object code form, you may only do so under a license that complies with this + license. + + (E) The software is licensed "as-is." You bear the risk of using it. The + contributors give no express warranties, guarantees or conditions. You may have + additional consumer rights under your local laws which this license cannot + change. To the extent permitted under your local laws, the contributors exclude + the implied warranties of merchantability, fitness for a particular purpose and + non-infringement. diff --git a/NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec b/NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec deleted file mode 100644 index d673c4b899..0000000000 --- a/NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - reactiveui-events - 6.5.0 - ReactiveUI.Events adds Observable-based events to UI controls and other appropriate places. - Paul Betts - http://www.reactiveui.net - http://opensource.org/licenses/ms-pl.html - en-us - false - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NuGet/ReactiveUI-Events/lib/wp8/ReactiveUI.Events.dll b/NuGet/ReactiveUI-Events/lib/wp8/ReactiveUI.Events.dll deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/NuGet/ReactiveUI-Events/lib/wp8/ReactiveUI.Events.pdb b/NuGet/ReactiveUI-Events/lib/wp8/ReactiveUI.Events.pdb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config b/ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config deleted file mode 100644 index 287fa001d2..0000000000 --- a/ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/build.cake b/build.cake index a1b7dd372c..8e10491de4 100644 --- a/build.cake +++ b/build.cake @@ -32,11 +32,26 @@ var version = releaseNotes.Version.ToString(); var semVersion = local ? version : (version + string.Concat("-sha-", gitSha)); // Define directories. - +var artifactDirectory = "./artifacts/"; // Define global marcos. Action Abort = () => { throw new Exception("a non-recoverable fatal error occurred."); }; +Action Package = (nuspec, basePath) => +{ + CreateDirectory(artifactDirectory); + + Information("Packaging {0} using {1} as the BasePath.", nuspec, basePath); + + NuGetPack(nuspec, new NuGetPackSettings { + Verbosity = NuGetVerbosity.Detailed, + OutputDirectory = artifactDirectory, + Version = version, + BasePath = basePath, + }); +}; + + /////////////////////////////////////////////////////////////////////////////// // SETUP / TEARDOWN /////////////////////////////////////////////////////////////////////////////// @@ -116,7 +131,7 @@ Task ("GenerateEvents") Abort(); } - var directory = "ReactiveUI.Events/"; + var directory = "src/ReactiveUI.Events/"; var filename = String.Format("Events_{0}.cs", platform); var output = System.IO.Path.Combine(directory, filename); @@ -156,7 +171,7 @@ Task ("BuildEvents") // remove the .SetMSBuildPlatform method and simply the invoking methods. Action build = (filename, platform) => { - var solution = System.IO.Path.Combine("./ReactiveUI.Events", filename); + var solution = System.IO.Path.Combine("./src/ReactiveUI.Events/", filename); // UWP (project.json) needs to be restored before it will build. NuGetRestore (solution); @@ -188,18 +203,17 @@ Task ("BuildEvents") } }); - Task ("PackageEvents") .IsDependentOn("BuildEvents") .Does (() => { - + Package("./src/ReactiveUI-Events.nuspec", "./src/ReactiveUI.Events"); }); Task ("UpdateAssemblyInfo") .Does (() => { - var file = "./CommonAssemblyInfo.cs"; + var file = "./src/CommonAssemblyInfo.cs"; CreateAssemblyInfo(file, new AssemblyInfoSettings { Product = "ReactiveUI", diff --git a/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs similarity index 62% rename from CommonAssemblyInfo.cs rename to src/CommonAssemblyInfo.cs index baaeffee5a..7159157f1e 100644 --- a/CommonAssemblyInfo.cs +++ b/src/CommonAssemblyInfo.cs @@ -1,13 +1,13 @@ //------------------------------------------------------------------------------ // -// The version identifiers are automatically updated via the build script. +// This code was generated by Cake. // //------------------------------------------------------------------------------ using System.Reflection; [assembly: AssemblyProduct("ReactiveUI")] -[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("1.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0")] +[assembly: AssemblyVersion("7.0.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] [assembly: AssemblyCopyright("Copyright (c) ReactiveUI and contributors")] diff --git a/src/ReactiveUI-Events.nuspec b/src/ReactiveUI-Events.nuspec new file mode 100644 index 0000000000..6b9caf3222 --- /dev/null +++ b/src/ReactiveUI-Events.nuspec @@ -0,0 +1,43 @@ + + + + reactiveui-events + $version$ + ReactiveUI.Events adds Observable-based events to UI controls and other appropriate places. + Paul Betts + http://www.reactiveui.net + http://opensource.org/licenses/ms-pl.html + en-us + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ReactiveUI.Events/EventBuilder.cs b/src/ReactiveUI.Events/EventBuilder.cs similarity index 100% rename from ReactiveUI.Events/EventBuilder.cs rename to src/ReactiveUI.Events/EventBuilder.cs diff --git a/ReactiveUI.Events/EventBuilder.csproj b/src/ReactiveUI.Events/EventBuilder.csproj similarity index 100% rename from ReactiveUI.Events/EventBuilder.csproj rename to src/ReactiveUI.Events/EventBuilder.csproj diff --git a/ReactiveUI.Events/Events.mustache b/src/ReactiveUI.Events/Events.mustache similarity index 100% rename from ReactiveUI.Events/Events.mustache rename to src/ReactiveUI.Events/Events.mustache diff --git a/ReactiveUI.Events/Properties/ReactiveUI.Events.rd.xml b/src/ReactiveUI.Events/Properties/ReactiveUI.Events.rd.xml similarity index 100% rename from ReactiveUI.Events/Properties/ReactiveUI.Events.rd.xml rename to src/ReactiveUI.Events/Properties/ReactiveUI.Events.rd.xml diff --git a/ReactiveUI.Events/ReactiveUI.Events_Android.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_Android.csproj similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_Android.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_Android.csproj diff --git a/ReactiveUI.Events/ReactiveUI.Events_Android.sln b/src/ReactiveUI.Events/ReactiveUI.Events_Android.sln similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_Android.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_Android.sln diff --git a/ReactiveUI.Events/ReactiveUI.Events_Mac.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_Mac.csproj similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_Mac.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_Mac.csproj diff --git a/ReactiveUI.Events/ReactiveUI.Events_Net45.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_Net45.csproj similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_Net45.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_Net45.csproj diff --git a/ReactiveUI.Events/ReactiveUI.Events_Net45.sln b/src/ReactiveUI.Events/ReactiveUI.Events_Net45.sln similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_Net45.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_Net45.sln diff --git a/ReactiveUI.Events/ReactiveUI.Events_UWP.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_UWP.csproj similarity index 97% rename from ReactiveUI.Events/ReactiveUI.Events_UWP.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_UWP.csproj index 6945f0a178..0157d758e3 100644 --- a/ReactiveUI.Events/ReactiveUI.Events_UWP.csproj +++ b/src/ReactiveUI.Events/ReactiveUI.Events_UWP.csproj @@ -44,7 +44,7 @@ bin\Release\uap10.0\ReactiveUI.Events.XML - + False @@ -74,4 +74,4 @@ 14.0 - \ No newline at end of file + diff --git a/ReactiveUI.Events/ReactiveUI.Events_UWP.project.json b/src/ReactiveUI.Events/ReactiveUI.Events_UWP.project.json similarity index 82% rename from ReactiveUI.Events/ReactiveUI.Events_UWP.project.json rename to src/ReactiveUI.Events/ReactiveUI.Events_UWP.project.json index 45fc251ff5..a0a04636f3 100644 --- a/ReactiveUI.Events/ReactiveUI.Events_UWP.project.json +++ b/src/ReactiveUI.Events/ReactiveUI.Events_UWP.project.json @@ -2,10 +2,11 @@ "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0", "NuSpec.ReferenceGenerator": "1.4.2", - "Rx-XAML": "2.2.5" + "Rx-Main": "2.2.5", + "Splat": "1.6.2" }, "frameworks": { - "uap10.0": { } + "uap10.0": {} }, "runtimes": { "win10-arm": {}, @@ -15,4 +16,4 @@ "win10-x64": {}, "win10-x64-aot": {} } -} +} \ No newline at end of file diff --git a/ReactiveUI.Events/ReactiveUI.Events_UWP.sln b/src/ReactiveUI.Events/ReactiveUI.Events_UWP.sln similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_UWP.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_UWP.sln diff --git a/ReactiveUI.Events/ReactiveUI.Events_WP81.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_WP81.csproj similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_WP81.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_WP81.csproj diff --git a/ReactiveUI.Events/ReactiveUI.Events_WP81.sln b/src/ReactiveUI.Events/ReactiveUI.Events_WP81.sln similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_WP81.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_WP81.sln diff --git a/ReactiveUI.Events/ReactiveUI.Events_WPA81.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_WPA81.csproj similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_WPA81.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_WPA81.csproj diff --git a/ReactiveUI.Events/ReactiveUI.Events_WPA81.sln b/src/ReactiveUI.Events/ReactiveUI.Events_WPA81.sln similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_WPA81.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_WPA81.sln diff --git a/ReactiveUI.Events/ReactiveUI.Events_XamForms.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_XamForms.csproj similarity index 79% rename from ReactiveUI.Events/ReactiveUI.Events_XamForms.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_XamForms.csproj index 3e0907f4e0..a7d8f7652e 100644 --- a/ReactiveUI.Events/ReactiveUI.Events_XamForms.csproj +++ b/src/ReactiveUI.Events/ReactiveUI.Events_XamForms.csproj @@ -20,6 +20,7 @@ 2.0 + false true @@ -44,26 +45,31 @@ + + packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll + True + - - - - - ..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll - - - ..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll + + packages\Rx-Core.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Core.dll + True - - ..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll + + packages\Rx-Interfaces.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Interfaces.dll + True - - ..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll + + packages\Rx-Linq.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.Linq.dll + True - - ..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll + + packages\Rx-PlatformServices.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll + True + + + packages\Xamarin.Forms.2.1.0.6529\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll True @@ -82,18 +88,10 @@ - - - + @@ -101,4 +99,11 @@ + diff --git a/ReactiveUI.Events/ReactiveUI.Events_XamForms.sln b/src/ReactiveUI.Events/ReactiveUI.Events_XamForms.sln similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_XamForms.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_XamForms.sln diff --git a/ReactiveUI.Events/ReactiveUI.Events_iOS.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_iOS.csproj similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_iOS.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_iOS.csproj diff --git a/ReactiveUI.Events/ReactiveUI.Events_iOS.sln b/src/ReactiveUI.Events/ReactiveUI.Events_iOS.sln similarity index 100% rename from ReactiveUI.Events/ReactiveUI.Events_iOS.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_iOS.sln diff --git a/ReactiveUI.Events/Resources/Resource.Designer.cs b/src/ReactiveUI.Events/Resources/Resource.Designer.cs similarity index 100% rename from ReactiveUI.Events/Resources/Resource.Designer.cs rename to src/ReactiveUI.Events/Resources/Resource.Designer.cs diff --git a/ReactiveUI.Events/SingleAwaitSubject.cs b/src/ReactiveUI.Events/SingleAwaitSubject.cs similarity index 100% rename from ReactiveUI.Events/SingleAwaitSubject.cs rename to src/ReactiveUI.Events/SingleAwaitSubject.cs diff --git a/ReactiveUI.Events/WinMetadata.UWP/Windows.winmd b/src/ReactiveUI.Events/WinMetadata.UWP/Windows.winmd similarity index 100% rename from ReactiveUI.Events/WinMetadata.UWP/Windows.winmd rename to src/ReactiveUI.Events/WinMetadata.UWP/Windows.winmd diff --git a/ReactiveUI.Events/WinMetadata.WPA81/Windows.winmd b/src/ReactiveUI.Events/WinMetadata.WPA81/Windows.winmd similarity index 100% rename from ReactiveUI.Events/WinMetadata.WPA81/Windows.winmd rename to src/ReactiveUI.Events/WinMetadata.WPA81/Windows.winmd diff --git a/ReactiveUI.Events/WinMetadata.Win81/Windows.winmd b/src/ReactiveUI.Events/WinMetadata.Win81/Windows.winmd similarity index 100% rename from ReactiveUI.Events/WinMetadata.Win81/Windows.winmd rename to src/ReactiveUI.Events/WinMetadata.Win81/Windows.winmd diff --git a/ReactiveUI.Events/generate_events.rb b/src/ReactiveUI.Events/generate_events.rb similarity index 100% rename from ReactiveUI.Events/generate_events.rb rename to src/ReactiveUI.Events/generate_events.rb diff --git a/ReactiveUI.Events/packages.EventBuilder.config b/src/ReactiveUI.Events/packages.EventBuilder.config similarity index 100% rename from ReactiveUI.Events/packages.EventBuilder.config rename to src/ReactiveUI.Events/packages.EventBuilder.config diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events.config similarity index 100% rename from ReactiveUI.Events/packages.ReactiveUI.Events.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events.config diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events_Android.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_Android.config similarity index 100% rename from ReactiveUI.Events/packages.ReactiveUI.Events_Android.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events_Android.config diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events_Mac.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_Mac.config similarity index 100% rename from ReactiveUI.Events/packages.ReactiveUI.Events_Mac.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events_Mac.config diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events_Net45.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_Net45.config similarity index 100% rename from ReactiveUI.Events/packages.ReactiveUI.Events_Net45.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events_Net45.config diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events_WP81.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_WP81.config similarity index 100% rename from ReactiveUI.Events/packages.ReactiveUI.Events_WP81.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events_WP81.config diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events_WPA81.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_WPA81.config similarity index 100% rename from ReactiveUI.Events/packages.ReactiveUI.Events_WPA81.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events_WPA81.config diff --git a/src/ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config new file mode 100644 index 0000000000..709cfce2b3 --- /dev/null +++ b/src/ReactiveUI.Events/packages.ReactiveUI.Events_XamForms.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ReactiveUI.Events/packages.ReactiveUI.Events_iOS.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_iOS.config similarity index 100% rename from ReactiveUI.Events/packages.ReactiveUI.Events_iOS.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events_iOS.config