Skip to content
Browse files

Restore build on mono

- Made the property group for the fallback optional.
- Small changes for mono develop.
  • Loading branch information...
1 parent 2a9f633 commit eab38ddc0249e849fca839a88b571446e8ace48c @davidfowl davidfowl committed
View
6 SignalR.Client/SignalR.Client.csproj
@@ -34,12 +34,12 @@
<DocumentationFile>bin\Release\SignalR.Client.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+ <HintPath>..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonAssemblyInfo.cs">
View
7 SignalR.Mono.sln
@@ -119,7 +119,7 @@ Global
{FBA09237-84CC-4383-BD12-CDF58E4020E8} = {65DBC231-0173-4367-B830-8502F4A31711}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = SignalR\SignalR.csproj
+ StartupItem = samples\SignalR.Hosting.AspNet.Samples\SignalR.Hosting.AspNet.Samples.csproj
Policies = $0
$0.DotNetNamingPolicy = $1
$1.DirectoryNamespaceAssociation = None
@@ -141,10 +141,6 @@ Global
$3.WhileBraceForcement = AddBraces
$3.UsingBraceForcement = AddBraces
$3.FixedBraceForcement = AddBraces
- $3.PlaceElseOnNewLine = True
- $3.PlaceCatchOnNewLine = True
- $3.PlaceFinallyOnNewLine = True
- $3.PlaceWhileOnNewLine = True
$3.BeforeMethodDeclarationParentheses = False
$3.BeforeMethodCallParentheses = False
$3.BeforeConstructorDeclarationParentheses = False
@@ -157,7 +153,6 @@ Global
$3.scope = text/x-csharp
$0.TextStylePolicy = $4
$4.FileWidth = 120
- $4.RemoveTrailingWhitespace = True
$4.EolMarker = Windows
$4.inheritsSet = VisualStudio
$4.inheritsScope = text/plain
View
6 SignalR.Tests/SignalR.Tests.csproj
@@ -35,9 +35,6 @@
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
@@ -49,6 +46,9 @@
<Reference Include="xunit">
<HintPath>..\packages\xunit.1.8.0.1549\lib\xunit.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+ <HintPath>..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\samples\SignalR.Hosting.AspNet.Samples\Hubs\DemoHub\DemoHub.cs">
View
1 SignalR/Hubs/HubDispatcher.cs
@@ -195,7 +195,6 @@ private IHub CreateHub(IRequest request, HubDescriptor descriptor, string connec
state = state ?? new TrackingDictionary();
hub.Context = new HubCallerContext(request, connectionId);
hub.Caller = new StatefulSignalAgent(Connection, connectionId, descriptor.Name, state);
- var groupManager = new GroupManager(Connection, descriptor.Name);
hub.Clients = new ClientAgent(Connection, descriptor.Name);
hub.Groups = new GroupManager(Connection, descriptor.Name);
}
View
6 SignalR/SignalR.csproj
@@ -34,12 +34,12 @@
<DocumentationFile>bin\Release\SignalR.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+ <HintPath>..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CommonAssemblyInfo.cs">
View
10 samples/SignalR.Hosting.AspNet.Samples/SignalR.Hosting.AspNet.Samples.csproj
@@ -48,11 +48,11 @@
<HintPath>..\..\packages\AntiXSS.4.0.1\lib\net35\HtmlSanitizationLibrary.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Web" />
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Content\bg.jpg" />
@@ -224,7 +224,7 @@
<ItemGroup>
<Content Include="SignalR.Master" />
</ItemGroup>
- <PropertyGroup>
+ <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
@@ -232,7 +232,7 @@
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition=" '$(OS)' != 'Windows_NT'" />
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349C5851-65DF-11DA-9384-00065B846F21}">
View
6 samples/SignalR.Hosting.Self.Samples/SignalR.Hosting.Self.Samples.csproj
@@ -34,12 +34,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\SignalR.Hosting.AspNet.Samples\Hubs\Benchmark\HubBench.cs">

0 comments on commit eab38dd

Please sign in to comment.
Something went wrong with that request. Please try again.