From d4bfdae611b5d8a86cab2f069102ac426c41d764 Mon Sep 17 00:00:00 2001 From: Renato Golia Date: Sun, 20 Sep 2015 15:19:23 +0200 Subject: [PATCH] Removed RxSample from main solution --- Nybus.sln | 12 ------ samples/RxSample/RxSample.sln | 22 ++++++++++ samples/RxSample/{ => RxSampleApp}/App.config | 0 .../RxSample/{ => RxSampleApp}/NLog.config | 0 samples/RxSample/{ => RxSampleApp}/NLog.xsd | 0 samples/RxSample/{ => RxSampleApp}/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RxSampleApp.csproj} | 40 ++++++++++--------- .../{ => RxSampleApp}/packages.config | 4 ++ 9 files changed, 47 insertions(+), 31 deletions(-) create mode 100644 samples/RxSample/RxSample.sln rename samples/RxSample/{ => RxSampleApp}/App.config (100%) rename samples/RxSample/{ => RxSampleApp}/NLog.config (100%) rename samples/RxSample/{ => RxSampleApp}/NLog.xsd (100%) rename samples/RxSample/{ => RxSampleApp}/Program.cs (100%) rename samples/RxSample/{ => RxSampleApp}/Properties/AssemblyInfo.cs (100%) rename samples/RxSample/{RxSample.csproj => RxSampleApp/RxSampleApp.csproj} (73%) rename samples/RxSample/{ => RxSampleApp}/packages.config (61%) diff --git a/Nybus.sln b/Nybus.sln index d6c5d82..b467cd3 100644 --- a/Nybus.sln +++ b/Nybus.sln @@ -41,12 +41,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rx", "src\Rx\Rx.csproj", "{ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Rx", "tests\Tests.Rx\Tests.Rx.csproj", "{5D7603F7-3F8F-429A-9258-91F8ED86447D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D6BFEA3C-5B16-4879-A947-830173FFF20C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RxSample", "samples\RxSample\RxSample.csproj", "{7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rx", "Rx", "{95F0599A-E084-477B-AEA9-784E7D8EA30E}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -101,10 +95,6 @@ Global {5D7603F7-3F8F-429A-9258-91F8ED86447D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5D7603F7-3F8F-429A-9258-91F8ED86447D}.Release|Any CPU.ActiveCfg = Release|Any CPU {5D7603F7-3F8F-429A-9258-91F8ED86447D}.Release|Any CPU.Build.0 = Release|Any CPU - {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -122,7 +112,5 @@ Global {72E3B663-AA36-4251-B9B6-E1172FC79FF7} = {31BCDC74-9C21-495F-837D-FC1977CD9F8B} {06E735A3-A79C-4043-AB04-8449A2FBC1D2} = {24B882E0-FB4F-476A-8844-06824472BEB0} {5D7603F7-3F8F-429A-9258-91F8ED86447D} = {31BCDC74-9C21-495F-837D-FC1977CD9F8B} - {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65} = {95F0599A-E084-477B-AEA9-784E7D8EA30E} - {95F0599A-E084-477B-AEA9-784E7D8EA30E} = {D6BFEA3C-5B16-4879-A947-830173FFF20C} EndGlobalSection EndGlobal diff --git a/samples/RxSample/RxSample.sln b/samples/RxSample/RxSample.sln new file mode 100644 index 0000000..4cbae1f --- /dev/null +++ b/samples/RxSample/RxSample.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RxSampleApp", "RxSampleApp\RxSampleApp.csproj", "{7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7758CAE7-B1AF-4C5A-B7BB-6C8A82CC5E65}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/RxSample/App.config b/samples/RxSample/RxSampleApp/App.config similarity index 100% rename from samples/RxSample/App.config rename to samples/RxSample/RxSampleApp/App.config diff --git a/samples/RxSample/NLog.config b/samples/RxSample/RxSampleApp/NLog.config similarity index 100% rename from samples/RxSample/NLog.config rename to samples/RxSample/RxSampleApp/NLog.config diff --git a/samples/RxSample/NLog.xsd b/samples/RxSample/RxSampleApp/NLog.xsd similarity index 100% rename from samples/RxSample/NLog.xsd rename to samples/RxSample/RxSampleApp/NLog.xsd diff --git a/samples/RxSample/Program.cs b/samples/RxSample/RxSampleApp/Program.cs similarity index 100% rename from samples/RxSample/Program.cs rename to samples/RxSample/RxSampleApp/Program.cs diff --git a/samples/RxSample/Properties/AssemblyInfo.cs b/samples/RxSample/RxSampleApp/Properties/AssemblyInfo.cs similarity index 100% rename from samples/RxSample/Properties/AssemblyInfo.cs rename to samples/RxSample/RxSampleApp/Properties/AssemblyInfo.cs diff --git a/samples/RxSample/RxSample.csproj b/samples/RxSample/RxSampleApp/RxSampleApp.csproj similarity index 73% rename from samples/RxSample/RxSample.csproj rename to samples/RxSample/RxSampleApp/RxSampleApp.csproj index d19e3da..86dab29 100644 --- a/samples/RxSample/RxSample.csproj +++ b/samples/RxSample/RxSampleApp/RxSampleApp.csproj @@ -8,7 +8,7 @@ Exe Properties RxSample - RxSample + RxSampleApp v4.6 512 true @@ -34,21 +34,37 @@ - ..\..\Packages\NLog.4.1.1\lib\net45\NLog.dll + ..\..\..\Packages\NLog.4.1.1\lib\net45\NLog.dll + True + + + ..\..\..\Packages\Nybus.Core.0.3.0.60\lib\net46\Nybus.Core.dll + True + + + ..\..\..\Packages\Nybus.Interfaces.0.3.0.60\lib\net46\Nybus.Interfaces.dll + True + + + ..\..\..\Packages\Nybus.NLog.0.3.0.60\lib\net46\Nybus.NLog.dll + True + + + ..\..\..\Packages\Nybus.Rx.0.3.0.60\lib\net46\Nybus.Rx.dll True - ..\..\Packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll + ..\..\..\Packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll True - ..\..\Packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll + ..\..\..\Packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll True - ..\..\Packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll + ..\..\..\Packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll True @@ -57,8 +73,6 @@ - - @@ -75,22 +89,10 @@ - - {fe8fb759-5499-4731-a279-623c8ef6ee1d} - Core - - - {c858bab7-00f9-4629-9aa1-a2ddefad5543} - Interfaces - {d72ee66a-c189-40ff-97be-40ef9c08bbf8} NLog - - {06e735a3-a79c-4043-ab04-8449a2fbc1d2} - Rx -