Permalink
Browse files

Added a .NET 40 client samples project for mono and testing.

- Removed JSON.NET from project since it's not used.
- Updated make file to build just the solution.
  • Loading branch information...
1 parent be16637 commit 780b4dbc90cc443c1a62c00099799a86c24c98b9 @davidfowl davidfowl committed May 22, 2013
@@ -84,6 +84,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Sa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SelfHost.Samples", "samples\Microsoft.AspNet.SelfHost.Samples\Microsoft.AspNet.SelfHost.Samples.csproj", "{5D69B6BE-062B-408D-913E-5CD2F21D5D17}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client40.Samples", "samples\Microsoft.AspNet.SignalR.Client40.Samples\Microsoft.AspNet.SignalR.Client40.Samples.csproj", "{2B6F3C11-DE35-4948-A49F-A6C65A297C86}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -484,6 +486,20 @@ Global
{5D69B6BE-062B-408D-913E-5CD2F21D5D17}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5D69B6BE-062B-408D-913E-5CD2F21D5D17}.Release|x64.ActiveCfg = Release|Any CPU
{5D69B6BE-062B-408D-913E-5CD2F21D5D17}.Release|x86.ActiveCfg = Release|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Release|ARM.ActiveCfg = Release|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Release|x64.ActiveCfg = Release|Any CPU
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -500,5 +516,6 @@ Global
{1E14A334-4346-4C27-8D67-497632CF8974} = {7E3D992A-8F37-4C5D-AD42-E052522816C5}
{1EA34A62-E03E-45CF-A9C9-82D2DA0FCD82} = {7E3D992A-8F37-4C5D-AD42-E052522816C5}
{5D69B6BE-062B-408D-913E-5CD2F21D5D17} = {7E3D992A-8F37-4C5D-AD42-E052522816C5}
+ {2B6F3C11-DE35-4948-A49F-A6C65A297C86} = {7E3D992A-8F37-4C5D-AD42-E052522816C5}
EndGlobalSection
EndGlobal
View
@@ -1,13 +1,5 @@
all:
- xbuild build/Build.proj /t:GoMono
+ xbuild Microsoft.AspNet.SignalR.Mono.sln
compile:
- xbuild build/Build.proj /t:Build
-
-# For some odd reason, this hangs after running all the tests so
-# ctrl + c might be needed to break out after tests run.
-tests: compile
- xbuild build/Build.proj /t:RunTests
-
-functionaltests: compile
- xbuild build/Build.proj /t:RunFunctionalTests
+ xbuild Microsoft.AspNet.SignalR.Mono.sln
@@ -41,13 +41,9 @@
<DefineConstants>$(DefineConstants);MONO</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.5.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
+ <Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
- <Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\src\Common\CommonVersionInfo.cs">
@@ -57,18 +53,13 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Client45\Microsoft.AspNet.SignalR.Client45.csproj" Condition="'$(OS)' == 'Windows_NT'">
+ <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Client45\Microsoft.AspNet.SignalR.Client45.csproj">
<Project>{50f8a174-695e-498c-b105-bdbe6b398646}</Project>
<Name>Microsoft.AspNet.SignalR.Client45</Name>
</ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Client\Microsoft.AspNet.SignalR.Client.csproj" Condition="'$(OS)' != 'Windows_NT'">
- <Project>{eb46b9c6-ee37-48f9-835e-e49580e40e0a}</Project>
- <Name>Microsoft.AspNet.SignalR.Client</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
- <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="!HasTrailingSlash('$(SolutionDir)')" />
@@ -73,12 +73,7 @@ private static void RunDemoHub(HubConnection hubConnection)
private static void RunRawConnection()
{
-#if MONO
- // Mono is pointing to the self hosted server
- var connection = new Connection("http://localhost:8080/raw-connection");
-#else
var connection = new Connection("http://localhost:40476/raw-connection");
-#endif
Console.WriteLine("URL: {0}", connection.Url);
@@ -126,8 +121,8 @@ private static void RunRawConnection()
}
else if (key.Key == ConsoleKey.D2)
{
-#if MONO
- Console.WriteLine("Mono doesn't support websockets");
+#if NET40
+ Console.WriteLine("No .NET4 websockets");
return;
#else
startTask = connection.Start(new Client.Transports.WebSocketTransport());
@@ -13,11 +13,3 @@
[assembly: AssemblyCopyright("Copyright © Microsoft 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("750854c7-3c4c-46e0-b46b-a42773f33ae4")]
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net45" />
-</packages>
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{2B6F3C11-DE35-4948-A49F-A6C65A297C86}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Microsoft.AspNet.SignalR.Client40.Samples</RootNamespace>
+ <AssemblyName>Microsoft.AspNet.SignalR.Client40.Samples</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;NET40</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE;NET40</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\src\Common\CommonVersionInfo.cs">
+ <Link>Properties\CommonVersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\Microsoft.AspNet.SignalR.Client.Samples\Program.cs">
+ <Link>Program.cs</Link>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Client\Microsoft.AspNet.SignalR.Client.csproj">
+ <Project>{eb46b9c6-ee37-48f9-835e-e49580e40e0a}</Project>
+ <Name>Microsoft.AspNet.SignalR.Client</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.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
@@ -0,0 +1,15 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Microsoft.AspNet.SignalR.Client40.Samples")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Microsoft.AspNet.SignalR.Client40.Samples")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]

0 comments on commit 780b4db

Please sign in to comment.