Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated packaging.

Updated JSON.NET
  • Loading branch information...
commit 36aec19c2e342965d91fd4f301ec9bc33503becc 1 parent ef6baff
@davidfowl davidfowl authored
Showing with 76 additions and 43 deletions.
  1. +8 −14 Build/Build.proj
  2. +3 −4 ReleaseNotes.md
  3. +16 −0 SignalR.Client.Silverlight/Properties/SignalR.Client.Silverlight.nuspec
  4. +7 −2 SignalR.Client.Silverlight/SignalR.Client.Silverlight.csproj
  5. +1 −0  SignalR.Client.Silverlight/packages.config
  6. +3 −0  SignalR.Client.WP7/Properties/SignalR.Client.WP7.nuspec
  7. +2 −3 SignalR.Client.WP7/SignalR.Client.WP7.csproj
  8. +1 −1  SignalR.Client.WP7/packages.config
  9. +2 −2 SignalR.Client.WP71/SignalR.Client.WP71.csproj
  10. +1 −1  SignalR.Client.WP71/packages.config
  11. +2 −2 SignalR.Client/SignalR.Client.csproj
  12. +1 −1  SignalR.Client/packages.config
  13. 0  SignalR.Hosting.AspNet/Properties/{SignalR.AspNet.nuspec → SignalR.Hosting.AspNet.nuspec}
  14. +1 −1  SignalR.Hosting.AspNet/SignalR.Hosting.AspNet.csproj
  15. +1 −1  SignalR.Hosting.Self/Properties/AssemblyInfo.cs
  16. +13 −0 SignalR.Hosting.Self/Properties/SignalR.Hosting.Self.nuspec
  17. +3 −0  SignalR.Hosting.Self/SignalR.Hosting.Self.csproj
  18. +3 −2 SignalR.Tests/SignalR.Tests.csproj
  19. +1 −1  SignalR.Tests/packages.config
  20. +2 −2 SignalR/Properties/SignalR.All.nuspec
  21. +4 −5 SignalR/SignalR.csproj
  22. +1 −1  SignalR/packages.config
View
22 Build/Build.proj
@@ -54,24 +54,18 @@
<ItemGroup>
<JsPackage Include="$(ProjectRoot)\SignalR\Properties\SignalR.Js.nuspec" />
<MetaPackage Include="$(ProjectRoot)\SignalR\Properties\SignalR.All.nuspec" />
+ <Projects Include="$(ProjectRoot)\SignalR\SignalR.csproj" />
+ <Projects Include="$(ProjectRoot)\SignalR.Hosting.AspNet\SignalR.Hosting.AspNet.csproj" />
+ <Projects Include="$(ProjectRoot)\SignalR.Client\SignalR.Client.csproj" />
+ <Projects Include="$(ProjectRoot)\SignalR.Hosting.Self\SignalR.Hosting.Self.csproj" />
+ <!--<Projects Include="$(ProjectRoot)\SignalR.Hosting.Owin\SignalR.Hosting.Owin.csproj" />-->
</ItemGroup>
- <MSBuild Projects="$(ProjectRoot)\SignalR\SignalR.csproj"
+ <MSBuild Projects="%(Projects.Identity)"
Targets="Build"
Properties="BuildPackage=true;Version=$(Version);PackageOutputDir=$(ArtifactsDir);Configuration=$(Configuration)" />
-
- <MSBuild Projects="$(ProjectRoot)\SignalR.Hosting.AspNet\SignalR.Hosting.AspNet.csproj"
- Targets="Build"
- Properties="BuildPackage=true;Version=$(Version);PackageOutputDir=$(ArtifactsDir);Configuration=$(Configuration)" />
-
- <!--<MSBuild Projects="$(ProjectRoot)\SignalR.Hosting.Owin\SignalR.Hosting.Owin.csproj"
- Targets="Build"
- Properties="BuildPackage=true;Version=$(Version);PackageOutputDir=$(ArtifactsDir);Configuration=$(Configuration)" />
-
- <MSBuild Projects="$(ProjectRoot)\SignalR.Hosting.Self\SignalR.Hosting.Self.csproj"
- Targets="Build"
- Properties="BuildPackage=true;Version=$(Version);PackageOutputDir=$(ArtifactsDir);Configuration=$(Configuration)" />-->
-
+
+ <!-- Only build WP7 and Silverlight projects if SDK's avaliable -->
<MSBuild Projects="$(ProjectRoot)\SignalR.Client.WP7\SignalR.Client.WP7.csproj"
Targets="Build"
Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\')"
View
7 ReleaseNotes.md
@@ -1,13 +1,12 @@
# SignalR Release Notes
-## v0.3.6
+## v0.4
### SignalR.Server
-* Added static events to PersistentConnection for profiling.
-* Performance: Use single timer to keep track of timeouts on the server. (#51)
+
### SignalR.Client
-* Added authentication support (#27)
+
## v0.3.5
* Added a SignalR client for WP7 (long polling)
View
16 SignalR.Client.Silverlight/Properties/SignalR.Client.Silverlight.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<package >
+ <metadata>
+ <id>$id$</id>
+ <version>$version$</version>
+ <title>$title$</title>
+ <authors>$author$</authors>
+ <licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
+ <projectUrl>https://github.com/SignalR/SignalR</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>$description$</description>
+ <dependencies>
+ <dependency id="Newtonsoft.Json" version="[4.0.7]" />
+ </dependencies>
+ </metadata>
+</package>
View
9 SignalR.Client.Silverlight/SignalR.Client.Silverlight.csproj
@@ -18,6 +18,7 @@
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<RestorePackages>true</RestorePackages>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\SignalR\</SolutionDir>
</PropertyGroup>
<!-- This property group is only here to support building this project using the
MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
@@ -48,8 +49,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\sl4\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\sl4\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.SL4">
<HintPath>..\packages\System.Threading.Tasks.2.1.2\lib\sl40\System.Threading.Tasks.SL4.dll</HintPath>
@@ -135,6 +137,9 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
+ <None Include="Properties\SignalR.Client.Silverlight.nuspec">
+ <SubType>Designer</SubType>
+ </None>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
View
1  SignalR.Client.Silverlight/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="4.0.4" />
+ <package id="Newtonsoft.Json" version="4.0.7" />
<package id="System.Threading.Tasks" version="2.1.2" />
</packages>
View
3  SignalR.Client.WP7/Properties/SignalR.Client.WP7.nuspec
@@ -8,6 +8,9 @@
<licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/SignalR/SignalR</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <dependencies>
+ <dependency id="Newtonsoft.Json" version="[4.0.7]" />
+ </dependencies>
</metadata>
<files>
<file src="..\..\SignalR.Client.WP71\bin\$configuration$\SignalR.Client.WP7.dll" target="lib\sl4-wp71" />
View
5 SignalR.Client.WP7/SignalR.Client.WP7.csproj
@@ -20,7 +20,6 @@
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\SignalR\</SolutionDir>
<RestorePackages>true</RestorePackages>
- <BuildPackage>true</BuildPackage>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -44,9 +43,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.0.4.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.WP7">
<HintPath>..\packages\System.Threading.Tasks.2.1.2\lib\sl3-wp\System.Threading.Tasks.WP7.dll</HintPath>
View
2  SignalR.Client.WP7/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="4.0.4" />
+ <package id="Newtonsoft.Json" version="4.0.7" />
<package id="System.Threading.Tasks" version="2.1.2" />
</packages>
View
4 SignalR.Client.WP71/SignalR.Client.WP71.csproj
@@ -43,9 +43,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.0.4.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\sl4-windowsphone71\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.WP71">
<HintPath>..\packages\System.Threading.Tasks.2.1.2\lib\sl4-wp71\System.Threading.Tasks.WP71.dll</HintPath>
View
2  SignalR.Client.WP71/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="4.0.4" />
+ <package id="Newtonsoft.Json" version="4.0.7" />
<package id="System.Threading.Tasks" version="2.1.2" />
</packages>
View
4 SignalR.Client/SignalR.Client.csproj
@@ -33,9 +33,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=4.0.4.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
2  SignalR.Client/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="4.0.4" />
+ <package id="Newtonsoft.Json" version="4.0.7" />
</packages>
View
0  ...R.Hosting.AspNet/Properties/SignalR.AspNet.nuspec → ...g.AspNet/Properties/SignalR.Hosting.AspNet.nuspec
File renamed without changes
View
2  SignalR.Hosting.AspNet/SignalR.Hosting.AspNet.csproj
@@ -76,7 +76,7 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
- <None Include="Properties\SignalR.AspNet.nuspec">
+ <None Include="Properties\SignalR.Hosting.AspNet.nuspec">
<SubType>Designer</SubType>
</None>
</ItemGroup>
View
2  SignalR.Hosting.Self/Properties/AssemblyInfo.cs
@@ -3,4 +3,4 @@
[assembly: AssemblyTitle("SignalR.SelfHost")]
[assembly: AssemblyDescription("HttpListener host for SignalR")]
-[assembly: AssemblyVersion("0.3.6")]
+[assembly: AssemblyVersion("0.4.0")]
View
13 SignalR.Hosting.Self/Properties/SignalR.Hosting.Self.nuspec
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<package >
+ <metadata>
+ <id>$id$</id>
+ <version>$version$</version>
+ <title>$title$</title>
+ <authors>$author$</authors>
+ <licenseUrl>https://github.com/SignalR/SignalR/blob/master/LICENSE.md</licenseUrl>
+ <projectUrl>https://github.com/SignalR/SignalR</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>$description$</description>
+ </metadata>
+</package>
View
3  SignalR.Hosting.Self/SignalR.Hosting.Self.csproj
@@ -60,6 +60,9 @@
<Name>SignalR</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="Properties\SignalR.Hosting.Self.nuspec" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project>
View
5 SignalR.Tests/SignalR.Tests.csproj
@@ -36,8 +36,9 @@
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.0.4.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
View
2  SignalR.Tests/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Moq" version="4.0.10827" />
- <package id="Newtonsoft.Json" version="4.0.4" />
+ <package id="Newtonsoft.Json" version="4.0.7" />
<package id="xunit" version="1.8.0.1549" />
</packages>
View
4 SignalR/Properties/SignalR.All.nuspec
@@ -9,8 +9,8 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A client and server side library for .NET that provides messaging and an abstraction over a persistent connection.</description>
<dependencies>
- <dependency id="SignalR.Hosting.AspNet" version="[$version$]" />
- <dependency id="SignalR.Js" version="[$version$]" />
+ <dependency id="SignalR.Hosting.AspNet" version="$version$" />
+ <dependency id="SignalR.Js" version="$version$" />
</dependencies>
</metadata>
</package>
View
9 SignalR/SignalR.csproj
@@ -33,8 +33,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -126,9 +127,7 @@
<Compile Include="Transports\TransportManager.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config">
- <SubType>Designer</SubType>
- </None>
+ <None Include="packages.config" />
<None Include="Properties\SignalR.nuspec">
<SubType>Designer</SubType>
</None>
View
2  SignalR/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="4.0.4" />
+ <package id="Newtonsoft.Json" version="4.0.7" />
</packages>
Please sign in to comment.
Something went wrong with that request. Please try again.