diff --git a/build/Build.proj b/build/Build.proj index 453bf5eea3..c4d963ab42 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -7,6 +7,13 @@ Debug $(MSBuildProjectDirectory)\.. $(ProjectRoot)\artifacts\$(Configuration) + $(ArtifactsDir)\projects + $(ProjectArtifactsDir)\JsTestHarness + $(ArtifactsDir)\package-src + $(ArtifactsDir)\fxcop + $(ArtifactsDir)\samples + $(ProjectRoot)\nuspecs + $(ArtifactsDir)\nuspecs $(ArtifactsDir)\TestResults $(ArtifactsDir)\docs $(ProjectRoot)\.nuget @@ -17,11 +24,9 @@ $(ProjectRoot)\tools\chutzpah $(ChutzpahPath)\$(ChutzpahExe) http://localhost:1337/ - $(ArtifactsDir)\JsTestHarness $(JSTestsPath)\default.html $(ToolsPath)docu\docu.exe $(ToolsPath)7za920\7za.exe - $(ArtifactsDir)\Microsoft.AspNet.SignalR.Client.JS\Scripts $(ProjectRoot)\35MSSharedLib1024.snk $(MSBuildProjectDirectory) @@ -39,50 +44,105 @@ $(MajorVersion).$(MinorVersion).$(PatchVersion)$(PrereleaseTagWithSeparator) - - - - - - - - - - - - - - - - - - - + + true + true + true + - - - + + + true + + true + false + Build + Configuration=$(Configuration);ArtifactsDir=$(ProjectArtifactsDir);SolutionDir=$(ProjectRoot)\;$(ExtraProperties) + true + Net45 + + - - - - - - - - - - - - - - - + + + + false + + + false + + + + false + + + + false + SL5 + + false + + + false + WP8 + false + + + false + WinRT + + + + Net40 + + + + + false + false + + + false + false + + + + + false + + + false + + + + + + + + false + true + SL5 + + + false + true + WP8 + + + + + + Build;pipelinePreDeployCopyAllFilesToOneFolder + Configuration=$(Configuration);ArtifactsDir=$(ProjectArtifactsDir);SolutionDir=$(ProjectRoot)\;$(ExtraProperties);_PackageTempDir=$(ProjectArtifactsDir)\%(FileName);AutoParameterizationWebConfigConnectionStrings=false;MSBuildCommunityTasksPath=$(MSBuildCommunityTasksPath) + true + + + + + true + @@ -129,43 +189,43 @@ - + - + - + - + - + - + - + - + @@ -179,11 +239,11 @@ - - @@ -192,7 +252,7 @@ - @@ -212,35 +272,75 @@ - + - - - - - + + - - + + + + + $(PackageSrcDir)\%(Projects.Platform) + + + + $(PackageSrcDir)\Tools + + + + $(PackageSrcDir)\Content + + + + $(SamplesDir)\%(Projects.FileName) + + + + $(NuspecsDestination) + + + + + + + + + + %(BuildProperties);RunCodeAnalysis=true + + + + + + + + + + $(FxCopDir)\%(Platform) + + + diff --git a/build/Microsoft.Bcl.Build.Tasks.dll b/build/Microsoft.Bcl.Build.Tasks.dll new file mode 100644 index 0000000000..2097a515cf Binary files /dev/null and b/build/Microsoft.Bcl.Build.Tasks.dll differ diff --git a/build/Microsoft.Bcl.Build.targets b/build/Microsoft.Bcl.Build.targets new file mode 100644 index 0000000000..7af7a894b2 --- /dev/null +++ b/build/Microsoft.Bcl.Build.targets @@ -0,0 +1,227 @@ + + + + + + false + + + $(ProjectConfigFileName) + + + + + + <_FullFrameworkReferenceAssemblyPaths>$(TargetFrameworkDirectory) + + + + + + <__IntermediateAppConfig>$(IntermediateOutputPath)$(MSBuildProjectFile).App.config + + + + + + + + + <_EnsureBindingRedirectReference Include="@(Reference)" + Condition="'%(Reference.HintPath)' != '' and Exists('$([System.IO.Path]::GetDirectoryName("%(Reference.HintPath)"))\\ensureRedirect.xml')" /> + + + + + + + + + + + + + + + $(__IntermediateAppConfig) + + + + + $(TargetFileName).config + + + + + + + + + + + <_BclBuildProjectReferenceProperties>BclBuildReferencingProject=$(MSBuildProjectFullPath);BclBuildReferencingProjectConfig=$(MSBuildProjectDirectory)\packages.config + <_BclBuildProjectReferenceProperties Condition="'$(SkipValidatePackageReferences)' != ''">$(_BclBuildProjectReferenceProperties);SkipValidatePackageReferences=$(SkipValidatePackageReferences) + + + + + %(ProjectReference.Properties);$(_BclBuildProjectReferenceProperties) + + + + + + + + true + + + + + + + + + + false + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.Client.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Client.nuspec new file mode 100644 index 0000000000..da9c9cff05 --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.Client.nuspec @@ -0,0 +1,31 @@ + + + + Microsoft.AspNet.SignalR.Client + Microsoft ASP.NET SignalR .NET Client + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + .NET client for ASP.NET SignalR. + en-US + Microsoft AspNet SignalR AspNetSignalR Client + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.Core.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Core.nuspec new file mode 100644 index 0000000000..3e3575d80a --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.Core.nuspec @@ -0,0 +1,23 @@ + + + + Microsoft.AspNet.SignalR.Core + Microsoft ASP.NET SignalR Core Components + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + Core server components for ASP.NET SignalR. + en-US + Microsoft AspNet SignalR AspNetSignalR Core + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.JS.nuspec b/nuspecs/Microsoft.AspNet.SignalR.JS.nuspec new file mode 100644 index 0000000000..f935f8d634 --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.JS.nuspec @@ -0,0 +1,23 @@ + + + + Microsoft.AspNet.SignalR.JS + Microsoft ASP.NET SignalR JavaScript Client + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + JavaScript client for ASP.NET SignalR. + en-US + Microsoft AspNet SignalR AspNetSignalR JS + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.Owin.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Owin.nuspec new file mode 100644 index 0000000000..ea4e7948da --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.Owin.nuspec @@ -0,0 +1,26 @@ + + + + Microsoft.AspNet.SignalR.Owin + Microsoft ASP.NET SignalR OWIN + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + OWIN componenets for ASP.NET SignalR. + en-US + Microsoft AspNet SignalR AspNetSignalR Owin + + + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.Redis.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Redis.nuspec new file mode 100644 index 0000000000..a7abb3a3d8 --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.Redis.nuspec @@ -0,0 +1,24 @@ + + + + Microsoft.AspNet.SignalR.Redis + Microsoft ASP.NET SignalR Redis Messaging Backplane + __SIGNALR_REDIS_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + Redis messaging backplane for scaling out of ASP.NET SignalR applications in a web-farm. + en-US + Microsoft AspNet SignalR AspNetSignalR Redis + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.Sample.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Sample.nuspec new file mode 100644 index 0000000000..377a736934 --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.Sample.nuspec @@ -0,0 +1,20 @@ + + + + Microsoft.AspNet.SignalR.Sample + Microsoft ASP.NET SignalR Sample + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + Foo + en-US + Microsoft AspNet SignalR AspNetSignalR Sample + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.SelfHost.nuspec b/nuspecs/Microsoft.AspNet.SignalR.SelfHost.nuspec new file mode 100644 index 0000000000..30125c6fa8 --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.SelfHost.nuspec @@ -0,0 +1,27 @@ + + + + Microsoft.AspNet.SignalR.SelfHost + Microsoft ASP.NET SignalR Self Host + __KATANADEV_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + A client and server side library for .NET that provides messaging and an abstraction over a persistent connection. This package pulls in the required dependencies for self-hosting SignalR in a process outside of IIS using OWIN and HTTPListener. + en-US + Microsoft AspNet SignalR AspNetSignalR SelfHost + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.ServiceBus.nuspec b/nuspecs/Microsoft.AspNet.SignalR.ServiceBus.nuspec new file mode 100644 index 0000000000..625e1fcec0 --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.ServiceBus.nuspec @@ -0,0 +1,24 @@ + + + + Microsoft.AspNet.SignalR.ServiceBus + Microsoft ASP.NET SignalR Service Bus Messaging Backplane + __SIGNALR_SERVICE_BUS_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + Service Bus messaging backplane for scaling out of ASP.NET SignalR applications in a web-farm. + en-US + Microsoft AspNet SignalR AspNetSignalR ServiceBus + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.SqlServer.nuspec b/nuspecs/Microsoft.AspNet.SignalR.SqlServer.nuspec new file mode 100644 index 0000000000..9147bbaa3a --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.SqlServer.nuspec @@ -0,0 +1,24 @@ + + + + Microsoft.AspNet.SignalR.SqlServer + Microsoft ASP.NET SignalR SQL Server Messaging Backplane + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + SQL Server messaging backplane for scaling out of ASP.NET SignalR applications in a web-farm. + en-US + Microsoft AspNet SignalR AspNetSignalR SqlServer + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.SystemWeb.nuspec b/nuspecs/Microsoft.AspNet.SignalR.SystemWeb.nuspec new file mode 100644 index 0000000000..c21f439ea5 --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.SystemWeb.nuspec @@ -0,0 +1,26 @@ + + + + Microsoft.AspNet.SignalR.SystemWeb + Microsoft ASP.NET SignalR System.Web Components + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + Components for using ASP.NET SignalR in applications hosted on System.Web. + en-US + Microsoft AspNet SignalR AspNetSignalR SystemWeb + + + + + + + + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.Utils.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Utils.nuspec new file mode 100644 index 0000000000..6b5d4068eb --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.Utils.nuspec @@ -0,0 +1,19 @@ + + + + Microsoft.AspNet.SignalR.Utils + Microsoft ASP.NET SignalR Utilities + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + Command line utilities for ASP.NET SignalR, including performance counter installation and Hub JavaScript proxy generation. + en-US + Microsoft AspNet SignalR AspNetSignalR Utils + + + + + \ No newline at end of file diff --git a/nuspecs/Microsoft.AspNet.SignalR.nuspec b/nuspecs/Microsoft.AspNet.SignalR.nuspec new file mode 100644 index 0000000000..9ec50f0acb --- /dev/null +++ b/nuspecs/Microsoft.AspNet.SignalR.nuspec @@ -0,0 +1,27 @@ + + + + Microsoft.AspNet.SignalR + Microsoft ASP.NET SignalR + __SIGNALR_PACKAGE_VERSION__ + Microsoft + Microsoft + http://www.microsoft.com/web/webpi/eula/signalr_prerelease.htm + http://www.asp.net/signalr + true + Incredibly simple real-time web for .NET. + This package pulls in the server components and JavaScript client required to use SignalR in an ASP.NET application. + en-US + Microsoft AspNet SignalR AspNetSignalR websockets real-time realtime comet HTTP streaming + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/Microsoft.AspNet.SignalR.Client.Silverlight.Sample.csproj b/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/Microsoft.AspNet.SignalR.Client.Silverlight.Sample.csproj index 812a4a1931..d2b2f47fd5 100644 --- a/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/Microsoft.AspNet.SignalR.Client.Silverlight.Sample.csproj +++ b/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/Microsoft.AspNet.SignalR.Client.Silverlight.Sample.csproj @@ -146,5 +146,5 @@ - + \ No newline at end of file diff --git a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples.csproj b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples.csproj index 0bbba9b4c5..b2ff561281 100644 --- a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples.csproj +++ b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples.csproj @@ -435,8 +435,10 @@ --> - - + + + + diff --git a/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj b/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj index ad170e460e..6c10c0cd39 100644 --- a/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj +++ b/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj @@ -228,7 +228,6 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - @@ -259,8 +258,8 @@ --> - - + + - diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/build.ps1 b/src/Microsoft.AspNet.SignalR.Client.JS/build.ps1 index acb79ee4bc..8ef73374b2 100644 --- a/src/Microsoft.AspNet.SignalR.Client.JS/build.ps1 +++ b/src/Microsoft.AspNet.SignalR.Client.JS/build.ps1 @@ -1,3 +1,7 @@ +Param( + [string]$outputPath +) + # Files in the order they must be combined $files = "jquery.signalR.core.js", @@ -6,15 +10,15 @@ $files = "jquery.signalR.transports.serverSentEvents.js", "jquery.signalR.transports.foreverFrame.js", "jquery.signalR.transports.longPolling.js", - "jquery.signalR.hubs.js", - "jquery.signalR.version.js" + "jquery.signalR.hubs.js", + "jquery.signalR.version.js" $versionHolder = "##VERSION##" $versionInfo = ([xml](Get-Content -Path "..\..\build\Microsoft.AspNet.SignalR.versions.targets")).Project.PropertyGroup If($versionInfo.BuildQuality -ne "") { - $versionInfo.BuildQuality = "-" + $versionInfo.BuildQuality; + $versionInfo.BuildQuality = "-" + $versionInfo.BuildQuality; } $version = %{'{0}.{1}.{2}{3}' -f $versionInfo.MajorVersion, $versionInfo.MinorVersion, $versionInfo.PatchVersion, $versionInfo.BuildQuality} @@ -36,11 +40,11 @@ foreach ($file in $files) { # Combine all files into jquery.signalR.js if (!(Test-Path -path "bin")) { - New-Item "bin" -Type Directory | Out-Null + New-Item "bin" -Type Directory | Out-Null } Write-Host "Building bin\jquery.signalR.js... " -NoNewline -ForegroundColor Yellow -$filePath = "bin\jquery.signalR.js" +$filePath = "$outputPath\jquery.signalR.js" Remove-Item $filePath -Force -ErrorAction SilentlyContinue foreach ($file in $files) { Add-Content -Path $filePath -Value "/* $file */" @@ -50,7 +54,7 @@ Write-Host "done" -ForegroundColor Green # Minify to jquery.signalR.min.js Write-Host "Building bin\jquery.signalR.min.js... " -NoNewline -ForegroundColor Yellow -& "..\..\tools\ajaxmin\AjaxMin.exe" bin\jquery.signalR.js -out bin\jquery.signalR.min.js -clobber > $output +& "..\..\tools\ajaxmin\AjaxMin.exe" $outputPath\jquery.signalR.js -out $outputPath\jquery.signalR.min.js -clobber > $output (Get-Content $output)[6] | Write-Host -ForegroundColor Green Remove-Item $output -Force \ No newline at end of file diff --git a/src/Microsoft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj b/src/Microsoft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj index a431ee6f2d..25e5d99c50 100644 --- a/src/Microsoft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj +++ b/src/Microsoft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj @@ -263,7 +263,7 @@ - +