Removed RxSample from main solution

Nybus-project · Sep 20, 2015 · d4bfdae · d4bfdae
1 parent 4e21db4
commit d4bfdae
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 31 deletions.
diff --git 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
@@ -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 → samples/RxSample/RxSampleApp/App.config b/samples/RxSample/App.config → samples/RxSample/RxSampleApp/App.config
diff --git a/samples/RxSample/NLog.config → samples/RxSample/RxSampleApp/NLog.config b/samples/RxSample/NLog.config → samples/RxSample/RxSampleApp/NLog.config
diff --git a/samples/RxSample/NLog.xsd → samples/RxSample/RxSampleApp/NLog.xsd b/samples/RxSample/NLog.xsd → samples/RxSample/RxSampleApp/NLog.xsd
diff --git a/samples/RxSample/Program.cs → samples/RxSample/RxSampleApp/Program.cs b/samples/RxSample/Program.cs → samples/RxSample/RxSampleApp/Program.cs
diff --git a/samples/RxSample/Properties/AssemblyInfo.cs → ...le/RxSampleApp/Properties/AssemblyInfo.cs b/samples/RxSample/Properties/AssemblyInfo.cs → ...le/RxSampleApp/Properties/AssemblyInfo.cs
diff --git a/samples/RxSample/RxSample.csproj → ...s/RxSample/RxSampleApp/RxSampleApp.csproj b/samples/RxSample/RxSample.csproj → ...s/RxSample/RxSampleApp/RxSampleApp.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RxSample</RootNamespace>
-    <AssemblyName>RxSample</AssemblyName>
+    <AssemblyName>RxSampleApp</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -34,21 +34,37 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\Packages\NLog.4.1.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\..\..\Packages\NLog.4.1.1\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nybus.Core, Version=0.3.0.60, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Packages\Nybus.Core.0.3.0.60\lib\net46\Nybus.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nybus.Interfaces, Version=0.3.0.60, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Packages\Nybus.Interfaces.0.3.0.60\lib\net46\Nybus.Interfaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nybus.NLog, Version=0.3.0.60, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Packages\Nybus.NLog.0.3.0.60\lib\net46\Nybus.NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nybus.Rx, Version=0.3.0.60, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Packages\Nybus.Rx.0.3.0.60\lib\net46\Nybus.Rx.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\Packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\..\Packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\Packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\Packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\Packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\..\Packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -57,8 +73,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
@@ -75,22 +89,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core\Core.csproj">
-      <Project>{fe8fb759-5499-4731-a279-623c8ef6ee1d}</Project>
-      <Name>Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Interfaces\Interfaces.csproj">
-      <Project>{c858bab7-00f9-4629-9aa1-a2ddefad5543}</Project>
-      <Name>Interfaces</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\NLog\NLog.csproj">
       <Project>{d72ee66a-c189-40ff-97be-40ef9c08bbf8}</Project>
       <Name>NLog</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Rx\Rx.csproj">
-      <Project>{06e735a3-a79c-4043-ab04-8449a2fbc1d2}</Project>
-      <Name>Rx</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/samples/RxSample/packages.config → samples/RxSample/RxSampleApp/packages.config b/samples/RxSample/packages.config → samples/RxSample/RxSampleApp/packages.config
@@ -3,6 +3,10 @@
   <package id="NLog" version="4.1.1" targetFramework="net46" />
   <package id="NLog.Config" version="4.1.1" targetFramework="net46" />
   <package id="NLog.Schema" version="4.0.1" targetFramework="net46" />
+  <package id="Nybus.Core" version="0.3.0.60" targetFramework="net46" />
+  <package id="Nybus.Interfaces" version="0.3.0.60" targetFramework="net46" />
+  <package id="Nybus.NLog" version="0.3.0.60" targetFramework="net46" />
+  <package id="Nybus.Rx" version="0.3.0.60" targetFramework="net46" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net46" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net46" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net46" />